RPM: remove lots of obsolete 3.5.13.x files

529 files changed, 2 insertions, 312624 deletions

diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
deleted file mode 100644
index 52d85db0d..000000000
--- a/redhat/Makefile.v3.5.13-sru
+++ /dev/null
@@ -1,572 +0,0 @@
-SHELL := /bin/bash
-PACKAGING_DIR := $(shell cd ..; pwd)
-PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION = 3.5.13.2
-
-buildpkg = \
-  @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
-  export PACKAGING_DIR=$(PACKAGING_DIR); \
-  if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
-    echo "  Package '${1}' is not yet installed."; \
-    if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
-      echo "  Building package."; \
-      build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \
-      echo "  Updating repository."; \
-      update_repository.sh ${TDE_VERSION}; \
-    fi; \
-    echo "Now installing package '$(1)'"; \
-    install_rpm_package.sh "$(1)" || exit 2; \
-  fi; \
-  echo
-
-
-all:	dependencies main libraries applications i18n meta extras
-dependencies:	qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal
-main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-libraries:	libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime digikam dolphin filelight gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla katapult kbarcode kbfx kbookreader kchmviewer kcmautostart kcpuload kdbusnotification kdiff3 kdirstat kgtk-qt3 keep kile kima kiosktool kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knowit knutclient koffice konversation kopete-otr kpicosim kpilot kpowersave krename krusader ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd piklab potracegui rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-locate tdeio-umountwrapper tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico twin-style-crystal wlassistant yakuake
-i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-
-
-### Trinity Dependencies
-arts:	tqtinterface trinity-filesystem esound cmake
-	$(call buildpkg,dependencies/arts)
-
-avahi-tqt:	tqtinterface autoconf automake libtool
-	$(call buildpkg,dependencies/avahi-tqt)
-
-dbus-1-tqt:	tqtinterface cmake
-	$(call buildpkg,dependencies/dbus-1-tqt)
-
-dbus-tqt: tqtinterface cmake
-	$(call buildpkg,dependencies/dbus-tqt)
-
-libcaldav: tqtinterface autoconf libcurl
-	$(call buildpkg,dependencies/libcaldav)
-
-libcarddav:	tqtinterface autoconf libcurl
-	$(call buildpkg,dependencies/libcarddav)
-	
-tqca:	tqtinterface
-	$(call buildpkg,dependencies/tqca)
-
-tqca-tls: tqtinterface tqca
-	$(call buildpkg,dependencies/tqca-tls)
-
-qt3: esound
-	$(call buildpkg,dependencies/qt3)
-
-tqtinterface:	qt3 cmake
-	$(call buildpkg,dependencies/tqtinterface)
-
-# Main packages
-tdeaccessibility:	tdebase tdemultimedia
-	$(call buildpkg,main/tdeaccessibility)
-
-tdeaddons:	tdebase tdegames tdemultimedia tdenetwork tdepim
-	$(call buildpkg,main/tdeaddons)
-
-tdeadmin:	tdebase
-	$(call buildpkg,main/tdeadmin)
-
-tdeartwork:	tdebase
-	$(call buildpkg,main/tdeartwork)
-
-tdebase:	tdelibs cmake htdig fileshareset hal
-	$(call buildpkg,main/tdebase)
-
-tdebindings:	tdebase
-	$(call buildpkg,main/tdebindings)
-
-tdeedu:	tdebase
-	$(call buildpkg,main/tdeedu)
-
-tdegames:	tdebase tdemultimedia
-	$(call buildpkg,main/tdegames)
-
-tdegraphics:	tdebase poppler cmake
-	$(call buildpkg,main/tdegraphics)
-
-tdelibs:	qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem
-	$(call buildpkg,main/tdelibs)
-
-tdemultimedia:	tdebase akode
-	$(call buildpkg,main/tdemultimedia)
-
-tdenetwork:	tdebase
-	$(call buildpkg,main/tdenetwork)
-
-tdepim:	tdebase libcaldav libcarddav cmake
-	$(call buildpkg,main/tdepim)
-
-tdesdk:		tdebase tdebindings cmake
-	$(call buildpkg,main/tdesdk)
-
-tdetoys:	tdebase
-	$(call buildpkg,main/tdetoys)
-
-tdeutils:	tdebase
-	$(call buildpkg,main/tdeutils)
-
-tdevelop:	tdebase tdesdk cmake
-	$(call buildpkg,main/tdevelop)
-
-tdewebdev:	tdebase tdesdk
-	$(call buildpkg,main/tdewebdev)
-
-### 3rd party libraries and tools
-autoconf: m4
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/autoconf)
-endif
-
-automake:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/automake)
-endif
-
-cmake:
-# Build on CentOS 5/6 only
-ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/cmake)
-endif
-
-esound:
-# Build on Mageia and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/esound)
-endif
-
-gnuchess:
-# Build on CentOS 5, CentOS 7
-ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/gnuchess)
-endif
-
-hal: hal-info
-# Do NOT build on CentOS 5, CentOS 6
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/hal)
-endif
-
-hal-info:
-# Do NOT build on CentOS 5, CentOS 6
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/hal-info)
-endif
-
-htdig:
-# build on Mageia, and CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,extras/htdig)
-endif
-
-imlib1:
-# Do NOT build on Fedora, nor CentOS
-ifeq ($(wildcard /etc/fedora-release),)
-ifeq ($(wildcard /etc/centos-release),)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/imlib1)
-endif
-endif
-endif
-
-libcurl: automake libtool
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/curl)
-endif
-
-libotr3:
-# Build on Mageia, CentOS >= 7
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/libotr3)
-endif
-
-libtool: autoconf automake
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/libtool)
-endif
-
-lilypond: mftrace
-# Build on CentOS 6 only
-ifneq ($(wildcard /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/lilypond)
-endif
-
-m4:
-# Build on CentOS 5 only (vendor-provided m4 is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/m4)
-endif
-
-mftrace:
-# Build on CentOS 6 only
-ifneq ($(wildcard /boot/vmlinuz*.el6*),)
-	$(call buildpkg,3rdparty/mftrace)
-endif
-
-pcsc-perl:
-# Build on CentOS and openSUSE only
-ifneq ($(wildcard /etc/centos-release /etc/SuSE-release /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
-	$(call buildpkg,3rdparty/python-qt3)
-
-sip:
-# Build on CentOS 5 only (vendor-provided SIP is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/sip)
-endif
-
-sword:
-# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/sword)
-endif
-
-wv2:
-# Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),)
-	$(call buildpkg,3rdparty/wv2)
-endif
-
-### Extra packages
-akode:	tqtinterface
-	$(call buildpkg,extras/akode)
-
-cmake-macros: cmake
-ifneq ($(wildcard /etc/SuSE-release),)
-	$(call buildpkg,extras/trinity-cmake-macros)
-endif
-
-### Trinity Libraries
-kipi-plugins:	tqtinterface libkipi
-	$(call buildpkg,libraries/kipi-plugins)
-
-libkdcraw:	tqtinterface
-	$(call buildpkg,libraries/libkdcraw)
-
-libkexiv2:	tqtinterface
-	$(call buildpkg,libraries/libkexiv2)
-
-libkipi:	tqtinterface
-	$(call buildpkg,libraries/libkipi)
-
-libksquirrel:	tqtinterface
-	$(call buildpkg,libraries/libksquirrel)
-
-mlt:	tqtinterface
-	$(call buildpkg,libraries/mlt)
-
-pytdeextensions:	tqtinterface python-trinity
-	$(call buildpkg,libraries/pytdeextensions)
-
-python-trinity:	tqtinterface python-qt3
-	$(call buildpkg,libraries/python-trinity)
-
-### Trinity Applications
-abakus:	tdebase
-	$(call buildpkg,applications/abakus)
-
-adept:	tdebase
-	$(call buildpkg,applications/adept)
-
-amarok:	tdebase cmake
-	$(call buildpkg,applications/amarok)
-
-basket:	tdebase
-	$(call buildpkg,applications/basket)
-
-bibletime:	tdebase sword
-	$(call buildpkg,applications/bibletime)
-
-compizconfig-backend-kconfig:	tdebase
-	$(call buildpkg,applications/compizconfig-backend-kconfig)
-
-desktop-effects-tde:	tdebase
-	$(call buildpkg,applications/desktop-effects-tde)
-
-digikam:	tdebase libkdcraw libkexiv2 libkipi libksquirrel
-	$(call buildpkg,applications/digikam)
-
-dolphin:	tdebase
-	$(call buildpkg,applications/dolphin)
-
-filelight:	tdebase
-	$(call buildpkg,applications/filelight)
-
-filelight-l10n:	tdebase
-	$(call buildpkg,applications/filelight-l10n)
-
-fusion-icon:	tdebase
-	$(call buildpkg,applications/fusion-icon)
-
-gtk-qt-engine:	tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,applications/gtk-qt-engine)
-endif
-
-gwenview:	tdebase
-	$(call buildpkg,applications/gwenview)
-
-k3b:	tdebase
-	$(call buildpkg,applications/k3b)
-
-k9copy:	tdebase k3b
-	$(call buildpkg,applications/k9copy)
-
-kaffeine:	tdebase
-	$(call buildpkg,applications/kaffeine)
-
-kaffeine-mozilla:	tdebase kaffeine
-	$(call buildpkg,applications/kaffeine-mozilla)
-
-katapult:	tdebase
-	$(call buildpkg,applications/katapult)
-
-kbarcode:	tdebase
-	$(call buildpkg,applications/kbarcode)
-
-kbfx:	tdebase
-	$(call buildpkg,applications/kbfx)
-
-kbookreader:	tdebase
-	$(call buildpkg,applications/kbookreader)
-
-kchmviewer:	tdebase
-	$(call buildpkg,applications/kchmviewer)
-
-kcmautostart:	tdebase
-	$(call buildpkg,applications/kcmautostart)
-
-kcpuload:	tdebase
-	$(call buildpkg,applications/kcpuload)
-
-kdbusnotification:	tdebase
-	$(call buildpkg,applications/kdbusnotification)
-
-kdiff3:	tdebase
-	$(call buildpkg,applications/kdiff3)
-
-kdirstat:	tdebase
-	$(call buildpkg,applications/kdirstat)
-
-kdpkg:	tdebase
-	$(call buildpkg,applications/kdpkg)
-
-keep:	tdebase
-	$(call buildpkg,applications/keep)
-
-kerry:	tdebase
-	$(call buildpkg,applications/kerry)
-
-kgtk-qt3:	tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-# Do NOT build on CentOS >=7 (GTK2 is too new)
-# Do NOT build on Fedora >= 20 (GTK2 is too new)
-# Do NOT build on Mageia >= 4 (GTK2 is too new)
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),)
-	$(call buildpkg,applications/kgtk-qt3)
-endif
-
-kile:	tdebase
-	$(call buildpkg,applications/kile)
-
-kima:	tdebase
-	$(call buildpkg,applications/kima)
-
-kiosktool:	tdebase
-	$(call buildpkg,applications/kiosktool)
-
-kmplayer:	tdebase
-	$(call buildpkg,applications/kmplayer)
-
-kmyfirewall:	tdebase
-	$(call buildpkg,applications/kmyfirewall)
-
-kmymoney:	tdebase
-	$(call buildpkg,applications/kmymoney)
-
-knemo:	tdebase
-	$(call buildpkg,applications/knemo)
-
-knetload:	tdebase
-	$(call buildpkg,applications/knetload)
-
-knetstats:	tdebase
-	$(call buildpkg,applications/knetstats)
-
-knetworkmanager8:	tdebase
-	$(call buildpkg,applications/knetworkmanager8)
-
-knights:	tdebase gnuchess
-	$(call buildpkg,applications/knights)
-
-knowit:	tdebase
-	$(call buildpkg,applications/knowit)
-
-knutclient:	tdebase
-	$(call buildpkg,applications/knutclient)
-
-koffice:	tdebase wv2
-	$(call buildpkg,applications/koffice)
-
-konversation:	tdebase
-	$(call buildpkg,applications/konversation)
-
-kopete-otr:	tdebase libotr3
-	$(call buildpkg,applications/kopete-otr)
-
-kpicosim:	tdebase
-	$(call buildpkg,applications/kpicosim)
-
-kpilot:	tdebase
-# Do NOT build on CentOS 5 (pilot-link library is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,applications/kpilot)
-endif
-
-kpowersave:	tdebase
-	$(call buildpkg,applications/kpowersave)
-
-krename:	tdebase
-	$(call buildpkg,applications/krename)
-
-krusader:	tdebase
-	$(call buildpkg,applications/krusader)
-
-ksplash-engine-moodin:	tdebase
-	$(call buildpkg,applications/ksplash-engine-moodin)
-
-ksquirrel:	tdebase libksquirrel
-	$(call buildpkg,applications/ksquirrel)
-
-kstreamripper:	tdebase
-	$(call buildpkg,applications/kstreamripper)
-
-ksystemlog:	tdebase
-	$(call buildpkg,applications/ksystemlog)
-
-ktechlab:	tdebase
-	$(call buildpkg,applications/ktechlab)
-
-ktorrent:	tdebase
-	$(call buildpkg,applications/ktorrent)
-
-kuickshow:	tdebase imlib1
-	$(call buildpkg,applications/kuickshow)
-
-kvirc:	tdebase
-	$(call buildpkg,applications/kvirc)
-
-kvkbd:	tdebase
-	$(call buildpkg,applications/kvkbd)
-
-piklab:	tdebase
-	$(call buildpkg,applications/piklab)
-
-potracegui:	tdebase
-	$(call buildpkg,applications/potracegui)
-
-rosegarden:	tdebase lilypond
-# Do NOT build on CentOS 5, CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
-	$(call buildpkg,applications/rosegarden)
-endif
-
-smartcardauth:	tdebase pcsc-perl
-	$(call buildpkg,applications/smartcardauth)
-
-smb4k:	tdebase
-	$(call buildpkg,applications/smb4k)
-
-soundkonverter:	tdebase
-	$(call buildpkg,applications/soundkonverter)
-
-tde-guidance:	tdebase pytdeextensions
-	$(call buildpkg,applications/tde-guidance)
-
-tdeio-apt:	tdebase
-	$(call buildpkg,applications/tdeio-apt)
-
-tdeio-locate:	tdebase
-	$(call buildpkg,applications/tdeio-locate)
-
-tdeio-umountwrapper:	tdebase
-	$(call buildpkg,applications/tdeio-umountwrapper)
-
-tderadio:	tdebase
-# Do NOT build on CentOS 7
-ifeq ($(wildcard /boot/vmlinuz*.el7*),)
-	$(call buildpkg,applications/tderadio)
-endif
-
-tde-style-lipstik:	tdebase
-	$(call buildpkg,applications/tde-style-lipstik)
-
-tde-style-qtcurve:	tdebase
-	$(call buildpkg,applications/tde-style-qtcurve)
-
-tdesudo:	tdebase
-	$(call buildpkg,applications/tdesudo)
-
-tdesvn:	tdebase
-	$(call buildpkg,applications/tdesvn)
-
-tde-systemsettings:	tdebase
-	$(call buildpkg,applications/tde-systemsettings)
-
-tdmtheme:	tdebase
-	$(call buildpkg,applications/tdmtheme)
-
-tellico:	tdebase
-	$(call buildpkg,applications/tellico)
-
-twin-style-crystal:	tdebase
-	$(call buildpkg,applications/twin-style-crystal)
-
-wlassistant:	tdebase
-	$(call buildpkg,applications/wlassistant)
-
-yakuake:	tdebase
-	$(call buildpkg,applications/yakuake)
-
-### Trinity Translations
-gwenview-i18n:	tdebase
-	$(call buildpkg,applications/gwenview-i18n)
-
-k3b-i18n:	tdebase
-	$(call buildpkg,applications/k3b-i18n)
-
-koffice-i18n:	tdebase
-	$(call buildpkg,applications/koffice-i18n)
-
-tde-i18n:	tdebase cmake
-	$(call buildpkg,tde-i18n)
-
-### Meta packages
-meta:
-	$(call buildpkg,extras/trinity-desktop)
-
-### Extra packages
-fileshareset:
-	$(call buildpkg,extras/fileshareset)
-
-trinity-filesystem:
-	$(call buildpkg,extras/trinity-filesystem)
-
-ksensors:
-	$(call buildpkg,applications/ksensors)
diff --git a/redhat/applications/abakus/abakus-0.91-link-dcop.patch b/redhat/applications/abakus/abakus-0.91-link-dcop.patch
deleted file mode 100644
index f1dc37127..000000000
--- a/redhat/applications/abakus/abakus-0.91-link-dcop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rcb abakus.ORI/src/SConscript abakus/src/SConscript
-*** abakus.ORI/src/SConscript	2011-09-14 21:44:42.191599072 +0200
---- abakus/src/SConscript	2011-09-14 21:44:51.352602708 +0200
-***************
-*** 66,72 ****
-  myenv.KDEaddpaths_includes('#/src/  #/')
-  
-  ## Necessary libraries to link against
-! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui' )
-  
-  #############################
-  ## Data to install
---- 66,72 ----
-  myenv.KDEaddpaths_includes('#/src/  #/')
-  
-  ## Necessary libraries to link against
-! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui DCOP' )
-  
-  #############################
-  ## Data to install
diff --git a/redhat/applications/abakus/abakus-3.5.12.spec b/redhat/applications/abakus/abakus-3.5.12.spec
deleted file mode 100644
index 91d7f27cd..000000000
--- a/redhat/applications/abakus/abakus-3.5.12.spec
+++ /dev/null
@@ -1,93 +0,0 @@
-# Default version for this component
-%define kdecomp abakus
-%define version 0.91
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Calculator for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-Patch0:		abakus-0.91-link-dcop.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	scons
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal KDE application.
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export CXXFLAGS="-I%{_includedir}/tqt"
-
-./configure
-	
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}%{_prefix}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{tde_docdir}/HTML/*/*/
-%{_datadir}/applnk/Utilities/abakus.desktop
-
-%changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
-- Initial release for RHEL 6 and Fedora 15
-- Import to GIT
diff --git a/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch b/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch
deleted file mode 100644
index 994fb39d5..000000000
--- a/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- abakus-3.5.13.1/CMakeLists.txt.ORI	2012-10-02 19:34:14.633927133 +0000
-+++ abakus-3.5.13.1/CMakeLists.txt	2012-10-02 19:34:25.560708663 +0000
-@@ -66,6 +66,7 @@
- 
- ##### source directories ########################
- 
-+add_subdirectory( icons )
- add_subdirectory( src )
- tde_conditional_add_subdirectory( BUILD_DOC doc )
- tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
diff --git a/redhat/applications/abakus/abakus-3.5.13.1.spec b/redhat/applications/abakus/abakus-3.5.13.1.spec
deleted file mode 100644
index 3a5e75aad..000000000
--- a/redhat/applications/abakus/abakus-3.5.13.1.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp abakus
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-%{kdecomp}
-Summary:	Calculator for TDE
-Version:	0.91
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [abakus] Fix install icon
-Patch1:		abakus-3.5.13.1-fix_install_icon.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-arts-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
-BuildRequires:	bison
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal TDE application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1 -b .icon
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/abakus
-%{tde_datadir}/apps/abakus/
-%{tde_datadir}/icons/hicolor/*/apps/abakus.png
-%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_datadir}/applnk/Utilities/abakus.desktop
-
-%changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-4
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec
deleted file mode 100644
index 9200c19a4..000000000
--- a/redhat/applications/abakus/abakus-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg abakus
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:			trinity-%{tde_pkg}
-Summary:		Calculator for TDE
-Version:		0.91
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	bison
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal TDE application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR="%{tde_prefix}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/abakus
-%{tde_datadir}/apps/abakus/
-%{tde_datadir}/icons/hicolor/*/apps/abakus.png
-%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_datadir}/applnk/Utilities/abakus.desktop
-
-%changelog
diff --git a/redhat/applications/abakus/abakus-3.5.13.spec b/redhat/applications/abakus/abakus-3.5.13.spec
deleted file mode 100644
index b0a33e2cc..000000000
--- a/redhat/applications/abakus/abakus-3.5.13.spec
+++ /dev/null
@@ -1,107 +0,0 @@
-# Default version for this component
-%define kdecomp abakus
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-%{kdecomp}
-Summary:	Calculator for TDE
-Version:	0.91
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel >= 3.5.13
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13
-BuildRequires:	trinity-tdebase-devel >= 3.5.13
-BuildRequires:	desktop-file-utils
-BuildRequires:	scons
-BuildRequires:	bison
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal TDE application.
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CXXFLAGS="-I%{tde_includedir}/tqt"
-
-# We are using a specific (non-autotool) configure script.
-./configure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}%{tde_prefix}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/abakus
-%{tde_datadir}/apps/abakus/
-%{tde_datadir}/icons/hicolor/*/apps/abakus.png
-%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_datadir}/applnk/Utilities/abakus.desktop
-
-%changelog
-* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-3
-- Fix postinstall
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-2
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
-- Initial release for RHEL 6 and Fedora 15
-- Import to GIT
diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec
deleted file mode 100644
index 0939d80f0..000000000
--- a/redhat/applications/adept/adept-3.5.13.2.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-# Default version for this component
-%define tde_pkg adept
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Package management suite for Trinity
-Version:		2.1.3
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://lpnotfr.free.fr/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Requires:		%{name}-manager = %{version}-%{release}
-Requires:		%{name}-installer = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Requires:		%{name}-notifier = %{version}-%{release}
-Requires:		%{name}-batch = %{version}-%{release}
-
-
-%description
-These packages belong to the adept suite:
- * adept-manager - package manager
- * adept-installer - application manager
- * adept-updater - system upgrade wizard
- * adept-notifier - systray notification of available updates
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-
-##########
-
-%package common
-Requires:		trinity-konsole
-Summary:		Package manager for Trinity -- common files
-
-%description common
-Icons and other common files for all adept components.
-
-##########
-
-%package manager
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		package manager for Trinity
- 
-%description manager
-Adept Manager is a graphical user interface for package management.
-
-Besides these basic functions the following features are provided:
- * Search and filter the list of available packages (also using debtags)
- * Perform smart system upgrades
- * Edit the list of used repositories (sources.list)
- * Configure packages through the debconf system
-
-Please also install libtqt-perl if you want the TDE Debconf frontend
-to function.
-
-##########
-
-%package installer
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		simple user interface for application management (for Trinity)
-
-%description installer
-Adept Installer presents a list of applications available through the
-Advanced Package Tool (APT). An application is considered a package
-that contains a .desktop file for use with TDE, GNOME or other
-desktop environment.
-
-##########
-
-%package updater
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		system update tool for Trinity
-
-%description updater
-Adept Updater provides a simple wizard-style user interface to system
-upgrades. It uses same algorithms as apt-get dist-upgrade.
-
-##########
-
-%package notifier
-Requires:		%{name}-common = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Summary:		System tray notifier of available system updates
- 
-%description notifier
-Adept Notifier provides a system tray icon notifying the user of
-available updates.  It will run Adept Updater for the user when
-clicked.
-
-##########
-
-%package batch
-Requires:		%{name}-manager = %{version}-%{release}
-Summary:		command line install for Adept
-
-%description batch
-Adept Batch lets you install packages with Adept from the
-command line.  It is intended for shell scripts and being run
-by external applications.
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --enable-closure
-
-%__make %{?_smp_mflags} -C adept
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
diff --git a/redhat/applications/amarok/amarok-1.4.8-gcc43.patch b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch
deleted file mode 100644
index 8b0c78133..000000000
--- a/redhat/applications/amarok/amarok-1.4.8-gcc43.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -30,6 +30,7 @@ email                : aumuell@reserv.at
- #include <audioproperties.h>
- 
- #include <stdint.h>
-+#include <cstdlib>
- 
- #define MP4V2_HAS_WRITE_BUG 1
- 
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -24,6 +24,7 @@
- 
- #include "taglib_mp4filetyperesolver.h"
- #include "mp4file.h"
-+#include <cstring>
- 
- TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
-         bool readProperties,
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -24,6 +24,8 @@ email                : andrew.leadbetter
- 
- #include <tag.h>
- #include <stdint.h>
-+#include <cstdlib>
-+#include <cstring>
- 
- using namespace TagLib;
- 
-diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
---- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
-+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 21:05:18.000000000 -0600
-@@ -30,6 +30,7 @@ email                : andrew.leadbetter
- #endif
- 
- #include <stdint.h>
-+#include <cstring>
- 
- #ifndef UINT64_TO_DOUBLE
- #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
-diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
---- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp	2008-02-21 21:07:10.000000000 -0600
-@@ -15,6 +15,8 @@
-  the alsa guys
-  ***************************************************************************/
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
---- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h	2008-02-21 21:07:54.000000000 -0600
-@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
- #include <limits.h>
- #include <sys/param.h>
- #include <pthread.h>
-+#include <cstring>
- #include <vector>
- #include <config.h>
- #include <iostream>
-diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
---- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
-+++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp	2008-02-21 21:09:38.000000000 -0600
-@@ -15,6 +15,7 @@
- #include <climits>
- #include <cmath>
- #include <stdarg.h>
-+#include <cstring>
- 
- #include <config.h>
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch b/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch
deleted file mode 100644
index b7fec06cc..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-adds_ruby_1.9_support.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -urN amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake
---- amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake	2012-04-13 01:59:24.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/ConfigureChecks.cmake	2012-05-06 15:18:36.000000000 -0500
-@@ -14,15 +14,51 @@
-   tde_message_fatal( "ruby is required, but was not found on your system" )
- endif( )
- 
-+# In ruby 1.9.x, ruby.h is located in a different location than previous releases.
- execute_process(
--  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
--  OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
-+  OUTPUT_VARIABLE RUBY_VERSION_MAJOR
-   RESULT_VARIABLE _result
-   OUTPUT_STRIP_TRAILING_WHITESPACE )
- if( _result )
-   tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
- endif( )
--
-+execute_process(
-+  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
-+  OUTPUT_VARIABLE RUBY_VERSION_MINOR
-+  RESULT_VARIABLE _result
-+  OUTPUT_STRIP_TRAILING_WHITESPACE )
-+if( _result )
-+  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+endif( )
-+set( RUBY_VERSION ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR} )
-+if ( "${RUBY_VERSION}" GREATER "18" )
-+  execute_process(
-+    COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['rubyhdrdir'] )"
-+    OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+    RESULT_VARIABLE _result
-+    OUTPUT_STRIP_TRAILING_WHITESPACE )
-+  if( _result )
-+    tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+  endif( )
-+else( )
-+  execute_process(
-+    COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
-+    OUTPUT_VARIABLE RUBY_INCLUDE_DIR
-+    RESULT_VARIABLE _result
-+    OUTPUT_STRIP_TRAILING_WHITESPACE )
-+  if( _result )
-+    tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+  endif( )
-+endif( )
-+execute_process(
-+  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['arch'] )"
-+  OUTPUT_VARIABLE RUBY_ARCH
-+  RESULT_VARIABLE _result
-+  OUTPUT_STRIP_TRAILING_WHITESPACE )
-+if( _result )
-+  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
-+endif( )
- execute_process(
-   COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )"
-   OUTPUT_VARIABLE RUBY_LDFLAGS
-@@ -36,4 +72,11 @@
-   message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
-   message( STATUS "  RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
-   message( STATUS "  RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
-+  message( STATUS "  RUBY_VERSION_MAJOR: ${RUBY_VERSION_MAJOR}")
-+  message( STATUS "  RUBY_VERSION_MINOR: ${RUBY_VERSION_MINOR}")
-+  message( STATUS "  RUBY_ARCH: ${RUBY_ARCH}")
-+endif( )
-+if ( "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}" VERSION_LESS "19" )
-+  message( STATUS "  You have an old version of Ruby ! (<1.9)")
-+  set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
- endif( )
-diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt
---- amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt	2012-04-13 01:59:24.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt	2012-05-06 15:19:57.000000000 -0500
-@@ -15,6 +15,8 @@
- )
- 
- include_directories(
-+  ${CMAKE_BINARY_DIR}
-+  ${RUBY_INCLUDE_DIR}/${RUBY_ARCH}
-   ${RUBY_INCLUDE_DIR}
- )
- 
-diff -urN amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c
---- amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c	2012-04-13 03:04:44.000000000 -0500
-+++ amarok.new/amarok/src/mediadevice/daap/mongrel/http11/http11.c	2012-05-06 15:13:20.000000000 -0500
-@@ -2,6 +2,7 @@
-  * Copyright (c) 2005 Zed A. Shaw
-  * You can redistribute it and/or modify it under the same terms as Ruby.
-  */
-+#include "config.h"
- #include "ruby.h"
- #include "ext_help.h"
- #include <assert.h>
-@@ -74,7 +75,11 @@
-   f = rb_str_dup(global_http_prefix);
-   f = rb_str_buf_cat(f, field, flen); 
- 
--  for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
-+#ifdef HAVE_OLD_RUBY
-+   for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
-+#else
-+  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
-+#endif
-     if(*ch == '-') {
-       *ch = '_';
-     } else {
-@@ -157,12 +162,25 @@
- 
-   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
-   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
--    colon = strchr(RSTRING(temp)->ptr, ':');
-+#ifdef HAVE_OLD_RUBY
-+     colon = strchr(RSTRING(temp)->ptr, ':');
-+#else
-+    colon = strchr(RSTRING_PTR(temp), ':');
-+#endif
-     if(colon != NULL) {
--      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
-+#ifdef HAVE_OLD_RUBY
-+       rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
-+#else
-+      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
-+#endif
-       rb_hash_aset(req, global_server_port, 
--          rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
--            RSTRING(temp)->len));
-+#ifdef HAVE_OLD_RUBY
-+           rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
-+             RSTRING(temp)->len));
-+#else
-+          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
-+            RSTRING_LEN(temp)));
-+#endif
-     } else {
-       rb_hash_aset(req, global_server_name, temp);
-       rb_hash_aset(req, global_server_port, global_port_80);
-@@ -281,8 +299,13 @@
-   DATA_GET(self, http_parser, http);
- 
-   from = FIX2INT(start);
--  dptr = RSTRING(data)->ptr;
--  dlen = RSTRING(data)->len;
-+#ifdef HAVE_OLD_RUBY
-+   dptr = RSTRING(data)->ptr;
-+   dlen = RSTRING(data)->len;
-+#else
-+  dptr = RSTRING_PTR(data);
-+  dlen = RSTRING_LEN(data);
-+#endif
- 
-   if(from >= dlen) {
-     rb_raise(eHttpParserError, "Requested start is after data buffer end.");
-@@ -512,7 +535,11 @@
-     if(pref_len == 1 && uri_str[0] == '/') {
-       rb_ary_push(result, uri);
-     } else {
--      rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
-+#ifdef HAVE_OLD_RUBY
-+       rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
-+#else
-+      rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri)));
-+#endif
-     }
- 
-     rb_ary_push(result, (VALUE)handler);
-diff -urN amarok/config.h.cmake amarok.new/config.h.cmake
---- amarok/config.h.cmake	2012-04-13 01:59:26.000000000 -0500
-+++ amarok.new/config.h.cmake	2012-05-06 15:02:40.000000000 -0500
-@@ -16,3 +16,4 @@
- 
- #cmakedefine TAGLIB_15 1
- #cmakedefine HAVE_QGLWIDGET 1
-+#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@
-\ No newline at end of file
-diff -urN amarok/configure.in amarok.new/configure.in
---- amarok/configure.in	2012-04-13 01:59:26.000000000 -0500
-+++ amarok.new/configure.in	2012-05-06 14:53:40.000000000 -0500
-@@ -1162,7 +1162,14 @@
- 
- AC_PATH_PROG(RUBY, ruby, no)
- 
--ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
-+if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
-+	# Ruby 1.9
-+	ruby_includes=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
-+else
-+	# not Ruby 1.9
-+	ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
-+fi
-+
- ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
- 
- AC_SUBST(ruby_includes)
diff --git a/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch b/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch
deleted file mode 100644
index 43c858eec..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ConfigureChecks.cmake.ORI	2011-11-26 21:50:35.425026387 +0100
-+++ ConfigureChecks.cmake	2011-11-26 22:24:21.307053676 +0100
-@@ -88,7 +88,12 @@
- 
-   pkg_search_module( SDL sdl )
-   if( NOT SDL_FOUND )
--    tde_message_fatal( "SDL are required, but not found on your system" )
-+    check_include_file( SDL/SDL.h HAVE_SDL_H )
-+    if( NOT HAVE_SDL_H )
-+      tde_message_fatal( "SDL are required, but not found on your system" )
-+    endif ( )
-+    set ( SDL_INCLUDE_DIRS /usr/include/SDL )
-+    set ( SDL_LIBRARIES SDL pthread )
-   endif( )
- 
-   pkg_search_module( LIBVISUAL libvisual-0.4 )
-@@ -163,7 +168,7 @@
-   set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
-   set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
-   set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
--  set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
-+  set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} )
-   check_cxx_source_compiles("
-     #include <konqsidebarplugin.h>
-     int main(int, char**) { return 0; } "
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch b/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
deleted file mode 100644
index 16ed9beb9..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-enable_akode.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Nuar amarok.ORI/amarok/src/engine/akode/CMakeLists.txt amarok.P/amarok/src/engine/akode/CMakeLists.txt
---- amarok.ORI/amarok/src/engine/akode/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ amarok.P/amarok/src/engine/akode/CMakeLists.txt	2012-01-16 21:42:52.701799667 +0100
-@@ -0,0 +1,37 @@
-+#################################################
-+#
-+#  Improvements and feedback are welcome
-+#
-+#  This file is released under GPL >= 2
-+#
-+#################################################
-+
-+include_directories(
-+  ${CMAKE_CURRENT_BINARY_DIR}
-+  ${CMAKE_BINARY_DIR}
-+  ${CMAKE_BINARY_DIR}/amarok/src/amarokcore
-+  ${CMAKE_SOURCE_DIR}/amarok/src
-+  ${CMAKE_SOURCE_DIR}/amarok/src/engine/akode
-+  ${TDE_INCLUDE_DIR}
-+  ${TQT_INCLUDE_DIRS}
-+  ${AKODE_INCLUDE_DIRS}
-+)
-+
-+link_directories(
-+  ${TQT_LIBRARY_DIRS}
-+)
-+
-+
-+##### other data ################################
-+
-+install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-+
-+
-+##### libamarok_aKode-engine (module) ############
-+
-+tde_add_kpart( libamarok_aKode-engine AUTOMOC
-+  SOURCES
-+    akode-scope.cpp akode-engine.cpp
-+  LINK amarok-shared ${AKODE_LIBRARIES}
-+  DESTINATION ${PLUGIN_INSTALL_DIR}
-+)
-diff -Nuar amarok.ORI/amarok/src/engine/CMakeLists.txt amarok.P/amarok/src/engine/CMakeLists.txt
---- amarok.ORI/amarok/src/engine/CMakeLists.txt	2012-01-16 21:26:50.433584399 +0100
-+++ amarok.P/amarok/src/engine/CMakeLists.txt	2012-01-16 21:27:36.702218362 +0100
-@@ -14,3 +14,4 @@
- add_subdirectory( void )
- tde_conditional_add_subdirectory( WITH_XINE xine )
- tde_conditional_add_subdirectory( WITH_YAUAP yauap )
-+tde_conditional_add_subdirectory( WITH_AKODE akode )
-diff -Nuar amarok.ORI/CMakeLists.txt amarok.P/CMakeLists.txt
---- amarok.ORI/CMakeLists.txt	2012-01-16 21:26:50.418583977 +0100
-+++ amarok.P/CMakeLists.txt	2012-01-16 21:28:23.382857595 +0100
-@@ -47,6 +47,7 @@
- option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
- option( WITH_XINE "Enable xine-engine support" OFF )
- option( WITH_YAUAP "Enable yauap-engine support" OFF )
-+option( WITH_AKODE "Enable akode-engine support" OFF )
- option( WITH_IPOD "Enable iPod support from libgpod" OFF )
- option( WITH_IFP "Enable ifp support" OFF )
- option( WITH_NJB "Enable njb support" OFF )
-diff -Nuar amarok.ORI/ConfigureChecks.cmake amarok.P/ConfigureChecks.cmake
---- amarok.ORI/ConfigureChecks.cmake	2012-01-16 21:26:50.491585184 +0100
-+++ amarok.P/ConfigureChecks.cmake	2012-01-16 21:40:55.883193781 +0100
-@@ -121,6 +121,18 @@
-   endif( )
- endif( )
- 
-+# akode-engine
-+if( WITH_AKODE )
-+  pkg_search_module( AKODE akode )
-+  if( AKODE_FOUND )
-+    if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
-+      tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
-+    endif( )
-+  else( )
-+    tde_message_fatal( "akode is requested, but was not found on your system" )
-+  endif( )
-+endif( )
-+
- 
- # iPod
- if( WITH_IPOD )
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch
deleted file mode 100644
index 7bbd11fca..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt.ORI	2011-11-28 21:59:41.607054279 +0100
-+++ amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt	2011-11-28 21:59:50.413975791 +0100
-@@ -9,7 +9,7 @@
- #
- #################################################
- 
--tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" )
-+#tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" )
- 
- include( ConfigureChecks.cmake )
- 
-@@ -38,6 +38,6 @@
- 
- tde_add_kpart( libamarok_riokarma-mediadevice AUTOMOC
-   SOURCES riokarmamediadevice.cpp
--  LINK amarok-shared ${KARMA_LIBRARIES}
-+  LINK amarok-shared ${KARMA_LIBRARIES} karma
-   DESTINATION ${PLUGIN_INSTALL_DIR}
- )
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 79cfb5940..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp.ORI	2012-05-01 11:44:16.868838499 +0200
-+++ amarok/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2012-05-01 11:44:27.427731738 +0200
-@@ -24,6 +24,8 @@
- 
- #define DEBUG_PREFIX "MtpMediaDevice"
- 
-+#include <stdlib.h>
-+
- #include <config.h>
- #include "mtpmediadevice.h"
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch b/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch
deleted file mode 100644
index 46798b363..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_inotify_support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 899586da27ae7a85cea8637849a964a88f3df8b2
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326222183 -0600
-
-    Fix inotify detection
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 0e14311..090c73b 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -21,7 +21,25 @@ check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
- 
- check_include_file( stdint.h HAVE_STDINT_H )
- check_include_file( systems.h HAVE_SYSTEMS_H )
--check_include_file( linux/inotify.h HAVE_INOTIFY )
-+
-+##### check for inotify ###########################
-+
-+# if( WITH_INOTIFY )
-+  check_include_file( "inotify.h" INOTIFY_FOUND )
-+  check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
-+  if( NOT INOTIFY_FOUND )
-+    if( NOT INOTIFY_SYS_FOUND )
-+      message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
-+    endif( NOT INOTIFY_SYS_FOUND )
-+  endif( NOT INOTIFY_FOUND )
-+  if( INOTIFY_FOUND )
-+      set( HAVE_INOTIFY 1 )
-+  endif( INOTIFY_FOUND )
-+  if( INOTIFY_SYS_FOUND )
-+      set( HAVE_INOTIFY 1 )
-+      set( HAVE_SYS_INOTIFY 1 )
-+  endif( INOTIFY_SYS_FOUND )
-+# endif( )
- 
- check_function_exists( statvfs HAVE_STATVFS )
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch b/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch
deleted file mode 100644
index 82d3542c6..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-fix_linear_alphabet.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 6e5a3b666215cef086b9116b834475227dbf9343
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327529588 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
-index 1d55403..2b1d3e0 100644
---- a/amarok/src/sqlite/sqlite3.c
-+++ b/amarok/src/sqlite/sqlite3.c
-@@ -11964,7 +11964,7 @@ int os2OpenDirectory(
- SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){
-   static const unsigned char zChars[] =
-     "abcdefghijklmnopqrstuvwxyz"
--    "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-     "0123456789";
-   int i, j;
-   PSZ zTempPath = 0;
-@@ -13914,7 +13914,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){
-   };
-   static const unsigned char zChars[] =
-     "abcdefghijklmnopqrstuvwxyz"
--    "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-     "0123456789";
-   int i, j;
-   struct stat buf;
-@@ -17014,7 +17014,7 @@ static int winOpenDirectory(
- SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){
-   static char zChars[] =
-     "abcdefghijklmnopqrstuvwxyz"
--    "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-     "0123456789";
-   int i, j;
-   char zTempPath[SQLITE_TEMPNAME_SIZE];
-@@ -48880,7 +48880,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){
- static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
-   static const unsigned char zSrc[] = 
-      "abcdefghijklmnopqrstuvwxyz"
--     "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-      "0123456789"
-      ".-!,:*^+=_|?/<> ";
-   int iMin, iMax, n, r, i;
diff --git a/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch b/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch
deleted file mode 100644
index 31f5fc0fa..000000000
--- a/redhat/applications/amarok/amarok-3.5.13-taglib_include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- amarok/amarok/src/metadata/audible/CMakeLists.txt.ORI	2011-11-26 22:09:05.179043399 +0100
-+++ amarok/amarok/src/metadata/audible/CMakeLists.txt	2011-11-26 22:10:35.537172082 +0100
-@@ -13,6 +13,7 @@
-   ${CMAKE_BINARY_DIR}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${TAGLIB_INCLUDE_DIRS}
- )
- 
- 
---- amarok/amarok/src/metadata/aac/CMakeLists.txt.ORI	2011-11-26 22:14:32.341267875 +0100
-+++ amarok/amarok/src/metadata/aac/CMakeLists.txt	2011-11-26 22:14:45.323999002 +0100
-@@ -12,6 +12,7 @@
- include_directories(
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${TAGLIB_INCLUDE_DIRS}
- )
- 
- 
---- amarok/amarok/src/metadata/wav/CMakeLists.txt.ORI	2011-11-26 22:16:31.602120951 +0100
-+++ amarok/amarok/src/metadata/wav/CMakeLists.txt	2011-11-26 22:16:51.088400461 +0100
-@@ -13,6 +13,7 @@
-   ${CMAKE_BINARY_DIR}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${TAGLIB_INCLUDE_DIRS}
- )
-
-
---- amarok/amarok/src/collectionscanner/CMakeLists.txt.ORI	2011-11-26 22:26:39.201579899 +0100
-+++ amarok/amarok/src/collectionscanner/CMakeLists.txt	2011-11-26 22:26:58.736094930 +0100
-@@ -15,6 +15,7 @@
-   ${CMAKE_SOURCE_DIR}/amarok/src
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${TAGLIB_INCLUDE_DIRS}
- )
- 
- link_directories(
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch b/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch
deleted file mode 100644
index 2328a62b8..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-add_xine12_support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- amarok-3.5.13.1/amarok/src/engine/xine/xine-engine.cpp.ORI	2012-10-02 20:00:20.751039350 +0000
-+++ amarok-3.5.13.1/amarok/src/engine/xine/xine-engine.cpp	2012-10-02 20:05:34.336512276 +0000
-@@ -1131,7 +1131,11 @@
- 
- bool XineEngine::getAudioCDContents(const TQString &device, KURL::List &urls)
- {
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
-+    const char * const* xine_urls = NULL;
-+#else
-     char **xine_urls = NULL;
-+#endif
-     int num;
-     int i = 0;
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch
deleted file mode 100644
index ae5dc8c65..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-fix_inotify_detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- amarok-3.5.13.1/ConfigureChecks.cmake.ORI	2012-10-11 22:49:54.765461343 +0200
-+++ amarok-3.5.13.1/ConfigureChecks.cmake	2012-10-11 22:49:59.897357764 +0200
-@@ -24,7 +24,7 @@
- 
- ##### check for inotify ###########################
- 
--# if( WITH_INOTIFY )
-+if( WITH_INOTIFY )
-   check_include_file( "inotify.h" INOTIFY_FOUND )
-   check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
-   if( NOT INOTIFY_FOUND )
-@@ -39,7 +39,7 @@
-       set( HAVE_INOTIFY 1 )
-       set( HAVE_SYS_INOTIFY 1 )
-   endif( INOTIFY_SYS_FOUND )
--# endif( )
-+endif( )
- 
- check_function_exists( statvfs HAVE_STATVFS )
- 
---- amarok-3.5.13.1/CMakeLists.txt.ori	2012-10-11 22:50:45.323440818 +0200
-+++ amarok-3.5.13.1/CMakeLists.txt	2012-10-11 22:51:00.569133033 +0200
-@@ -54,6 +54,7 @@
- option( WITH_MTP "Enable mtp support" OFF )
- option( WITH_RIOKARMA "Enable riokarma support" OFF )
- option( WITH_DAAP "Enable daap support" OFF )
-+option( WITH_INOTIFY "Enable inotify support" OFF )
- 
- 
- ##### user requested modules ####################
diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
deleted file mode 100644
index 0b6d3259b..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake.ORI	2012-10-11 22:54:02.017468265 +0200
-+++ amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake	2012-10-11 22:54:52.644445209 +0200
-@@ -16,8 +16,8 @@
- endif( )
- 
- # dbus-tqt
--pkg_search_module( DBUS_TQT dbus-tqt )
--if( NOT DBUS_TQT_FOUND )
--  tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
--endif( )
-+#pkg_search_module( DBUS_TQT dbus-tqt )
-+#if( NOT DBUS_TQT_FOUND )
-+#  tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-+#endif( )
- 
diff --git a/redhat/applications/amarok/amarok-3.5.13.1.spec b/redhat/applications/amarok/amarok-3.5.13.1.spec
deleted file mode 100644
index 08d594486..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.1.spec
+++ /dev/null
@@ -1,406 +0,0 @@
-# Basic package informations
-%define kdecomp amarok
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Media player
-Version:	1.4.10
-Release:	8%{?dist}%{?_variant}
-
-Group: 	    Applications/Multimedia
-License:    GPLv2+
-Url:        http://amarok.kde.org
-
-Prefix:     %{tde_prefix}
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:    amarok-3.5.13.1.tar.gz
-
-Patch1:		amarok-3.5.13.1-add_xine12_support.patch
-Patch2:		amarok-3.5.13.1-fix_inotify_detection.patch
-Patch3:		amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	trinity-akode-devel
-BuildRequires:	trinity-konqueror-devel >= 3.5.13.1
-
-BuildRequires:  alsa-lib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  esound-devel
-BuildRequires:  gettext
-BuildRequires:	pcre-devel
-BuildRequires:  taglib-devel 
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libmp4v2-devel
-%endif
-
-BuildRequires:  libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:  libtool-ltdl-devel
-%endif
-BuildRequires:  libusb-devel
-BuildRequires:  mysql-devel
-BuildRequires:  postgresql-devel
-BuildRequires:  SDL-devel
-BuildRequires:  taglib-devel
-BuildRequires:	sqlite-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires:  xmms-devel}
-
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
-%endif
-
-# IFP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires:  libifp-devel
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define with_karma 1
-BuildRequires:	libkarma-devel
-BuildRequires:	karma-sharp
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-
-# GPOD (ipod) support
-%define with_gpod 1
-%if 0%{?rhel} == 5
-BuildRequires:  trinity-libgpod-devel >= 0.4.2
-%else
-BuildRequires:  libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%define with_mtp 1
-BuildRequires:  libmtp-devel
-BuildRequires:  libmusicbrainz-devel
-
-# Creative Nomad Jukebox
-%define with_njb 1
-BuildRequires:  libnjb-devel
-
-# VISUAL support
-%define with_libvisual 1
-BuildRequires:  libvisual-devel
-
-# TUNEPIMP support
-BuildRequires:  libtunepimp-devel
-
-# INOTIFY support
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}inotifytools-devel
-%endif
-
-# XINE support
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:  libxine-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:  xine-lib-devel
-%endif
-
-# YAUAP support
-%define with_yauap 1
-
-%endif
-
-# ruby
-BuildRequires:	ruby
-BuildRequires:  ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires:  xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%if 0%{?with_gpod}
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%if 0%{?with_ifp}
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-%endif
-# Creative Zen
-%if 0%{?with_njb}
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-%endif
-# MTP players
-%if 0%{?with_mtp}
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-%if 0%{?with_karma}
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-%endif
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%if 0%{?with_xine}
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-%endif
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%if 0%{?with_yauap}
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-%endif
-# AKODE
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary:	%{name} Ruby support
-Group:		Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires:  ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary:	Amarok konqueror (service menus, sidebar) support
-Group:		Applications/Multimedia
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%if 0%{?with_libvisual}
-
-%package visualisation
-Summary:    Visualisation plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-#Requires:   libvisual-plugins
-
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n amarok-3.5.13.1
-%patch1 -p1 -b .xine
-%patch2 -p1 -b .inotify
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-	-DBIN_INSTALL_DIR=%{tde_bindir} \
-	-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-	-DLIB_INSTALL_DIR=%{tde_libdir} \
-	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-	-DCMAKE_SKIP_RPATH="OFF" \
-	-DQT_LIBRARY_DIRS="${QTLIB:-${QTDIR}/%{_lib}}" \
-	%{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-	-DWITH_KONQSIDEBAR=ON \
-	%{?with_xine:-DWITH_XINE=ON} \
-	%{?with_yauap:-DWITH_YAUAP=ON} \
-	-DWITH_AKODE=ON \
-	%{?with_gpod:-DWITH_IPOD=ON} \
-	%{?with_ifp:-DWITH_IFP=ON} \
-	%{?with_njb:-DWITH_NJB=ON} \
-	%{?with_mtp:-DWITH_MTP=ON} \
-	%{?with_karma:-DWITH_RIOKARMA=ON} \
-	%{?with_inotify:-DWITH_INOTIFY=ON} \
-	-DWITH_DAAP=ON \
-	-DBUILD_ALL=ON \
-	..
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
-  fi
-done
-
-# Locales
-for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
-  if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
-    lang=$(basename $locale)
-    echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
-  fi
-done
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-8
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
deleted file mode 100644
index 9f6c153db..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ /dev/null
@@ -1,438 +0,0 @@
-# Basic package informations
-%define tde_pkg amarok
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Media player
-Version:		1.4.10
-Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}
-
-Group:			Applications/Multimedia
-License:		GPLv2+
-Url:			http://amarok.kde.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch3:			amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-konqueror-devel >= %{tde_version}
-
-BuildRequires:	alsa-lib-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	esound-devel
-BuildRequires:	gettext
-BuildRequires:	pcre-devel
-BuildRequires:	taglib-devel 
-
-# LIBTOOL
-BuildRequires:	libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-BuildRequires:	libusb-devel
-BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
-BuildRequires:	SDL-devel
-BuildRequires:	taglib-devel
-BuildRequires:	sqlite-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#{?fedora:BuildRequires:  xmms-devel}
-
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-# DBUS-(T)QT support
-%if 0%{?rhel} == 4
-BuildRequires:	dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-%endif
-
-# IFP support
-#  IFP package is broken under PCLinuxOS.
-%if 0%{?pclinuxos} == 0
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires:	libifp-devel
-%endif
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%define with_karma 1
-BuildRequires:	libkarma-devel
-BuildRequires:	karma-sharp
-%endif
-%endif
-
-# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gpod 1
-BuildRequires:	libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_mtp 1
-BuildRequires:	libmtp-devel
-BuildRequires:	libmusicbrainz-devel
-%endif
-
-# Creative Nomad Jukebox
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-%define with_njb 1
-BuildRequires:	libnjb-devel
-%endif
-
-# VISUAL support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_libvisual 1
-BuildRequires:	libvisual-devel
-%endif
-
-# TUNEPIMP support
-%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires:	libtunepimp-devel
-%endif
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	libtunepimp-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}inotifytools-devel
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# YAUAP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_yauap 1
-%endif
-
-# AKODE support
-%if 0
-%define with_akode 1
-BuildRequires:	trinity-akode-devel
-%endif
-
-# MP4V2 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_mp4v2 1
-BuildRequires:	libmp4v2-devel
-%endif
-
-# ruby
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires:		xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%if 0%{?with_gpod}
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%if 0%{?with_ifp}
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-%endif
-# Creative Zen
-%if 0%{?with_njb}
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-%endif
-# MTP players
-%if 0%{?with_mtp}
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-%if 0%{?with_karma}
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-%endif
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%if 0%{?with_xine}
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-%endif
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%if 0%{?with_yauap}
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-%endif
-# AKODE
-%if 0%{?with_akode}
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-%endif
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary:		%{name} Ruby support
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires:		ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary:		Amarok konqueror (service menus, sidebar) support
-Group:			Applications/Multimedia
-
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%if 0%{?with_libvisual}
-
-%package visualisation
-Summary:		Visualisation plugins for Amarok
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-#Requires:   libvisual-plugins
-
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-  -DWITH_KONQSIDEBAR=ON \
-  %{?with_xine:-DWITH_XINE=ON} \
-  %{?with_yauap:-DWITH_YAUAP=ON} \
-  %{?with_akode:-DWITH_AKODE=ON} \
-  %{?with_gpod:-DWITH_IPOD=ON} \
-  %{?with_ifp:-DWITH_IFP=ON} \
-  %{?with_njb:-DWITH_NJB=ON} \
-  %{?with_mtp:-DWITH_MTP=ON} \
-  %{?with_karma:-DWITH_RIOKARMA=ON} \
-  -DWITH_DAAP=ON \
-  %{?with_mp4v2:-DWITH_MP4V2=ON} \
-  %{?with_inotify:-DWITH_INOTIFY=ON} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# Locales
-%find_lang %{tde_pkg}
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang
-  fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/amarok/amarok-3.5.13.spec b/redhat/applications/amarok/amarok-3.5.13.spec
deleted file mode 100644
index e246498ea..000000000
--- a/redhat/applications/amarok/amarok-3.5.13.spec
+++ /dev/null
@@ -1,381 +0,0 @@
-# Basic package informations
-%define kdecomp amarok
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Media player
-Version:	1.4.10
-Release:	7%{?dist}%{?_variant}
-
-Group: 	    Applications/Multimedia
-License:    GPLv2+
-Url:        http://amarok.kde.org
-
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:    amarok-3.5.13.tar.gz
-
-# RedHat / Fedora legacy patches
-Patch1:     amarok-1.4.8-gcc43.patch
-
-# TDE 3.5.13 RHEL/Fedora patches
-Patch2:		amarok-3.5.13-cmake_konqsidebar.patch
-Patch3:		amarok-3.5.13-taglib_include.patch
-Patch4:		amarok-3.5.13-enable_riokarma.patch
-Patch5:		amarok-3.5.13-enable_akode.patch
-
-Patch6:		amarok-3.5.13-adds_ruby_1.9_support.patch
-Patch7:		amarok-3.5.13-fix_gcc47_compilation.patch
-
-# [amarok] Fix inotify detection [Commit #899586da]
-Patch11:	amarok-3.5.13-fix_inotify_support.patch
-# [amarok] Fix linear alphabet string errors [Commit #6e5a3b66]
-Patch12:	amarok-3.5.13-fix_linear_alphabet.patch
-
-BuildRequires:  alsa-lib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  esound-devel
-BuildRequires:  gettext
-BuildRequires:	tqtinterface-devel
-BuildRequires:  trinity-kdelibs-devel
-BuildRequires:  trinity-kdebase-devel
-BuildRequires:	pcre-devel
-BuildRequires:  taglib-devel 
-BuildRequires:  libifp-devel
-# Ipod
-%if 0%{?rhel} == 5
-BuildRequires:  trinity-libgpod-devel >= 0.4.2
-%else
-BuildRequires:  libgpod-devel >= 0.4.2
-%endif
-BuildRequires:	libmp4v2-devel
-# MTP players
-BuildRequires:  libmtp-devel
-BuildRequires:  libmusicbrainz-devel
-# Creative Nomad Jukebox
-BuildRequires:  libnjb-devel
-BuildRequires:  libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:  libtool-ltdl-devel
-%endif
-BuildRequires:  libtunepimp-devel
-BuildRequires:  libusb-devel
-BuildRequires:  libvisual-devel
-BuildRequires:  mysql-devel
-BuildRequires:  postgresql-devel
-BuildRequires:  SDL-devel
-BuildRequires:  taglib-devel
-BuildRequires:	sqlite-devel
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	trinity-libkarma-devel
-BuildRequires:	trinity-karma-sharp
-%else
-BuildRequires:	libkarma-devel
-BuildRequires:	karma-sharp
-%endif
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires:  xmms-devel}
-BuildRequires:	dbus-devel
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	trinity-akode-devel
-BuildRequires:	trinity-konqueror-devel
-
-# ruby
-BuildRequires:	ruby
-BuildRequires:  ruby-devel
-
-# To open the selected browser, works with Patch2
-Requires:  xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-# xine-lib
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:  libxine-devel
-%else
-BuildRequires:  xine-lib-devel
-%endif
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}inotifytools-devel
-%else
-%endif
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-# Creative Zen
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-# MTP players
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-# Rio Karma
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-## Gstreamer engine
-#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-# AKODE
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
-##########
-
-%package ruby
-Summary:	%{name} Ruby support
-Group:		Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-# For dir ownership and some default plugins (lyrics)
-Requires:  ruby
-
-%description ruby
-%{summary}.
-
-%files ruby
-%defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
-
-##########
-
-%package konqueror
-Summary:	Amarok konqueror (service menus, sidebar) support
-Group:		Applications/Multimedia
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%package visualisation
-Summary:    Visualisation plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-#Requires:   libvisual-plugins
-
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-
-##########
-
-
-%prep
-%setup -q -n applications/amarok
-%patch1 -p1 -b .gcc43
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .ruby
-%patch7 -p1
-
-%patch11 -p1 -b .inotify
-%patch12 -p1 -b .alphabet
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-	-DBIN_INSTALL_DIR=%{tde_bindir} \
-	-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-	-DLIB_INSTALL_DIR=%{tde_libdir} \
-	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-	-DCMAKE_SKIP_RPATH="OFF" \
-	-DQT_LIBRARY_DIRS="${QTLIB}" \
-	-DWITH_LIBVISUAL=ON \
-	-DWITH_KONQSIDEBAR=ON \
-	-DWITH_XINE=ON \
-	-DWITH_YAUAP=ON \
-	-DWITH_AKODE=ON \
-	-DWITH_IPOD=ON \
-	-DWITH_IFP=ON \
-	-DWITH_NJB=ON \
-	-DWITH_MTP=ON \
-	-DWITH_RIOKARMA=ON \
-	-DWITH_DAAP=ON \
-	-DBUILD_ALL=ON \
-	..
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
-  fi
-done
-
-# Locales
-for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
-  if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
-    lang=$(basename $locale)
-    echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
-  fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-
-
-
-
-%changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-7
-- Fix linear alphabet string errors [Commit #6e5a3b66]
-- Fix dependencies issues with -devel packages.
-
-* Mon Apr 29 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-6
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7
-- Fix inotify detection [Commit #899586da]
-
-* Mon Mar 19 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-5
-- Replaces BR "libgpod" with "trinity-libgpod" for EL5
-
-* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-4
-- Enable 'akode' support
-- Removes 'libvisual-plugins' dependency (obsolete ?)
-
-* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-3
-- Enable riokarma support
-- Enhance localized files packaging
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-2
-- Enable RHEL 5 compilation
-- Add konqueror sidebar
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-1
-- Initial release for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Spec file based on Fedora 8 'amarok-1.4.10-1'
diff --git a/redhat/applications/basket/basket-3.5.12.spec b/redhat/applications/basket/basket-3.5.12.spec
deleted file mode 100644
index fbd83bef0..000000000
--- a/redhat/applications/basket/basket-3.5.12.spec
+++ /dev/null
@@ -1,118 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-%define version 1.0.3.1
-%define release 3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/services/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/services/*/*.desktop
-%{_datadir}/config/magic/*.magic
-%{_libdir}/*.so
-%{tde_libdir}/*.so
-
-%exclude %{_libdir}/*.la
-%exclude %{tde_libdir}/*.la
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Import to GIT
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
-- Add correction for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index f9706285f..000000000
--- a/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- basket/src/likeback.cpp.ORI	2012-05-01 13:57:36.852590875 +0200
-+++ basket/src/likeback.cpp	2012-05-01 13:57:51.403632210 +0200
-@@ -50,6 +50,7 @@
- #include <pwd.h>
- 
- #include <iostream>
-+#include <unistd.h>
- 
- #include "likeback.h"
- #include "likeback_private.h"
diff --git a/redhat/applications/basket/basket-3.5.13.1.spec b/redhat/applications/basket/basket-3.5.13.1.spec
deleted file mode 100644
index e490398ca..000000000
--- a/redhat/applications/basket/basket-3.5.13.1.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	1.0.3.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [basket] Fix compilation with GCC 4.7
-Patch1:	basket-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: trinity-tdepim-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-BuildRequires: gpgme-devel
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--includedir=%{tde_tdeincludedir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%Changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec
deleted file mode 100644
index c392dea83..000000000
--- a/redhat/applications/basket/basket-3.5.13.2.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-# Default version for this component
-%define tde_pkg basket
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Taking care of your ideas.
-Version:		1.0.3.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gpgme-devel
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-%postun
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%changelog
diff --git a/redhat/applications/basket/basket-3.5.13.spec b/redhat/applications/basket/basket-3.5.13.spec
deleted file mode 100644
index b9d845859..000000000
--- a/redhat/applications/basket/basket-3.5.13.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	1.0.3.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [basket] Fix compilation with GCC 4.7
-Patch1:	basket-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: gpgme-devel
-BuildRequires: trinity-tdepim-devel >= 3.5.13
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
-- Fix build, post and postun
-- Fix compilation with GCC 4.7
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
deleted file mode 100644
index 8bec59af8..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg bibletime
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		A bible study tool for Trinity
-Version:		1.6.6.0
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# Requires: clucene
-%if 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	clucene-core-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}clucene-devel
-%endif
-
-# Requires: sword
-BuildRequires:	sword-devel
-Requires:		sword
-
-%description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
- 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
-  --with-sword-dir=%{tde_prefix}
-%endif
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_datadir}/applications -q &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_datadir}/applications -q &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/bibletime
-%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
-%{tde_datadir}/apps/bibletime/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_tdedocdir}/HTML/en/bibletime/
-
-
-%changelog
diff --git a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec
deleted file mode 100644
index 85a90a849..000000000
--- a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define kdecomp compizconfig-backend-kconfig
-%define version 3.5.12
-%endif
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{?kdecomp}
-Version:	%{?version}
-Release:	%{?release}%{?dist}
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Summary:        kconfig backend for compizconfig
-
-Group:          System Environment/Libraries
-License:        GPLv2+
-URL:            http://www.opencompositing.org
-
-Prefix:		%{tde_prefix}
-
-Source0:	%{kdecomp}-%{version}.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	libcompizconfig-devel intltool
-Requires:		compiz
-
-
-%description
-The Compiz Fusion Project brings 3D desktop visual effects that improve
-usability of the X Window System and provide increased productivity
-through plugins and themes contributed by the community giving a
-rich desktop experience.
-
-This package contains the kconfig backend for libcompizconfig
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.GPL COPYING.LGPL
-%{_usr}/%{_lib}/compizconfig/backends/*.so
-%exclude %{_usr}/%{_lib}/compizconfig/backends/*.la
-
-%changelog
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch b/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch
deleted file mode 100644
index a163feb78..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_fomat_not_string_literal.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 029218cd9cd3192a2a61ac29d896a2c3640f2dd8
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336066180 -0500
-
-    Fix 'format not a string literal' error
-
-diff --git a/digikam/libs/sqlite2/shell.c b/digikam/libs/sqlite2/shell.c
-index 1100f38..89898ab 100644
---- a/digikam/libs/sqlite2/shell.c
-+++ b/digikam/libs/sqlite2/shell.c
-@@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
-   }else
- 
-   if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
--    fprintf(stderr,zHelp);
-+    fprintf(stderr, "%s", zHelp);
-   }else
- 
-   if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
deleted file mode 100644
index c69027708..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_jpeg_code.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-commit b9419cd5ed26f4ed70b882243cc4bd8a6f19797e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326324936 -0600
-
-    Fix digikam FTBFS due to jpeg code
-
-diff --git a/digikam/libs/jpegutils/jpegint.h b/digikam/libs/jpegutils/jpegint.h
-index 1fa82f8..27546f3 100644
---- a/digikam/libs/jpegutils/jpegint.h
-+++ b/digikam/libs/jpegutils/jpegint.h
-@@ -42,9 +42,9 @@ typedef enum {			/* Operating modes for buffer controllers */
- 
- /* Master control module */
- struct jpeg_comp_master {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -53,16 +53,16 @@ struct jpeg_comp_master {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -73,23 +73,23 @@ struct jpeg_c_prep_controller {
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -99,9 +99,9 @@ struct jpeg_downsampler {
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -110,23 +110,23 @@ struct jpeg_forward_dct {
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -134,8 +134,8 @@ struct jpeg_marker_writer {
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -143,10 +143,10 @@ struct jpeg_decomp_master {
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -155,18 +155,18 @@ struct jpeg_input_controller {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -174,8 +174,8 @@ struct jpeg_d_coef_controller {
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -186,12 +186,12 @@ struct jpeg_d_post_controller {
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -206,8 +206,8 @@ struct jpeg_marker_reader {
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -216,21 +216,21 @@ struct jpeg_entropy_decoder {
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -243,20 +243,20 @@ struct jpeg_upsampler {
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch
deleted file mode 100644
index 0522ec982..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_015.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 18ecd51264727c75ab3e17a762d8f95361023f0a
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1340749881 -0500
-
-    Fix FTBFS on png >= 0.15
-
-diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
-index 6dba518..97acf12 100644
---- a/digikam/kioslave/digikamthumbnail.cpp
-+++ b/digikam/kioslave/digikamthumbnail.cpp
-@@ -413,16 +413,16 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
-     if (color_type == PNG_COLOR_TYPE_PALETTE)
-         png_set_expand(png_ptr);
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         has_alpha = 1;
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-         has_alpha = 1;
-         has_grey = 1;
-     }
- 
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+    if (color_type == PNG_COLOR_TYPE_GRAY)
-         has_grey = 1;
- 
-     unsigned char **lines;
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch b/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
deleted file mode 100644
index c384ff2fc..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_ftbfs_png_code.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit 3e27b07ff572b00aa5f013f039c3f63593016816
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326324999 -0600
-
-    Fix FTBFS due to png code
-    This closes Bug 595
-
-diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
-index 33ba573..96cba8e 100644
---- a/digikam/kioslave/digikamthumbnail.cpp
-+++ b/digikam/kioslave/digikamthumbnail.cpp
-@@ -370,7 +370,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
-     unsigned char buf[PNG_BYTES_TO_CHECK];
- 
-     fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--    if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+    if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-     {
-         fclose(f);
-         return qimage;
-@@ -465,7 +465,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
-     {
-         png_set_gray_to_rgb(png_ptr);
-         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
--            png_set_gray_1_2_4_to_8(png_ptr);
-+            png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     int sizeOfUint = sizeof(unsigned int);
-diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
-index ac1fcf8..3367561 100644
---- a/digikam/libs/dimg/loaders/pngloader.cpp
-+++ b/digikam/libs/dimg/loaders/pngloader.cpp
-@@ -88,7 +88,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
-     unsigned char buf[PNG_BYTES_TO_CHECK];
- 
-     fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--    if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+    if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-     {
-         DDebug() << k_funcinfo << "Not a PNG image file." << endl;
-         fclose(f);
-@@ -252,7 +252,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
- #ifdef ENABLE_DEBUG_MESSAGES
-                 DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
- #endif
--                png_set_gray_1_2_4_to_8(png_ptr);
-+                png_set_expand_gray_1_2_4_to_8(png_ptr);
-                 png_set_gray_to_rgb(png_ptr);
- 
-                 if (TQImage::systemByteOrder() == TQImage::LittleEndian)       // Intel
-diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h
-index e240f99..714920e 100644
---- a/digikam/libs/greycstoration/CImg.h
-+++ b/digikam/libs/greycstoration/CImg.h
-@@ -29449,7 +29449,7 @@ namespace cimg_library {
-         new_bit_depth = 8;
-       }
-       if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-         new_bit_depth = 8;
-       }
-       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch b/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
deleted file mode 100644
index fa9f2a6d6..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1334801652 -0500
-
-    Fix usage of obsolete libpng jmpbuf member
-
-diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
-index 96cba8e..6dba518 100644
---- a/digikam/kioslave/digikamthumbnail.cpp
-+++ b/digikam/kioslave/digikamthumbnail.cpp
-@@ -392,7 +392,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
-         return qimage;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-         fclose(f);
-diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
-index 3367561..fd5d771 100644
---- a/digikam/libs/dimg/loaders/pngloader.cpp
-+++ b/digikam/libs/dimg/loaders/pngloader.cpp
-@@ -120,7 +120,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
-     // PNG error handling. If an error occurs during reading, libpng
-     // will jump here
- 
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -526,7 +526,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
-     // PNG error handling. If an error occurs during writing, libpng
-     // will jump here
- 
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
-         fclose(f);
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch b/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch
deleted file mode 100644
index aa7e6f2b9..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-fix_reinterpret_cast.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1336340005 -0500
-
-    Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>.
-    Thanks to /dev/ammo42.
-
-diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
-index fa6dad9..6862b6e 100644
---- a/digikam/libs/dimg/loaders/pngloader.cpp
-+++ b/digikam/libs/dimg/loaders/pngloader.cpp
-@@ -611,7 +611,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
-     if (!profile_rawdata.isEmpty())
-     {
- #if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
--        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
-+        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, reinterpret_cast<iCCP_data>(profile_rawdata.data()), profile_rawdata.size());
- #else
-         png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
- #endif
diff --git a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch
deleted file mode 100644
index 69dcadda7..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a94890345ef2caae35a72ed3a398b2984349bb2f
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335586728 -0500
-
-    GCC 4.7 fix.
-    This partially resolves bug report 958.
-    Thanks to David C. Rankin.
-
-diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
-index fd5d771..fa6dad9 100644
---- a/digikam/libs/dimg/loaders/pngloader.cpp
-+++ b/digikam/libs/dimg/loaders/pngloader.cpp
-@@ -57,6 +57,12 @@ extern "C"
- namespace Digikam
- {
- 
-+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
-+  typedef png_bytep iCCP_data;
-+#else
-+  typedef png_charp iCCP_data;
-+#endif
-+
- PNGLoader::PNGLoader(DImg* image)
-          : DImgLoader(image)
- {
-@@ -403,7 +409,12 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
- 
-     TQMap<int, TQByteArray>& metaData = imageMetaData();
- 
-+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
-+    png_charp   profile_name;
-+    iCCP_data   profile_data=NULL;
-+#else
-     png_charp   profile_name, profile_data=NULL;
-+#endif
-     png_uint_32 profile_size;
-     int         compression_type;
- 
-@@ -599,7 +610,11 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
- 
-     if (!profile_rawdata.isEmpty())
-     {
-+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
-+        png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
-+#else
-         png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
-+#endif
-     }
- 
-     // -------------------------------------------------------------------
diff --git a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch b/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch
deleted file mode 100644
index db5e90c6d..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-gcc_47_fix2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit a209c81b78b8af98c53748bc1eb9020ef6b2605e
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335586778 -0500
-
-    GCC 4.7 fix.
-    This partially resolves bug report 958.
-    Thanks to David C. Rankin.
-
-diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
-index d6b9f74..07f43bb 100644
---- a/digikam/digikam/albummanager.cpp
-+++ b/digikam/digikam/albummanager.cpp
-@@ -1579,16 +1579,16 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data)
- 
-         // Check if Year Album already exist.
-         DAlbum *yAlbum = 0;
--        AlbumIterator it(d->rootDAlbum);
--        while (it.current())
-+        AlbumIterator it2(d->rootDAlbum);
-+        while (it2.current())
-         {
--            DAlbum* a = (DAlbum*)(*it);
-+            DAlbum* a = (DAlbum*)(*it2);
-             if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
-             {
-                 yAlbum = a;
-                 break;
-             }
--            ++it;
-+            ++it2;
-         }
- 
-         // If no, create Year album.
diff --git a/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch b/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
deleted file mode 100644
index a51f7256c..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- digikam/digikam/digikam/Makefile.am.ORI	2012-08-03 19:41:42.791088483 +0200
-+++ digikam/digikam/digikam/Makefile.am	2012-08-03 19:41:56.661794764 +0200
-@@ -111,6 +111,8 @@
- #       if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null.
- libdigikam_la_LIBADD = $(LIB_SQLITE3) \
- 	               $(LIB_SQLITE3_LOCAL) \
-+		       $(LIB_QT) \
-+		       $(LIB_KPARTS) \
- 	               $(LIB_KIO) \
- 	               $(LIB_KABC) \
- 	               $(LIB_KHTML) \
diff --git a/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch b/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch
deleted file mode 100644
index 3de45eead..000000000
--- a/redhat/applications/digikam/digikam-3.5.13-remove_version_h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 0f64ac7c10fb4053f578ef950e55510818d6d440
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334285499 -0500
-
-    Remove version.h. Cruft from an older version prior to 0.9.6.
-    Part of an extensive cleanup of various problems with kipi-plugins, digikam,
-    and gwenview to resolve bug reports 241, 962, 963.
-
-diff --git a/digikam/digikam/version.h b/digikam/digikam/version.h
-deleted file mode 100644
-index d9baae1..0000000
---- a/digikam/digikam/version.h
-+++ /dev/null
-@@ -1,29 +0,0 @@
--/* ============================================================
-- *
-- * This file is a part of digiKam project
-- * http://www.digikam.org
-- *
-- * Date        : 2004-09-09
-- * Description : digiKam release ID header.
-- *
-- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- *
-- * This program is free software; you can redistribute it
-- * and/or modify it under the terms of the GNU General
-- * Public License as published by the Free Software Foundation;
-- * either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * ============================================================ */
--
--#ifndef DIGIKAM_VERSION_H
--#define DIGIKAM_VERSION_H
--
--static const char digikam_version[] = "0.9.4";
--
--#endif // DIGIKAM_VERSION_H
diff --git a/redhat/applications/digikam/digikam-3.5.13.1.spec b/redhat/applications/digikam/digikam-3.5.13.1.spec
deleted file mode 100644
index 9901bd7ab..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.1.spec
+++ /dev/null
@@ -1,341 +0,0 @@
-# Default version for this component
-%define kdecomp digikam
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	digital photo management application for KDE [Trinity]
-Version:	0.9.6
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-Patch9:		digikam-3.5.13-fix_ftbfs_png_015.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	trinity-libkexiv2-devel >= 3.5.13.1
-BuildRequires:	trinity-libkdcraw-devel >= 3.5.13.1
-BuildRequires:	trinity-libkipi-devel >= 3.5.13.1
-%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	gphoto2-devel
-%else
-BuildRequires:	libgphoto2-devel
-%endif
-BuildRequires:	libtiff-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# JASPER support
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%else
-BuildRequires:	jasper-devel
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-Requires:	trinity-libkexiv2 >= 3.5.13.1
-Requires:	trinity-libkdcraw >= 3.5.13.1
-Requires:	trinity-libkipi >= 3.5.13.1
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for %{name}
-Requires:	%{name} = %{version}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch9 -p1 -b .png015
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_tdeincludedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/digikam
-%{tde_bindir}/digikamthemedesigner
-%{tde_bindir}/digitaglinktree
-%{tde_bindir}/showfoto
-%{tde_libdir}/libdigikam.so.0
-%{tde_libdir}/libdigikam.so.0.0.0
-%{tde_tdelibdir}/kio_digikamalbums.la
-%{tde_tdelibdir}/kio_digikamalbums.so
-%{tde_tdelibdir}/kio_digikamdates.la
-%{tde_tdelibdir}/kio_digikamdates.so
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
-%{tde_tdelibdir}/digikamimageplugin_blurfx.la
-%{tde_tdelibdir}/digikamimageplugin_blurfx.so
-%{tde_tdelibdir}/digikamimageplugin_border.la
-%{tde_tdelibdir}/digikamimageplugin_border.so
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
-%{tde_tdelibdir}/digikamimageplugin_charcoal.la
-%{tde_tdelibdir}/digikamimageplugin_charcoal.so
-%{tde_tdelibdir}/digikamimageplugin_colorfx.la
-%{tde_tdelibdir}/digikamimageplugin_colorfx.so
-%{tde_tdelibdir}/digikamimageplugin_core.la
-%{tde_tdelibdir}/digikamimageplugin_core.so
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
-%{tde_tdelibdir}/digikamimageplugin_emboss.la
-%{tde_tdelibdir}/digikamimageplugin_emboss.so
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
-%{tde_tdelibdir}/digikamimageplugin_freerotation.la
-%{tde_tdelibdir}/digikamimageplugin_freerotation.so
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
-%{tde_tdelibdir}/digikamimageplugin_infrared.la
-%{tde_tdelibdir}/digikamimageplugin_infrared.so
-%{tde_tdelibdir}/digikamimageplugin_inpainting.la
-%{tde_tdelibdir}/digikamimageplugin_inpainting.so
-%{tde_tdelibdir}/digikamimageplugin_inserttext.la
-%{tde_tdelibdir}/digikamimageplugin_inserttext.so
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
-%{tde_tdelibdir}/digikamimageplugin_perspective.la
-%{tde_tdelibdir}/digikamimageplugin_perspective.so
-%{tde_tdelibdir}/digikamimageplugin_raindrop.la
-%{tde_tdelibdir}/digikamimageplugin_raindrop.so
-%{tde_tdelibdir}/digikamimageplugin_restoration.la
-%{tde_tdelibdir}/digikamimageplugin_restoration.so
-%{tde_tdelibdir}/digikamimageplugin_sheartool.la
-%{tde_tdelibdir}/digikamimageplugin_sheartool.so
-%{tde_tdelibdir}/digikamimageplugin_superimpose.la
-%{tde_tdelibdir}/digikamimageplugin_superimpose.so
-%{tde_tdelibdir}/digikamimageplugin_texture.la
-%{tde_tdelibdir}/digikamimageplugin_texture.so
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.so
-%{tde_tdelibdir}/kio_digikamsearch.la
-%{tde_tdelibdir}/kio_digikamsearch.so
-%{tde_tdelibdir}/kio_digikamtags.la
-%{tde_tdelibdir}/kio_digikamtags.so
-%{tde_tdelibdir}/kio_digikamthumbnail.la
-%{tde_tdelibdir}/kio_digikamthumbnail.so
-%{tde_tdeappdir}/digikam.desktop
-%{tde_tdeappdir}/showfoto.desktop
-%{tde_datadir}/apps/digikam/
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-%{tde_datadir}/apps/showfoto/
-%{tde_datadir}/icons/hicolor/*/apps/digikam.png
-%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
-%{tde_datadir}/services/digikamalbums.protocol
-%{tde_datadir}/services/digikamdates.protocol
-%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
-%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
-%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
-%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
-%{tde_datadir}/services/digikamimageplugin_border.desktop
-%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
-%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
-%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
-%{tde_datadir}/services/digikamimageplugin_core.desktop
-%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
-%{tde_datadir}/services/digikamimageplugin_emboss.desktop
-%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
-%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
-%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
-%{tde_datadir}/services/digikamimageplugin_infrared.desktop
-%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
-%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
-%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
-%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
-%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
-%{tde_datadir}/services/digikamimageplugin_perspective.desktop
-%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
-%{tde_datadir}/services/digikamimageplugin_restoration.desktop
-%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
-%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
-%{tde_datadir}/services/digikamimageplugin_texture.desktop
-%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
-%{tde_datadir}/services/digikamsearch.protocol
-%{tde_datadir}/services/digikamtags.protocol
-%{tde_datadir}/services/digikamthumbnail.protocol
-%{tde_datadir}/servicetypes/digikamimageplugin.desktop
-%{tde_mandir}/man*/*
-#%{tde_tdedocdir}/HTML/en/digikam-apidocs/
-
-
-%files devel
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Add support for Mageia 2 and Mandriva 2011
-- Removes old patches, adds GIT patches.
-- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
-- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
-- Remove version.h. Cruft from an older version prior to 0.9.6.
-- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
-- GCC 4.7 fix. [Bug #958] [Commit #a9489034]
-- GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
-- Fix 'format not a string literal' error [Commit #029218cd]
-- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
-- Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Fix man directory location
-- Fix postinstall
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch
deleted file mode 100644
index 8a5262dda..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp.ORI	2013-03-10 21:44:37.468543760 +0100
-+++ trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp	2013-03-10 21:45:23.246560198 +0100
-@@ -258,7 +258,7 @@
- #ifdef ENABLE_DEBUG_MESSAGES
-                 DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
- #endif
--                png_set_expand_gray_1_2_4_to_8(png_ptr);
-+                png_set_gray_1_2_4_to_8(png_ptr);
-                 png_set_gray_to_rgb(png_ptr);
- 
-                 if (TQImage::systemByteOrder() == TQImage::LittleEndian)       // Intel
---- trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp.ORI	2013-03-10 21:50:56.994910746 +0100
-+++ trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp	2013-03-10 21:51:09.150668622 +0100
-@@ -465,7 +465,7 @@
-     {
-         png_set_gray_to_rgb(png_ptr);
-         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
--            png_set_expand_gray_1_2_4_to_8(png_ptr);
-+            png_set_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     int sizeOfUint = sizeof(unsigned int);
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
deleted file mode 100644
index 46bb635af..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ /dev/null
@@ -1,311 +0,0 @@
-# Default version for this component
-%define tde_pkg digikam
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		digital photo management application for TDE [Trinity]
-Version:		0.9.6
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [Digikam] Revert PNG support to libpng12 (for RHEL4)
-Patch1:		digikam-3.5.13.2-fix_png12_support.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-libkexiv2-devel
-BuildRequires:	trinity-libkdcraw-devel
-BuildRequires:	trinity-libkipi-devel
-
-BuildRequires:	libtiff-devel
-BuildRequires:	gettext
-
-# GPHOTO2 support
-%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	gphoto2-devel
-%else
-BuildRequires:	libgphoto2-devel
-%endif
-
-# JASPER support
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%else
-BuildRequires:	jasper-devel
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-Requires:		trinity-libkexiv2
-Requires:		trinity-libkdcraw
-Requires:		trinity-libkipi
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group:			Development/Libraries
-Summary:		Development files for %{name}
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .png12
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR="%{tde_prefix}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/digikam
-%{tde_bindir}/digikamthemedesigner
-%{tde_bindir}/digitaglinktree
-%{tde_bindir}/showfoto
-%{tde_libdir}/libdigikam.so.0
-%{tde_libdir}/libdigikam.so.0.0.0
-%{tde_tdelibdir}/kio_digikamalbums.la
-%{tde_tdelibdir}/kio_digikamalbums.so
-%{tde_tdelibdir}/kio_digikamdates.la
-%{tde_tdelibdir}/kio_digikamdates.so
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
-%{tde_tdelibdir}/digikamimageplugin_blurfx.la
-%{tde_tdelibdir}/digikamimageplugin_blurfx.so
-%{tde_tdelibdir}/digikamimageplugin_border.la
-%{tde_tdelibdir}/digikamimageplugin_border.so
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
-%{tde_tdelibdir}/digikamimageplugin_charcoal.la
-%{tde_tdelibdir}/digikamimageplugin_charcoal.so
-%{tde_tdelibdir}/digikamimageplugin_colorfx.la
-%{tde_tdelibdir}/digikamimageplugin_colorfx.so
-%{tde_tdelibdir}/digikamimageplugin_core.la
-%{tde_tdelibdir}/digikamimageplugin_core.so
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
-%{tde_tdelibdir}/digikamimageplugin_emboss.la
-%{tde_tdelibdir}/digikamimageplugin_emboss.so
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
-%{tde_tdelibdir}/digikamimageplugin_freerotation.la
-%{tde_tdelibdir}/digikamimageplugin_freerotation.so
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
-%{tde_tdelibdir}/digikamimageplugin_infrared.la
-%{tde_tdelibdir}/digikamimageplugin_infrared.so
-%{tde_tdelibdir}/digikamimageplugin_inpainting.la
-%{tde_tdelibdir}/digikamimageplugin_inpainting.so
-%{tde_tdelibdir}/digikamimageplugin_inserttext.la
-%{tde_tdelibdir}/digikamimageplugin_inserttext.so
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
-%{tde_tdelibdir}/digikamimageplugin_perspective.la
-%{tde_tdelibdir}/digikamimageplugin_perspective.so
-%{tde_tdelibdir}/digikamimageplugin_raindrop.la
-%{tde_tdelibdir}/digikamimageplugin_raindrop.so
-%{tde_tdelibdir}/digikamimageplugin_restoration.la
-%{tde_tdelibdir}/digikamimageplugin_restoration.so
-%{tde_tdelibdir}/digikamimageplugin_sheartool.la
-%{tde_tdelibdir}/digikamimageplugin_sheartool.so
-%{tde_tdelibdir}/digikamimageplugin_superimpose.la
-%{tde_tdelibdir}/digikamimageplugin_superimpose.so
-%{tde_tdelibdir}/digikamimageplugin_texture.la
-%{tde_tdelibdir}/digikamimageplugin_texture.so
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.so
-%{tde_tdelibdir}/kio_digikamsearch.la
-%{tde_tdelibdir}/kio_digikamsearch.so
-%{tde_tdelibdir}/kio_digikamtags.la
-%{tde_tdelibdir}/kio_digikamtags.so
-%{tde_tdelibdir}/kio_digikamthumbnail.la
-%{tde_tdelibdir}/kio_digikamthumbnail.so
-%{tde_tdeappdir}/digikam.desktop
-%{tde_tdeappdir}/showfoto.desktop
-%{tde_datadir}/apps/digikam/
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-%{tde_datadir}/apps/showfoto/
-%{tde_datadir}/icons/hicolor/*/apps/digikam.png
-%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
-%{tde_datadir}/services/digikamalbums.protocol
-%{tde_datadir}/services/digikamdates.protocol
-%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
-%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
-%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
-%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
-%{tde_datadir}/services/digikamimageplugin_border.desktop
-%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
-%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
-%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
-%{tde_datadir}/services/digikamimageplugin_core.desktop
-%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
-%{tde_datadir}/services/digikamimageplugin_emboss.desktop
-%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
-%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
-%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
-%{tde_datadir}/services/digikamimageplugin_infrared.desktop
-%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
-%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
-%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
-%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
-%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
-%{tde_datadir}/services/digikamimageplugin_perspective.desktop
-%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
-%{tde_datadir}/services/digikamimageplugin_restoration.desktop
-%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
-%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
-%{tde_datadir}/services/digikamimageplugin_texture.desktop
-%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
-%{tde_datadir}/services/digikamsearch.protocol
-%{tde_datadir}/services/digikamtags.protocol
-%{tde_datadir}/services/digikamthumbnail.protocol
-%{tde_datadir}/servicetypes/digikamimageplugin.desktop
-%{tde_mandir}/man*/*
-#%{tde_tdedocdir}/HTML/en/digikam-apidocs/
-
-
-%files devel
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%changelog
diff --git a/redhat/applications/digikam/digikam-3.5.13.spec b/redhat/applications/digikam/digikam-3.5.13.spec
deleted file mode 100644
index f1ff6d1ab..000000000
--- a/redhat/applications/digikam/digikam-3.5.13.spec
+++ /dev/null
@@ -1,297 +0,0 @@
-# Default version for this component
-%define kdecomp digikam
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	digital photo management application for KDE [Trinity]
-Version:	0.9.6
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [digikam] Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
-Patch1:		digikam-3.5.13-fix_ftbfs_jpeg_code.patch
-# [digikam] Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
-Patch2:		digikam-3.5.13-fix_ftbfs_png_code.patch
-# [digikam] Remove version.h. Cruft from an older version prior to 0.9.6.
-#   Part of an extensive cleanup of various problems with kipi-plugins, digikam,
-#   and gwenview to resolve bug reports 241, 962, 963.
-Patch3:		digikam-3.5.13-remove_version_h.patch
-# [digikam] Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
-Patch4:		digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
-# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a9489034]
-Patch5:		digikam-3.5.13-gcc_47_fix.patch
-# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
-Patch6:		digikam-3.5.13-gcc_47_fix2.patch
-# [digikam] Fix 'format not a string literal' error [Commit #029218cd]
-Patch7:		digikam-3.5.13-fix_fomat_not_string_literal.patch
-# [digikam] Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
-Patch8:		digikam-3.5.13-fix_reinterpret_cast.patch
-# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-Patch9:		digikam-3.5.13-fix_ftbfs_png_015.patch
-# [digikam] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch10:	digikam-3.5.13-missing_ldflags.patch
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: trinity-libkexiv2-devel
-BuildRequires: trinity-libkdcraw-devel
-BuildRequires: trinity-libkipi-devel
-%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: gphoto2-devel
-%else
-BuildRequires: libgphoto2-devel
-%endif
-BuildRequires: libtiff-devel
-BuildRequires: jasper-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%else
-BuildRequires:	exiv2-devel
-%endif
-
-Requires:	trinity-libkexiv2
-Requires:	trinity-libkdcraw
-Requires:	trinity-libkipi
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for %{name}
-Requires:	%{name} = %{version}
-
-%description devel
-%{summary}
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -E
-%patch4 -p1 
-%patch5 -p1 -b .gcc47
-%patch6 -p1 -b .gcc47
-%patch7 -p1 -b .ftbfs
-%patch8 -p1
-%patch9 -p1 -b .png015
-%patch10 -p1 -b .ftbfs
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_tdeincludedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/digikam
-%{tde_bindir}/digikamthemedesigner
-%{tde_bindir}/digitaglinktree
-%{tde_bindir}/showfoto
-%{tde_libdir}/libdigikam.so.0
-%{tde_libdir}/libdigikam.so.0.0.0
-%{tde_tdelibdir}/kio_digikamalbums.la
-%{tde_tdelibdir}/kio_digikamalbums.so
-%{tde_tdelibdir}/kio_digikamdates.la
-%{tde_tdelibdir}/kio_digikamdates.so
-%{tde_tdelibdir}/kio_digikamsearch.la
-%{tde_tdelibdir}/kio_digikamsearch.so
-%{tde_tdelibdir}/kio_digikamtags.la
-%{tde_tdelibdir}/kio_digikamtags.so
-%{tde_tdelibdir}/kio_digikamthumbnail.la
-%{tde_tdelibdir}/kio_digikamthumbnail.so
-%{tde_tdeappdir}/digikam.desktop
-%{tde_tdeappdir}/showfoto.desktop
-%{tde_datadir}/apps/digikam/
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-%{tde_datadir}/apps/showfoto/
-%{tde_datadir}/icons/hicolor/*/apps/digikam.png
-%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
-%{tde_datadir}/services/digikamalbums.protocol
-%{tde_datadir}/services/digikamdates.protocol
-%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
-%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
-%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
-%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
-%{tde_datadir}/services/digikamimageplugin_border.desktop
-%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
-%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
-%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
-%{tde_datadir}/services/digikamimageplugin_core.desktop
-%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
-%{tde_datadir}/services/digikamimageplugin_emboss.desktop
-%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
-%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
-%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
-%{tde_datadir}/services/digikamimageplugin_infrared.desktop
-%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
-%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
-%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
-%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
-%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
-%{tde_datadir}/services/digikamimageplugin_perspective.desktop
-%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
-%{tde_datadir}/services/digikamimageplugin_restoration.desktop
-%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
-%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
-%{tde_datadir}/services/digikamimageplugin_texture.desktop
-%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
-%{tde_datadir}/services/digikamsearch.protocol
-%{tde_datadir}/services/digikamtags.protocol
-%{tde_datadir}/services/digikamthumbnail.protocol
-%{tde_datadir}/servicetypes/digikamimageplugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdedocdir}/HTML/en/digikam-apidocs/
-
-
-%files devel
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-
-%Changelog
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Add support for Mageia 2 and Mandriva 2011
-- Removes old patches, adds GIT patches.
-- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
-- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
-- Remove version.h. Cruft from an older version prior to 0.9.6.
-- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
-- GCC 4.7 fix. [Bug #958] [Commit #a9489034]
-- GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
-- Fix 'format not a string literal' error [Commit #029218cd]
-- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
-- Fix FTBFS on png >= 0.15 [Commit #18ecd512]
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
-- Fix man directory location
-- Fix postinstall
-- Fix description
-- Add "BuildRequires: exiv2-devel"
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2
-- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958]
-
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/dolphin/dolphin-3.5.12.spec b/redhat/applications/dolphin/dolphin-3.5.12.spec
deleted file mode 100644
index 38f7059e5..000000000
--- a/redhat/applications/dolphin/dolphin-3.5.12.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp dolphin
-%define version 0.9.2
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	File manager for KDE focusing on usability 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
-sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \
-	-e "/^Name\[pa\].*/d"
-
-desktop-file-install --vendor ""                \
-    --delete-original                           \
-    --dir %{buildroot}%{_datadir}/applications/ \
-    %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/hicolor/128x128/apps/*.png
-%{_datadir}/icons/hicolor/??x??/apps/*.png
-%{_datadir}/locale/*/*/d3lphin.mo
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
-- Correct macro to install under "/opt", if desired
-
-* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial release for RHEL 6.0
-- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
-
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.1.spec b/redhat/applications/dolphin/dolphin-3.5.13.1.spec
deleted file mode 100644
index f412efa0f..000000000
--- a/redhat/applications/dolphin/dolphin-3.5.13.1.spec
+++ /dev/null
@@ -1,197 +0,0 @@
-# Default version for this component
-%define kdecomp dolphin
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	File manager for TDE focusing on usability 
-Version:	0.9.2
-Release:	6%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
-sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \
-	-e "/^Name\[pa\].*/d"
-
-desktop-file-install --vendor ""                \
-    --delete-original                           \
-    --dir %{buildroot}%{tde_datadir}/applications/ \
-    %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
-
-%find_lang d3lphin
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-%if 0%{?suse_version}
-update-alternatives --install \
-%else
-alternatives --install \
-%endif
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_d3lphin \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
-  10
-
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-if [ $1 -eq 0 ]; then
-%if 0%{?suse_version}
-  update-alternatives --remove \
-%else
-  alternatives --remove \
-%endif
-    media_safelyremove.desktop_d3lphin \
-    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-fi
-
-
-%files -f d3lphin.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_bindir}/d3lphin
-%{tde_datadir}/applications/d3lphin.desktop
-%{tde_datadir}/apps/d3lphin/
-%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
-%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-6
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
-- Add alternatives with 'kio-umountwrapper'
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4
-- Rebuild for Fedora 17
-- Fix HTML installation directory
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
-- Correct macro to install under "/opt", if desired
-
-* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial release for RHEL 6.0
-- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
-
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec
deleted file mode 100644
index 30db977f4..000000000
--- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define tde_pkg dolphin
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		File manager for TDE focusing on usability 
-Version:		0.9.2
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-
-# Locales
-%find_lang d3lphin
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-alternatives --install \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_d3lphin \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
-  15
-
-%preun
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_d3lphin \
-    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
-fi
-
-%postun
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f d3lphin.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_bindir}/d3lphin
-%{tde_tdeappdir}/d3lphin.desktop
-%{tde_datadir}/apps/d3lphin/
-%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
-%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
-
-
-%changelog
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.spec b/redhat/applications/dolphin/dolphin-3.5.13.spec
deleted file mode 100644
index 5cafa107c..000000000
--- a/redhat/applications/dolphin/dolphin-3.5.13.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp dolphin
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	File manager for TDE focusing on usability 
-Version:	0.9.2
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
-sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \
-	-e "/^Name\[pa\].*/d"
-
-desktop-file-install --vendor ""                \
-    --delete-original                           \
-    --dir %{buildroot}%{tde_datadir}/applications/ \
-    %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
-
-%find_lang d3lphin
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-alternatives --install \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_d3lphin \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
-  10
-
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-if [ $1 -eq 0 ]; then
-  alternatives --remove \
-    media_safelyremove.desktop_d3lphin \
-    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-fi
-
-
-%files -f d3lphin.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_bindir}/d3lphin
-%{tde_datadir}/applications/d3lphin.desktop
-%{tde_datadir}/apps/d3lphin/
-%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
-%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
-
-
-%Changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
-- Add alternatives with 'kio-umountwrapper'
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4
-- Rebuild for Fedora 17
-- Fix HTML installation directory
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
-- Correct macro to install under "/opt", if desired
-
-* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial release for RHEL 6.0
-- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
-
diff --git a/redhat/applications/filelight/filelight-3.5.12.spec b/redhat/applications/filelight/filelight-3.5.12.spec
deleted file mode 100644
index e1b02b0ee..000000000
--- a/redhat/applications/filelight/filelight-3.5.12.spec
+++ /dev/null
@@ -1,106 +0,0 @@
-# Default version for this component
-%define kdecomp filelight
-%define version 1.0
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Graphical disk usage display
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/config/filelightrc
-%{_datadir}/services/*.desktop
-%{tde_docdir}/HTML/*/*/
-
-%{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch b/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch
deleted file mode 100644
index be98c9a0f..000000000
--- a/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- filelight/Makefile.am.ORI	2012-08-04 10:34:47.712896146 +0200
-+++ filelight/Makefile.am	2012-08-04 10:34:52.911800735 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = src misc doc po
-+SUBDIRS = src misc doc
- 
- messages: rc.cpp
- 	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp
---- filelight/doc/Makefile.am.ORI	2012-08-04 10:36:33.894947477 +0200
-+++ filelight/doc/Makefile.am	2012-08-04 10:36:38.509862783 +0200
-@@ -1 +1 @@
--SUBDIRS = $(AUTODIRS)
-+SUBDIRS = filelight
diff --git a/redhat/applications/filelight/filelight-3.5.13.1.spec b/redhat/applications/filelight/filelight-3.5.13.1.spec
deleted file mode 100644
index 50af74c0d..000000000
--- a/redhat/applications/filelight/filelight-3.5.13.1.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define kdecomp filelight
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Graphical disk usage display
-Version:	1.0
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-Obsoletes:	filelight-l10n < %{version}-%{release}
-Provides:	filelight-l10n = %{version}-%{release}
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp} --with-kde
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/filelight
-%{tde_tdeappdir}/filelight.desktop
-%{tde_datadir}/apps/filelight/
-%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
-%{tde_datadir}/services/*.desktop
-%{tde_tdelibdir}/libfilelight.so
-%{tde_tdelibdir}/libfilelight.la
-%lang(da) %{tde_tdedocdir}/HTML/da/filelight/
-%lang(en) %{tde_tdedocdir}/HTML/en/filelight/
-%lang(es) %{tde_tdedocdir}/HTML/es/filelight/
-%lang(et) %{tde_tdedocdir}/HTML/et/filelight/
-%lang(it) %{tde_tdedocdir}/HTML/it/filelight/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-5
-- Initial release for TDE 3.5.13.1
-- Obsoletes package 'filelight-l10n'
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
deleted file mode 100644
index f1b71ae47..000000000
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define tde_pkg filelight
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Graphical disk usage display
-Version:		1.0
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Obsoletes:	filelight-l10n < %{version}-%{release}
-Provides:	filelight-l10n = %{version}-%{release}
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/filelight
-%{tde_tdeappdir}/filelight.desktop
-%{tde_datadir}/apps/filelight/
-%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
-%{tde_datadir}/services/*.desktop
-%{tde_tdelibdir}/libfilelight.so
-%{tde_tdelibdir}/libfilelight.la
-%lang(da) %{tde_tdedocdir}/HTML/da/filelight/
-%lang(en) %{tde_tdedocdir}/HTML/en/filelight/
-%lang(es) %{tde_tdedocdir}/HTML/es/filelight/
-%lang(et) %{tde_tdedocdir}/HTML/et/filelight/
-%lang(it) %{tde_tdedocdir}/HTML/it/filelight/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
-
-%changelog
diff --git a/redhat/applications/filelight/filelight-3.5.13.spec b/redhat/applications/filelight/filelight-3.5.13.spec
deleted file mode 100644
index 30ed48ac7..000000000
--- a/redhat/applications/filelight/filelight-3.5.13.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-# Default version for this component
-%define kdecomp filelight
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Graphical disk usage display
-Version:	1.0
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [filelight] Disable translation build, it is a separate package
-Patch1:		filelight-3.5.13-disable_l10n.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .l10n
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/filelight
-%{tde_tdeappdir}/filelight.desktop
-%{tde_datadir}/apps/filelight/
-%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_datadir}/config/filelightrc
-%{tde_datadir}/services/*.desktop
-%{tde_tdelibdir}/libfilelight.so
-%{tde_tdelibdir}/libfilelight.la
-%{tde_tdedocdir}/HTML/en/filelight/
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
deleted file mode 100644
index 6ad5c045c..000000000
--- a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- fusion-icon/Makefile.ori	2012-08-04 11:13:26.208733002 +0200
-+++ fusion-icon/Makefile	2012-08-04 11:16:13.354858961 +0200
-@@ -1,12 +1,13 @@
- PREFIX = '/usr'
- DESTDIR = '/'
-+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages'
- #interfaces = 'gtk qt4'
- 
- all:
- 	@python setup.py build
- 
- install:
--	@python setup.py install --prefix=${PREFIX} --root=${DESTDIR}
-+	@python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB}
- 
- uninstall:
- 	@python setup.py uninstall
diff --git a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff b/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
deleted file mode 100644
index 8548d545c..000000000
--- a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-commit f181fbbb337a75257089e64afabd04dac2e1d466
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1383169502 -0500
-
-    Fix severe iceweasel/icedove tab bar corruption
-    Clean up minor build warnings
-
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index 067cf24..d3e13bb 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -337,7 +337,7 @@ void createTQApp()
- #endif // USE_FREEBSD
- #endif // USE_SOLARIS
- 
--	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird"));
-+	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("iceweasel") || cmdLine.contains("thunderbird") || cmdLine.contains("icedove"));
- 
- 	openOfficeFix = (cmdLine.endsWith("soffice.bin"))
- 	              | (cmdLine.endsWith("swriter.bin"))
-@@ -692,10 +692,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- 		TQPushButton button(meepWidget);	
- 		button.setBackgroundOrigin(TQWidget::ParentOrigin);
- 		button.setGeometry(x, y, w, h);
--		if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0)
-+		if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) {
- 			button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL]));
--		TQPoint p = button.backgroundOffset();
--		TQPoint pos = button.pos();
-+		}
- 	
- 		TQStyle::SFlags sflags = stateToSFlags(state);
- 		
-@@ -730,8 +729,6 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- 		button.setGeometry(x, y, w, h);
- 		if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0)
- 			button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL]));
--		TQPoint p = button.backgroundOffset();
--		TQPoint pos = button.pos();
- 	
- 		TQStyle::SFlags sflags = stateToSFlags(state);
- 		
-@@ -1802,6 +1799,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT
- 		case GTK_ARROW_LEFT:  element = TQStyle::PE_ArrowLeft;  break;
- 		case GTK_ARROW_RIGHT: element = TQStyle::PE_ArrowRight; break;
- 		case GTK_ARROW_NONE:  return;
-+		default:              return;
- 	}
- 
- 	 
diff --git a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff b/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
deleted file mode 100644
index fadce37cf..000000000
--- a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
+++ /dev/null
@@ -1,553 +0,0 @@
-commit 6e6dbb068e03a8bb818a76ba774d6f94ade7389f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1387752298 -0600
-
-    Fix numerous drawing glitches in Firefox
-
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index d3e13bb..928aef3 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -640,7 +640,7 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- 	}
- 
- 	if (gwidget) {
--		TQString     gwLabel(gtk_button_get_label(gwidget));
-+		TQString gwLabel(gtk_button_get_label(gwidget));
- 		if (gtk_button_get_use_stock(gwidget)) {
- 			GtkStockItem stockData;
- 			gtk_stock_lookup(gwLabel.ascii(), &stockData);
-@@ -649,8 +649,8 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- 		gwLabel.replace("&", "&&");
- 		gwLabel.replace("_", "&");
- 
--		TQPixmap     buttonicon;
--		TQBitmap     buttonicon_mask;
-+		TQPixmap buttonicon;
-+		TQBitmap buttonicon_mask;
- 
- 		GtkWidget* giconwidget = gtk_button_get_image(gwidget);
- 		if (giconwidget) {
-@@ -735,9 +735,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa
- 		if (defaultButton)
- 			sflags |= TQStyle::Style_ButtonDefault;
- 		button.setDefault(defaultButton);
--	
-+
- 		painter.fillRect(0, 0, w, h, tqApp->palette().active().background());
--	
-+
- 		tqApp->style().drawControl(TQStyle::CE_PushButton, &painter, &button, 
- 		                          TQRect(0,0,w,h), button.palette().active(), sflags);
- 	
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index 20d8c87..e84c4f7 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -676,8 +676,9 @@ draw_box(GtkStyle * style,
- 	int nbpages;
- 	sanitize_size(window, &width, &height);
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Box (%d,%d,%d,%d) Widget: %s  Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);
-+	}
- 
- 	if (GTK_IS_SCROLLBAR(widget))
- 	{
-@@ -685,38 +686,54 @@ draw_box(GtkStyle * style,
- 		{
- 			GtkAdjustment* adj = (GtkAdjustment*)gtk_range_get_adjustment(GTK_RANGE(widget));
- 			int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
--			
-+
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
- 	}
- 	if (DETAIL("menuitem"))
- 	{
- 		/* Crude way of checking if it's a menu item, or a menubar item */
--		if (x != 0)
-+		if (x != 0) {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawMenuBarItem(window,style,state_type,x,y,width,height);
--		else
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
-+		else {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawMenuItem(window,style,state_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
- 		return;
- 	}
- 	if (DETAIL("menubar"))
- 	{
--		if (openOfficeFix == 1)
-+		if (openOfficeFix == 1) {
- 			parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
--		else if (mozillaFix == 1)
-+		}
-+		else if (mozillaFix == 1) {
- 			parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height);
--		else
-+		}
-+		else {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawMenubar(window,style,state_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
- 		return;
- 	}
- 	if (DETAIL("menu"))
- 	{
--		if (openOfficeFix == 1)
-+		if (openOfficeFix == 1) {
- 			 parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
--		else
--		{
--			if ((x >= 0) && (y >= 0)) /* Work around weirdness in firefox */
-+		}
-+		else {
-+			if ((x >= 0) && (y >= 0)) { /* Work around weirdness in firefox */
-+				if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 				drawMenu(window,style,state_type,x,y,width,height);
-+				if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+			}
- 		}
- 		return;
- 	}
-@@ -724,16 +741,15 @@ draw_box(GtkStyle * style,
- 	{
- 		double fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget));
- 		GtkProgressBarOrientation orientation = gtk_progress_bar_get_orientation(GTK_PROGRESS_BAR(widget));
--		
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawProgressBar(window,style,state_type,orientation,fraction,x,y,width,height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
- 	if (GTK_IS_PROGRESS(widget) && DETAIL("bar"))
- 	{
- 		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
--		
- 		drawProgressChunk(window,style,state_type,x,y,width,height);
--		
- 		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
-@@ -742,8 +758,7 @@ draw_box(GtkStyle * style,
- 		GtkAdjustment* adj;
- 		int inverted;
- 		GValue *val = (GValue*)g_malloc( sizeof(GValue) );
--		if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
--		{
-+		if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- 			GdkPixbuf *gpix;
- 			gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0,  width, height);
- 			setFillPixmap(gpix);
-@@ -758,7 +773,9 @@ draw_box(GtkStyle * style,
- 		g_free(val);
- 		
- 		adj = gtk_range_get_adjustment((GtkRange *) widget);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawSlider(window,style,state_type,adj,x,y,width,height, (GTK_RANGE(widget))->orientation, inverted);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
- 	if (DETAIL("button"))
-@@ -767,18 +784,15 @@ draw_box(GtkStyle * style,
- 		int toolbutton = 0;
- 		parent = gtk_widget_get_parent(widget);
- 
--		if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent)))
--		{
-+		if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) {
- 			drawListHeader(window,style,state_type,x,y,width,height);
- 			return;
- 		}
- 
- 		/* this is a very very bad hack but there seems to be no way to find if a button is on a
- 		 * toolbar in gtk */
--		while (1)	
--		{
--			if (GTK_IS_WIDGET(parent))
--			{
-+		while (1) {
-+			if (GTK_IS_WIDGET(parent)) {
- #ifdef HAVE_BONOBO
- 				if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent))
- #else
-@@ -789,17 +803,20 @@ draw_box(GtkStyle * style,
- 					break;
- 				}
- 			}
--			else
-+			else {
- 				break;
-+			}
- 			parent = gtk_widget_get_parent(parent); 
- 		}
- 		
- 		parent = gtk_widget_get_parent(widget);
- 
--		if (toolbutton)
-+		if (toolbutton) {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawToolButton(window,style,state_type,x,y,width,height);
--		else
--		{
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
-+		else {
- 			/* Baghira hack -- rounded buttons really ugly when they are small like 
- 			   on a dropdown entry box -- eg. search/replace in gedit */	
- 			/* Draw square buttons only if number of children in the hbox is 2 and 
-@@ -807,31 +824,35 @@ draw_box(GtkStyle * style,
- 			int defaultButton = gtk_widget_has_focus(widget);
- 			GtkWindow* toplevel;
- 			
--			if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))
--			{
-+			if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) {
- 				child_list = g_list_first((GTK_BOX(parent)->children));
- 				child = (GtkWidget *)child_list->data;
--				if (GTK_IS_ENTRY(child))
--				{
-+				if (GTK_IS_ENTRY(child)) {
-+					if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 					drawSquareButton(window,style,state_type,x,y,width,height);
-+					if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 					return;
- 				}
- 				
- 				child_list = g_list_last((GTK_BOX(parent)->children));
- 				child = ((GtkBoxChild *)child_list->data)->widget;
--				if (GTK_IS_ENTRY(child))
--				{
-+				if (GTK_IS_ENTRY(child)) {
-+					if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 					drawSquareButton(window,style,state_type,x,y,width,height);
-+					if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 					return;
- 				}
- 
- 			}
- 			
- 			toplevel = GTK_WINDOW(gtk_widget_get_toplevel(widget));
--			if (toplevel && toplevel->default_widget == widget)
-+			if (toplevel && toplevel->default_widget == widget) {
- 				defaultButton = 1;
--			
-+			}
-+
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawButton(window,style,state_type,defaultButton,x,y,width,height,GTK_BUTTON(widget));
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
- 	}
-@@ -860,43 +881,55 @@ draw_box(GtkStyle * style,
- 			
- 			/* Now draw the tab -- tab position is also calculated in this function
- 			   checkout drawTabFrame() for drawing tabbarbase. */
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawTabNG(window,style,state_type,x, y, width/*-2*/, height, nb );
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		else {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawTab(window,style,state_type,x,y,width/*-2*/,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
- 	}
--	if (DETAIL("optionmenu"))
--	{
-+	if (DETAIL("optionmenu")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawComboBox(window,style,state_type,x,y,width,height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
--	if (DETAIL("toolbar"))
--	{
-+	if (DETAIL("toolbar")) {
- 		if (openOfficeFix == 1)
- 			parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
- 		else
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawToolbar(window,style,state_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
--	if (DETAIL("spinbutton_up"))
--	{
-+	if (DETAIL("spinbutton_up")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawSpinButton(window, style, state_type, 0, x, y, width, height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
--	if (DETAIL("spinbutton_down"))
--	{
-+	if (DETAIL("spinbutton_down")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawSpinButton(window, style, state_type, 1, x, y, width, height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
--	if (DETAIL("spinbutton"))
-+	if (DETAIL("spinbutton")) {
- 		return;
-+	}
- 	
--	if (DETAIL("optionmenutab") || DETAIL("buttondefault"))
-+	if (DETAIL("optionmenutab") || DETAIL("buttondefault")) {
- 		return;
--	
-+	}
-+
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawFrame(window,style,state_type,shadow_type,x,y,width,height);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- 
- 
-@@ -916,11 +949,11 @@ draw_flat_box(GtkStyle * style,
- {
- 	sanitize_size(window, &width, &height);
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Flat Box (%d,%d,%d,%d) Widget: %s  Detail: %s %d %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type, GTK_STATE_SELECTED);
-+	}
- 
--	if (DETAIL("tooltip"))
--	{
-+	if (DETAIL("tooltip")) {
- 		GdkColor tooltipColor;
- 		GdkGCValues gc_values;
- 		GdkGCValuesMask gc_values_mask;
-@@ -940,21 +973,25 @@ draw_flat_box(GtkStyle * style,
- 		gtk_gc_release(tooltipGc);
- 	}
- 	
--	if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED))
--	{
-+	if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawListViewItem(window,style,state_type,x,y,width,height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	}
--	else if (DETAIL("listitem"))
--	{
-+	else if (DETAIL("listitem")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawListViewItem(window,style,state_type,x,y,width,height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	}
--	else if (DETAILHAS("cell_even"))
--	{
-+	else if (DETAILHAS("cell_even")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		gdk_draw_rectangle(window, style->base_gc[GTK_STATE_NORMAL], TRUE, x, y, width, height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	}
--	else if (DETAILHAS("cell_odd"))
--	{
-+	else if (DETAILHAS("cell_odd")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		gdk_draw_rectangle(window, alternateBackgroundGc(style), TRUE, x, y, width, height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	}
- }
- 
-@@ -972,26 +1009,28 @@ draw_check(GtkStyle * style,
-            gint width,
-            gint height)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Check (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
--	if (GTK_IS_MENU_ITEM(widget))
--	{
--		if (shadow_type == GTK_SHADOW_IN)
--		{
--			if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
--			{
-+	if (GTK_IS_MENU_ITEM(widget)) {
-+		if (shadow_type == GTK_SHADOW_IN) {
-+			if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- 				GdkPixbuf *gpix;
- 				gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget), NULL, x, y, 0, 0, width, height);
- 				setFillPixmap(gpix);
- 				g_object_unref(gpix);
- 			}
--		
-+
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawMenuCheck(window,style,state_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
- 	}
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawCheckBox(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- 
- 
-@@ -1009,11 +1048,11 @@ draw_option(GtkStyle * style,
-             gint width,
-             gint height)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Option (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
--	if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
--	{
-+	if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) {
- 		GdkPixbuf *gpix;
- 		gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0,  width, height);
- 		setFillPixmap(gpix);
-@@ -1022,11 +1061,16 @@ draw_option(GtkStyle * style,
- 
- 	if (GTK_IS_MENU_ITEM(widget))
- 	{
--		if (shadow_type == GTK_SHADOW_IN)
-+		if (shadow_type == GTK_SHADOW_IN) {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawMenuCheck(window,style,state_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
- 		return;
- 	}
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawRadioButton(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- 
- 
-@@ -1043,8 +1087,9 @@ draw_tab(GtkStyle * style,
-          gint width,
-          gint height)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Tab (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
- 	gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
- }
-@@ -1218,11 +1263,15 @@ draw_box_gap(GtkStyle* style,
- 	
- 	if (width<0 || height<0) return;  /* Eclipse really can be this stupid! */
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Box_gap (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
--	if (DETAIL("notebook"))
-+	if (DETAIL("notebook")) {
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawTabFrame(window,style,state_type,x,y-2,width,height+2, gtk_notebook_get_tab_pos((GtkNotebook *)widget));
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+	}
- }
- 
- 
-@@ -1245,8 +1294,9 @@ draw_extension(GtkStyle * style,
- 	
- 	sanitize_size (window, &width, &height);
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Extension (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
- 	gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail,
- 			x, y, width, height);
-@@ -1265,8 +1315,9 @@ draw_focus (GtkStyle     *style,
- 	    gint          width,
- 	    gint          height)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Focus Rect (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 
- 	GtkWidget* parent = gtk_widget_get_parent(widget);
- 	
-@@ -1274,7 +1325,9 @@ draw_focus (GtkStyle     *style,
- 	    GTK_IS_RADIO_BUTTON(widget) ||
- 	    (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))))
- 	{
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawFocusRect(window, style, x, y, width, height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	}
- 	return;
- }
-@@ -1293,24 +1346,31 @@ draw_slider(GtkStyle * style,
-             gint height,
-             GtkOrientation orientation)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Slider (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
-+	}
- 	
--	if (DETAIL("slider"))
--	{
-+	if (DETAIL("slider")) {
- 		GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));
- 		int widgetX, widgetY;
- 		
- 		GtkWidget* parent = widget;
--		while (gtk_widget_get_parent(parent) != NULL)
-+		while (gtk_widget_get_parent(parent) != NULL) {
- 			parent = gtk_widget_get_parent(parent);
-+		}
- 		
- 		gtk_widget_translate_coordinates(widget, parent, 0, 0, &widgetX, &widgetY);
- 		
--		if (orientation == GTK_ORIENTATION_VERTICAL)
-+		if (orientation == GTK_ORIENTATION_VERTICAL) {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height);
--		else
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
-+		else {
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
-+		}
- 		return;
- 	}
- }
-@@ -1334,10 +1394,13 @@ draw_handle(GtkStyle * style,
- 	
- 	sanitize_size(window, &width, &height);
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Handle (%d,%d,%d,%d) Widget: %s  Detail: %s State Type: %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type);
--	
-+	}
-+
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawSplitter(window,style,state_type,orientation,x,y,width,height);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 	return;
- }
- 
diff --git a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff b/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
deleted file mode 100644
index 2985283a6..000000000
--- a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
+++ /dev/null
@@ -1,435 +0,0 @@
-commit a90aa09722d47f5f4009b089d8d874354899bdb8
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1387757695 -0600
-
-    Fix Firefox scrollbars
-
-diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
-index 28faded..ccd18c1 100644
---- a/kcm_gtk/kcmgtk.cpp
-+++ b/kcm_gtk/kcmgtk.cpp
-@@ -185,6 +185,5 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
- 	widget->styleIcon->setPixmap(iconLoader.loadIcon("style", KIcon::Desktop));
- 	widget->fontIcon->setPixmap(iconLoader.loadIcon("fonts", KIcon::Desktop));
--	widget->firefoxIcon->setPixmap(iconLoader.loadIcon("firefox", KIcon::Desktop));
- 	widget->keyboardIcon->setPixmap(iconLoader.loadIcon("keyboard", KIcon::Desktop));
- 	
- 	getInstalledThemes();
-@@ -199,5 +198,4 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
- 	connect(widget->emacsBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(itemChanged()));
- 	connect(widget->fontChange, TQT_SIGNAL(clicked()), TQT_SLOT(fontChangeClicked()));
--	connect(widget->firefoxFix, TQT_SIGNAL(clicked()), TQT_SLOT(firefoxFixClicked()));
- 	connect(widget->emacsDetails, TQT_SIGNAL(clicked()), TQT_SLOT(emacsDetailsClicked()));
- 	connect(widget->warning3, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsClicked()));
-@@ -453,190 +451,6 @@ TQString KcmGtk::quickHelp() const
- 	return i18n("");
- }
- 
--
--void KcmGtk::firefoxFixClicked()
--{
--	profiles.clear();
--	getProfiles(TQDir::homeDirPath() + "/.mozilla/firefox/", 0);
--	getProfiles(TQDir::homeDirPath() + "/.thunderbird/", 1);
--	
--	TQString profilePath;
--	if (profiles.count() == 0)
--	{
--		KMessageBox::error(this, i18n("No Mozilla profiles found"), i18n("Could not load Mozilla profiles"));
--		return;
--	}
--	else if (profiles.count() == 1)
--	{
--		fixProfile(profiles.begin().data());
--	}
--	else
--	{
--		KDialogBase* dialog = new KDialogBase(this, "", true, i18n("Mozilla profile"), KDialogBase::Ok | KDialogBase::Cancel);
--		MozillaProfileWidget* w = new MozillaProfileWidget(dialog);
--		w->profilesList->header()->hide();
--		w->profilesList->hideColumn(1);
--		
--		TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small);
--		
--		for ( TQMapIterator<TQString,TQString> it = profiles.begin(); it != profiles.end(); ++it )
--		{
--			KListViewItem* i = new KListViewItem(w->profilesList);
--			i->setPixmap(0, icon);
--			i->setText(0, it.key());
--			i->setText(1, it.data());
--		}
--		
--		dialog->setMainWidget(w);
--		if (dialog->exec() == TQDialog::Rejected)
--		{
--			delete dialog;
--			return;
--		}
--		
--		TQListViewItemIterator it2(w->profilesList, TQListViewItemIterator::Selected);
--		while (it2.current())
--		{
--			KListViewItem* i = (KListViewItem*) it2.current();
--			++it2;
--			
--			fixProfile(i->text(1));
--		}
--		delete dialog;
--	}
--	
--	KMessageBox::information(this, i18n("Your Mozilla profile was updated sucessfully.  You must close and restart all Firefox and Thunderbird windows for the changes to take effect"), i18n("Mozilla profile"));
--}
--
--void KcmGtk::getProfiles(const TQString& basePath, int type)
--{
--	TQString fileName = basePath + "/profiles.ini";
--	if (TQFile::exists(fileName))
--	{
--		KConfig config(fileName, true, false);
--		TQStringList groups = config.groupList();
--		
--		for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it )
--		{
--			if (!(*it).lower().startsWith("profile"))
--				continue;
--			
--			config.setGroup(*it);
--			TQString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name");
--			TQString path = config.readEntry("Path");
--			if (!path.startsWith("/"))
--				path = basePath + path;
--			profiles.insert(name, path);
--		}
--	}
--}
--
--void KcmGtk::fixProfile(const TQString& path)
--{
--	if (!TQFile::exists(path + "/chrome"))
--	{
--		TQDir dir(path);
--		dir.mkdir("chrome");
--	}
--	
--	TQString data = scrollBarCSS();
--	writeFirefoxCSS(path + "/chrome/userChrome.css", data);
--	writeFirefoxCSS(path + "/chrome/userContent.css", data);
--}
--
--TQString KcmGtk::scrollBarCSS()
--{
--	// The following code determines how many buttons are on a scrollbar
--	// It works by looking at each pixel of the scrollbar's area not taken up by the groove,
--	// and asking the style which subcontrol is at that location.
--	TQScrollBar sbar(NULL);
--	sbar.setOrientation(Qt::Horizontal);
--	sbar.setValue(1);
--	sbar.resize(200,25);
--	
--	TQRect rect = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove);
--	
--	bool back1 = false;
--	bool forward1 = false;
--	bool back2 = false;
--	bool forward2 = false;
--	
--	TQStyle::SubControl sc = TQStyle::SC_None;
--	for (TQPoint pos(0,7) ; pos.x()<rect.x() ; pos.setX(pos.x()+1))
--	{
--		TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
--		if (sc != sc2)
--		{
--			if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true;
--			if (sc2 == TQStyle::SC_ScrollBarSubLine) back1 = true;
--			sc = sc2;
--		}
--	}
--	sc = TQStyle::SC_None;
--	for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1))
--	{
--		TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos);
--		if (sc != sc2)
--		{
--			if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true;
--			if (sc2 == TQStyle::SC_ScrollBarSubLine) back2 = true;
--			sc = sc2;
--		}
--	}
--	
--	TQString upTop = (back1 ? "-moz-box" : "none");
--	TQString downTop = (forward1 ? "-moz-box" : "none");
--	TQString upBottom = (back2 ? "-moz-box" : "none");
--	TQString downBottom = (forward2 ? "-moz-box" : "none");
--	
--	TQString data;
--	data += "/* The following four lines were added by KDE */\n";
--	data += "scrollbarbutton[sbattr=\"scrollbar-up-top\"] { display: " + upTop + " !important; }\n";
--	data += "scrollbarbutton[sbattr=\"scrollbar-down-top\"] { display: " + downTop + " !important; }\n";
--	data += "scrollbarbutton[sbattr=\"scrollbar-up-bottom\"] { display: " + upBottom + " !important; }\n";
--	data += "scrollbarbutton[sbattr=\"scrollbar-down-bottom\"] { display: " + downBottom + " !important; }\n";
--	
--	return data;
--}
--
--void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data)
--{
--	TQString fileData;
--	TQFile file(path);
--	if (file.open(IO_ReadOnly))
--	{
--		TQTextStream stream(&file);
--		for (;;)
--		{
--			TQString line = stream.readLine();
--			if (line.isNull())
--				break;
--			
--			if ((line == "# The following four lines were added by KDE") ||
--			    (line == "/* The following four lines were added by KDE */"))
--			{
--				for (int i=0 ; i<4 ; i++)
--					stream.readLine();
--				continue;
--			}
--			
--			fileData += line + "\n";
--		}
--		file.close();
--	}
--	
--	if (!file.open(IO_WriteOnly | IO_Truncate))
--	{
--		KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile"));
--		return;
--	}
--	TQTextStream stream(&file);
--	stream << fileData << data;
--	file.close();
--	
--	return;
--}
--
- void KcmGtk::emacsDetailsClicked()
- {
- 	if (emacsDetailsDialog == NULL)
-diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h
-index 542a043..2c04919 100644
---- a/kcm_gtk/kcmgtk.h
-+++ b/kcm_gtk/kcmgtk.h
-@@ -71,7 +71,6 @@ public slots:
- 	void styleChanged();
- 	void fontChangeClicked();
- 	void itemChanged();
--	void firefoxFixClicked();
- 	void emacsDetailsClicked();
- 	void searchPathsClicked();
- 	void searchPathsOk();
-@@ -82,10 +81,6 @@ public slots:
- 
- private:
- 	void updateFontPreview();
--	void getProfiles(const TQString& basePath, int type);
--	void fixProfile(const TQString& path);
--	TQString scrollBarCSS();
--	void writeFirefoxCSS(const TQString& path, const TQString& data);
- 	void getInstalledThemes();
-	
- 	TQString env(TQString key);
-diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui
-index 512a610..705655b 100644
---- a/kcm_gtk/kcmgtkwidget.ui
-+++ b/kcm_gtk/kcmgtkwidget.ui
-@@ -481,118 +481,6 @@
-                 </widget>
-             </hbox>
-         </widget>
--        <widget class="TQGroupBox">
--            <property name="name">
--                <cstring>groupBox1</cstring>
--            </property>
--            <property name="sizePolicy">
--                <sizepolicy>
--                    <hsizetype>5</hsizetype>
--                    <vsizetype>4</vsizetype>
--                    <horstretch>0</horstretch>
--                    <verstretch>0</verstretch>
--                </sizepolicy>
--            </property>
--            <property name="title">
--                <string>Firefox and Thunderbird</string>
--            </property>
--            <hbox>
--                <property name="name">
--                    <cstring>unnamed</cstring>
--                </property>
--                <widget class="TQLayoutWidget">
--                    <property name="name">
--                        <cstring>layout7_2_2</cstring>
--                    </property>
--                    <vbox>
--                        <property name="name">
--                            <cstring>unnamed</cstring>
--                        </property>
--                        <widget class="TQLabel">
--                            <property name="name">
--                                <cstring>firefoxIcon</cstring>
--                            </property>
--                            <property name="scaledContents">
--                                <bool>true</bool>
--                            </property>
--                        </widget>
--                        <spacer>
--                            <property name="name">
--                                <cstring>spacer3_2_2</cstring>
--                            </property>
--                            <property name="orientation">
--                                <enum>Vertical</enum>
--                            </property>
--                            <property name="sizeType">
--                                <enum>Expanding</enum>
--                            </property>
--                            <property name="sizeHint">
--                                <size>
--                                    <width>20</width>
--                                    <height>31</height>
--                                </size>
--                            </property>
--                        </spacer>
--                    </vbox>
--                </widget>
--                <widget class="TQLayoutWidget">
--                    <property name="name">
--                        <cstring>layout12</cstring>
--                    </property>
--                    <vbox>
--                        <property name="name">
--                            <cstring>unnamed</cstring>
--                        </property>
--                        <widget class="TQLabel">
--                            <property name="name">
--                                <cstring>textLabel1</cstring>
--                            </property>
--                            <property name="text">
--                                <string>Scrollbar buttons may sometimes be displayed incorrectly in Firefox and Thunderbird.  This can be fixed by installing some files into your Mozilla profile.</string>
--                            </property>
--                            <property name="alignment">
--                                <set>WordBreak|AlignVCenter</set>
--                            </property>
--                        </widget>
--                        <widget class="TQLayoutWidget">
--                            <property name="name">
--                                <cstring>layout11</cstring>
--                            </property>
--                            <hbox>
--                                <property name="name">
--                                    <cstring>unnamed</cstring>
--                                </property>
--                                <widget class="TQPushButton">
--                                    <property name="name">
--                                        <cstring>firefoxFix</cstring>
--                                    </property>
--                                    <property name="text">
--                                        <string>I&amp;nstall scrollbar fix...</string>
--                                    </property>
--                                </widget>
--                                <spacer>
--                                    <property name="name">
--                                        <cstring>spacer11</cstring>
--                                    </property>
--                                    <property name="orientation">
--                                        <enum>Horizontal</enum>
--                                    </property>
--                                    <property name="sizeType">
--                                        <enum>Expanding</enum>
--                                    </property>
--                                    <property name="sizeHint">
--                                        <size>
--                                            <width>101</width>
--                                            <height>21</height>
--                                        </size>
--                                    </property>
--                                </spacer>
--                            </hbox>
--                        </widget>
--                    </vbox>
--                </widget>
--            </hbox>
--        </widget>
-         <widget class="TQLabel">
-             <property name="name">
-                 <cstring>textLabel1_2</cstring>
-@@ -634,7 +522,6 @@
-     <tabstop>fontChange</tabstop>
-     <tabstop>emacsBox</tabstop>
-     <tabstop>emacsDetails</tabstop>
--    <tabstop>firefoxFix</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
-index 928aef3..eebcc93 100644
---- a/src/qt_qt_wrapper.cpp
-+++ b/src/qt_qt_wrapper.cpp
-@@ -2085,7 +2085,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
- 	stream << parse_rc_string("GtkScrollbar::stepper-size = " + TQString::number(tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarSubLine).width() - 1), "*");
- 	
- 	stream << parse_rc_string("GtkScrollbar::min-slider-length = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarSliderMin)), "*");
--	stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)-2), "*");
-+	stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)), "*");
- 
- 	stream << parse_rc_string("GtkButton::child-displacement-x = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal)), "*");
- 	stream << parse_rc_string("GtkButton::child-displacement-y = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftVertical)), "*");
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index e84c4f7..4a2ee12 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -506,13 +506,16 @@ draw_arrow(GtkStyle* style,
- {
- 	sanitize_size(window, &width, &height);
- 	
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("Arrow (%d,%d,%d,%d) Widget: %s  Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail);
--	
--	if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
-+	}
-+
-+	if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) {
- 		return;
--	if (DETAIL("spinbutton"))
-+	}
-+	if (DETAIL("spinbutton")) {
- 		return;
-+	}
- 	if (DETAIL("notebook"))
- 	{
- 		drawArrow(window, style, state_type, arrow_type, x, y, width, height);
-@@ -688,7 +691,12 @@ draw_box(GtkStyle * style,
- 			int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
- 
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
--			drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height);
-+			if (orientation == GTK_ORIENTATION_VERTICAL) {
-+				drawScrollBar(window, style, state_type, orientation, adj, x+1, y, width, height);
-+			}
-+			else {
-+				drawScrollBar(window, style, state_type, orientation, adj, x, y+1, width, height);
-+			}
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
-@@ -1363,12 +1371,12 @@ draw_slider(GtkStyle * style,
- 		
- 		if (orientation == GTK_ORIENTATION_VERTICAL) {
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
--			drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height);
-+			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, y-widgetY, widget->allocation.height);
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		else {
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
--			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width);
-+			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, x-widgetX, widget->allocation.width);
- 			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		}
- 		return;
diff --git a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff b/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
deleted file mode 100644
index 66b206591..000000000
--- a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-commit 0330b848db129b3dc4daa2a57272ec3b2fb7984c
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1387965535 -0600
-
-    Fix Firefox text edit widget glitches
-    Clean up minor build warnings
-
-diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
-index 4a2ee12..c7992d5 100644
---- a/src/qt_theme_draw.c
-+++ b/src/qt_theme_draw.c
-@@ -29,7 +29,7 @@
- extern gboolean tde_showIconsOnPushButtons;
- 
- static GdkPixbuf * (*stockRenderIcon)() = NULL;
--static void * (*stockDrawString)() = NULL;
-+// static void * (*stockDrawString)() = NULL;
- 
- static void qtengine_style_init       (QtEngineStyle      *style);
- static void qtengine_style_class_init (QtEngineStyleClass *klass);
-@@ -128,13 +128,17 @@ draw_hline(GtkStyle* style,
-            gint x2,
-            gint y)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("HLINE (%d,%p,%d) Widget: %s  Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail);
-+	}
- 
--	if (DETAIL("vscale"))
-+	if (DETAIL("vscale")) {
- 		return;
-+	}
- 
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawHLine(window,style,state_type,y,x1,x2);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- 
- 
-@@ -149,13 +153,17 @@ draw_vline(GtkStyle* style,
-            gint yDest,
-            gint x)
- {
--	if (gtkQtDebug)
-+	if (gtkQtDebug) {
- 		printf("VLINE (%d,%d,%d) Widget: %s  Detail: %s\n",ySource ,yDest ,x,gtk_widget_get_name(widget),detail);
-+	}
- 
- 
--	if (DETAIL("hscale"))
-+	if (DETAIL("hscale")) {
- 		return;
-+	}
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 	drawVLine(window,style,state_type,x,ySource,yDest);
-+	if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- }
- 
- static void
-@@ -192,7 +200,9 @@ draw_shadow(GtkStyle     *style,
- 		return;
- 	if (DETAIL("entry"))
- 	{
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 		drawLineEdit(window,style,state_type,gtk_widget_is_focus(widget),x,y,width,height);
-+		if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 		return;
- 	}
- 	if (DETAIL("frame") || DETAIL("trough") || DETAIL("viewport"))
-@@ -200,7 +210,9 @@ draw_shadow(GtkStyle     *style,
- 		if (!GTK_IS_SCALE(widget))
- 		{
- 			/*printf("Frame (%d,%d) %dx%d   %d %d\n", x,y,width,height,state_type, shadow_type);*/
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area);
- 			drawFrame(window,style,state_type,shadow_type,x,y,width,height);
-+			if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL);
- 			return;
- 		}
- 	}
-@@ -644,20 +656,20 @@ draw_diamond(GtkStyle * style,
- {
- }
- 
--static void
--draw_string(GtkStyle		*style,
--				 GdkWindow		*window,
--				 GtkStateType		 state_type,
--				 GdkRectangle		*area,
--				 GtkWidget		*widget,
--				 const gchar		*detail,
--				 gint			 x,
--				 gint			 y,
--				 const gchar		*string)
--{
--	if (gtkQtDebug)
--		printf("STRING Widget: %s  Detail: %s\n",gtk_widget_get_name(widget),detail);
--}
-+// static void
-+// draw_string(GtkStyle		*style,
-+// 				 GdkWindow		*window,
-+// 				 GtkStateType		 state_type,
-+// 				 GdkRectangle		*area,
-+// 				 GtkWidget		*widget,
-+// 				 const gchar		*detail,
-+// 				 gint			 x,
-+// 				 gint			 y,
-+// 				 const gchar		*string)
-+// {
-+// 	if (gtkQtDebug)
-+// 		printf("STRING Widget: %s  Detail: %s\n",gtk_widget_get_name(widget),detail);
-+// }
- 
- static void
- draw_box(GtkStyle * style,
-@@ -1464,13 +1476,11 @@ void  draw_layout  (GtkStyle *style,
- 			PangoAttrList *layoutattr;
- 		
- 			const gchar *text;
--			gint text_length = 0;
- 			gint text_bytelen = 0;
- 			text = pango_layout_get_text (layout);
- 			if (text != 0)
- 			{
- 				PangoAttribute *textcolorattr;
--				text_length = g_utf8_strlen (text, -1);
- 				text_bytelen = strlen (text);
- 				
- 				textcolorattr = pango_attr_foreground_new(color.red, color.green, color.blue);
-@@ -2040,7 +2050,7 @@ qtengine_style_class_init (QtEngineStyleClass *klass)
- 	parent_class = g_type_class_peek_parent (klass);
- 
- 	stockRenderIcon = style_class->render_icon;
--	stockDrawString = style_class->draw_string;
-+// 	stockDrawString = style_class->draw_string;
- 
- 	style_class->render_icon = draw_icon;
- 	
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch
deleted file mode 100644
index caf67e13b..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk-qt-engine/src/qt_theme_draw.c.ORI	2012-05-01 19:52:05.317334548 +0200
-+++ gtk-qt-engine/src/qt_theme_draw.c	2012-05-01 19:54:50.474099070 +0200
-@@ -3,7 +3,7 @@
- #include <gtk/gtkprogressbar.h>
- #include <gdk/gdk.h>
- #include <gtk/gtk.h>
--#include <glib/glist.h>
-+#include <glib.h>
- 
- #ifdef HAVE_BONOBO
- #include <libbonobo.h>
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec
deleted file mode 100644
index c17e4ce0b..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec
+++ /dev/null
@@ -1,149 +0,0 @@
-# Default version for this component
-%define kdecomp gtk-qt-engine
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	theme engine using Qt for GTK+ 2.x and Trinity
-Version:	0.8
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	gtk-qt-engine.rc.sh
-Source2:	gtkrc-2.0-kde4
-Source3:	gtkrc-2.0-kde-kde4
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
-that calls Qt to do the actual drawing. This makes your GTK 2 applications
-look almost like real Qt applications and gives you a more unified desktop
-experience.
-
-Please note that this package is targeted at Trinity users and therefore provides
-a way to configure it from within KControl.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Renames the '.po' files
-for f in po/*/*.po; do
-  pushd ${f%/*}
-  mv -f *.po gtk-qt-engine.po
-  popd
-done
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-	-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-	-DDATA_INSTALL_DIR=%{tde_datadir} \
-	-DLIB_INSTALL_DIR=%{tde_libdir} \
-	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{kdecomp}
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/kcm_kcmgtk.la
-%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-# The following files are outside TDE's directory
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
-%{_datadir}/themes/Qt/gtk-2.0/gtkrc
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
-- Initial release for TDE 3.5.13.1
-
-* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
-- Add missing gtkrc files
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
-- Rebuilt for Fedora 17
-- Fix FTBFS with newer glib
-- Removes useless post and postun
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
deleted file mode 100644
index d6c1a5311..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg gtk-qt-engine
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		theme engine using Qt for GTK+ 2.x and Trinity
-Version:		0.8
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		gtk-qt-engine.rc.sh
-Source2:		gtkrc-2.0-kde4
-Source3:		gtkrc-2.0-kde-kde4
-
-# Fix severe iceweasel/icedove tab bar corruption
-# Clean up minor build warnings
-Patch1:			1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff
-# Fix numerous drawing glitches in Firefox
-Patch2:			1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff
-# Fix Firefox scrollbars
-Patch3:			1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff
-# Fix Firefox text edit widget glitches
-# Clean up minor build warnings
-Patch4:			1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
-that calls Qt to do the actual drawing. This makes your GTK 2 applications
-look almost like real Qt applications and gives you a more unified desktop
-experience.
-
-Please note that this package is targeted at Trinity users and therefore provides
-a way to configure it from within KControl.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-3.5.13.2%{?preversion:~%{preversion}}
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f gtkqtengine.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/kcm_kcmgtk.la
-%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-# The following files are outside TDE's directory
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
-%{_datadir}/themes/Qt/gtk-2.0/gtkrc
-
-
-%changelog
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec
deleted file mode 100644
index 88dcb55ab..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp gtk-qt-engine
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	theme engine using Qt for GTK+ 2.x and Trinity
-Version:	0.8
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	gtk-qt-engine.rc.sh
-Source2:	gtkrc-2.0-kde4
-Source3:	gtkrc-2.0-kde-kde4
-
-# [gtk-qt-engine] Fix inclusion of 'glib.h'
-Patch1:		gtk-qt-engine-3.5.13-fix_glib_include.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
-that calls Qt to do the actual drawing. This makes your GTK 2 applications
-look almost like real Qt applications and gives you a more unified desktop
-experience.
-
-Please note that this package is targeted at Trinity users and therefore provides
-a way to configure it from within KControl.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Renames the '.po' files
-for f in po/*/*.po; do
-  pushd ${f%/*}
-  mv -f *.po gtk-qt-engine.po
-  popd
-done
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-	-DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-	-DDATA_INSTALL_DIR=%{tde_datadir} \
-	-DLIB_INSTALL_DIR=%{tde_libdir} \
-	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{kdecomp}
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/kcm_kcmgtk.la
-%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
-
-# The following files are outside TDE's directory
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
-%{_datadir}/themes/Qt/gtk-2.0/gtkrc
-
-
-%Changelog
-* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
-- Add missing gtkrc files
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
-- Rebuilt for Fedora 17
-- Fix FTBFS with newer glib
-- Removes useless post and postun
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
deleted file mode 100644
index c26279a74..000000000
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview-i18n
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-%find_lang gwenview
-
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> gwenview.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f gwenview.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Initial release for TDE 3.5.13.1
-
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
deleted file mode 100644
index f04999d0e..000000000
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-# Default version for this component
-%define tde_pkg gwenview-i18n
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Internationalization support for Gwenview [Trinity]
-Version:		1.4.2
-Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR="%{tde_prefix}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-## File lists
-%find_lang gwenview
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files -f gwenview.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
-%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
-%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/
-%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/
-
-
-%changelog
diff --git a/redhat/applications/gwenview/gwenview-3.5.12.spec b/redhat/applications/gwenview/gwenview-3.5.12.spec
deleted file mode 100644
index bbe7a61fe..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-%define version 1.4.2
-%define release 3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: exiv2-devel
-
-%if "%{?_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for KDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/services/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/config.kcfg/*
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_mandir}/man*/*
-
-%{_libdir}/libkdeinit_gwenview.so
-%exclude %{_libdir}/libgwenviewcore.so
-
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
-
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch
deleted file mode 100644
index 4b9f93e75..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_alphabet_string_error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 9cb99cdb5337032764d897c94a5e7c8803784d4e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327529624 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index a021c55..f9018b8 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -308,7 +308,7 @@ static const char* xpm_color_name( int cpp, int index )
- {
-     static char returnable[5];
-     static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
--			       "EFGHIJKLMNOPTQRSTUVWXYZ0123456789";
-+			       "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
-     // cpp is limited to 4 and index is limited to 64^cpp
-     if ( cpp > 1 ) {
- 	if ( cpp > 2 ) {
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch
deleted file mode 100644
index b8220bd7b..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_building_libpng15.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-commit 303be4553ad5bbe79d50a8708cf1f8f0e4d220af
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334285908 -0500
-
-    Fix building with libpng 1.5.
-
-diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp
-index 77bf7b3..8da8089 100644
---- a/src/gvcore/pngformattype.cpp
-+++ b/src/gvcore/pngformattype.cpp
-@@ -211,7 +211,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+      if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, TQImage::BigEndian ))
-@@ -246,7 +246,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- #if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
--		const int g = info_ptr->trans_color.gray;
-+		png_bytep trans_alpha;
-+		int num_trans;
-+		png_color_16p trans_color;
-+		png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-+		const int g = trans_color->gray;
- #else
-  		const int g = info_ptr->trans_values.gray;
- #endif
-@@ -256,9 +260,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 		}
- 	    }
- 	}
--    } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-+    } else {
-+     png_colorp palette;
-+     int num_palette;
-+     png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+     if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -266,20 +274,28 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, num_palette,
- 	    TQImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-+	    png_bytep trans_alpha;
-+	    int num_trans;
-+	    png_color_16p trans_color;
-+	    png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < num_trans ) {
- 		image.setColor(i, tqRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
--		    info_ptr->trans_alpha[i]
--#else
-+		    palette[i].red,
-+		    palette[i].green,
-+		    palette[i].blue,
-+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
-+		    trans_alpha[i]
-+#endif
-+#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR==4 )
-+        info_ptr->trans_alpha[i]
-+#endif
-+#if ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR<=3 )
-  		    info_ptr->trans[i]
- #endif
- 		    )
-@@ -287,11 +303,11 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < num_palette ) {
- 	    image.setColor(i, tqRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		palette[i].red,
-+		palette[i].green,
-+		palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -326,12 +342,13 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
- 	}
- 
- 	png_read_update_info(png_ptr, info_ptr);
--    }
-+      }
- 
-     // TQt==ARGB==Big(ARGB)==Little(BGRA)
-     if ( TQImage::systemByteOrder() == TQImage::LittleEndian ) {
- 	png_set_bgr(png_ptr);
-     }
-+    }
- }
- 
- 
-@@ -389,7 +406,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons,
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -417,7 +434,7 @@ int PNGFormat::decode(TQImage& img, TQImageConsumer* cons,
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -484,7 +501,11 @@ void PNGFormat::end(png_structp png, png_infop info)
-     consumer->frameDone(TQPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
-+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
-+    unused_data = png_process_data_pause(png, 1);
-+#else
-     unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+#endif
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch
deleted file mode 100644
index ade498fed..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 1ca2f7392842e9ffd76fbc5aefc51213eb9ce262
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1325190949 -0600
-
-    Fix FTBFS
-
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index d93051a..e5c1e04 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -2,7 +2,7 @@
- <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
- <kcfg> 
-   <include>tqapplication.h</include>
--  <include>palette.h</include>
-+  <include>tqpalette.h</include>
-   <kcfgfile name="gwenviewrc"/> 
-   <group name="pixmap widget">
-     <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
deleted file mode 100644
index b2935457f..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-commit ace6f27083b0acc2f30195f0d8908a9a346a5910
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326325099 -0600
-
-    Fix FTBFS in jpeg code
-
-diff --git a/src/imageutils/jpegint.h b/src/imageutils/jpegint.h
-index 9d00c59..95b00d4 100644
---- a/src/imageutils/jpegint.h
-+++ b/src/imageutils/jpegint.h
-@@ -43,9 +43,9 @@ typedef enum {			/* Operating modes for buffer controllers */
- 
- /* Master control module */
- struct jpeg_comp_master {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -54,16 +54,16 @@ struct jpeg_comp_master {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -74,23 +74,23 @@ struct jpeg_c_prep_controller {
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -100,9 +100,9 @@ struct jpeg_downsampler {
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -111,23 +111,23 @@ struct jpeg_forward_dct {
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -135,8 +135,8 @@ struct jpeg_marker_writer {
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -144,10 +144,10 @@ struct jpeg_decomp_master {
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -156,18 +156,18 @@ struct jpeg_input_controller {
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -175,8 +175,8 @@ struct jpeg_d_coef_controller {
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -187,12 +187,12 @@ struct jpeg_d_post_controller {
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -207,8 +207,8 @@ struct jpeg_marker_reader {
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -217,21 +217,21 @@ struct jpeg_entropy_decoder {
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -244,20 +244,20 @@ struct jpeg_upsampler {
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch
deleted file mode 100644
index 80ea42ef7..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_libmng_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 59c7639f5e9f3ef40b06cb0e011216cc748e3f85
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1337933593 -0500
-
-    Define QT_CLEAN_NAMESPACE during libmng checks
-
-diff --git a/configure.in.in b/configure.in.in
-index f5e959c..1cdda0b 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -98,6 +98,8 @@ AC_SUBST(GV_ASM_DEFS)
- # libmng check (for gvmngformattype.*)
- #
- LIBMNG=
-+CXXFLAGS_SAVE="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE"
- KDE_CHECK_HEADER(libmng.h,
-     [
-     KDE_CHECK_LIB(mng, mng_initialize,
-@@ -106,6 +108,7 @@ KDE_CHECK_HEADER(libmng.h,
-         LIBMNG="-lmng $LIBZ -lm"
-         ], [], $LIBZ -lm)
-     ])
-+CXXFLAGS="$CXXFLAGS_SAVE"
- AC_SUBST(LIBMNG)
- if test -z "$LIBMNG"; then
-     AC_WARN([Can't find libmng.h, Gwenview won't be compiled with MNG support])
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch b/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch
deleted file mode 100644
index 4a0dbfc53..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-fix_various_problems.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-commit 1eac443e690763dd571aec664aba52f6683f9916
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334285947 -0500
-
-    Fix inadvertent tqt changes. Part of an extensive cleanup of various problems
-    with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963.
-
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index 86a0282..a8d0bee 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -309,7 +309,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 	mBottomThumbnailMode->setExclusiveGroup("thumbnails");
- 
- 	// Size slider
--	mSizeSlider=new TQSlider(Qt::Horizontal, d->mToolBar);
-+	mSizeSlider=new TQSlider(Horizontal, d->mToolBar);
- 	mSizeSlider->setFixedWidth(120);
- 	mSizeSlider->setRange(
- 		ThumbnailSize::MIN/SLIDER_RESOLUTION,
-diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
-index da9044a..a749ff3 100644
---- a/src/gvcore/imageviewtools.cpp
-+++ b/src/gvcore/imageviewtools.cpp
-@@ -177,7 +177,7 @@ void ImageView::ScrollTool::wheelEvent(TQWheelEvent* event) {
- 	if (ImageViewConfig::mouseWheelScroll()) {
- 		int deltaX, deltaY;
- 
--		if (event->state() & AltButton || event->orientation()==Qt::Horizontal) {
-+		if (event->state() & AltButton || event->orientation()==Horizontal) {
- 			deltaX = event->delta();
- 			deltaY = 0;
- 		} else {
-diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
-index 3bc6f20..e5ec564 100644
---- a/src/imageutils/transupp.c
-+++ b/src/imageutils/transupp.c
-@@ -30,7 +30,7 @@
-  * or recompression of the image.
-  * Thanks to Guido Vollbeding for the initial design and code of this feature.
-  *
-- *Qt::Horizontal flipping is done in-place, using a single top-to-bottom
-+ * Horizontal flipping is done in-place, using a single top-to-bottom
-  * pass through the virtual source array.  It will thus be much the
-  * fastest option for images larger than main memory.
-  *
-@@ -65,7 +65,7 @@
- LOCAL(void)
- do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *src_coef_arrays)
--/*Qt::Horizontal flip; done in-place, so no separate dest array is required */
-+/* Horizontal flip; done in-place, so no separate dest array is required */
- {
-   JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
-   int ci, k, offset_y;
-@@ -74,7 +74,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-   JCOEF temp1, temp2;
-   jpeg_component_info *compptr;
- 
--  /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping
-+  /* Horizontal mirroring of DCT blocks is accomplished by swapping
-    * pairs of blocks in-place.  Within a DCT block, we perform horizontal
-    * mirroring by changing the signs of odd-numbered columns.
-    * Partial iMCUs at the right edge are left untouched.
-@@ -115,7 +115,7 @@ LOCAL(void)
- do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *src_coef_arrays,
- 	   jvirt_barray_ptr *dst_coef_arrays)
--/*Qt::Vertical flip */
-+/* Vertical flip */
- {
-   JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-   int ci, i, j, offset_y;
-@@ -232,7 +232,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	   jvirt_barray_ptr *dst_coef_arrays)
- /* 90 degree rotation is equivalent to
-  *   1. Transposing the image;
-- *   2.Qt::Horizontal mirroring.
-+ *   2. Horizontal mirroring.
-  * These two steps are merged into a single processing routine.
-  */
- {
-@@ -295,7 +295,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	    jvirt_barray_ptr *src_coef_arrays,
- 	    jvirt_barray_ptr *dst_coef_arrays)
- /* 270 degree rotation is equivalent to
-- *   1.Qt::Horizontal mirroring;
-+ *   1. Horizontal mirroring;
-  *   2. Transposing the image.
-  * These two steps are merged into a single processing routine.
-  */
-@@ -359,8 +359,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
- 	    jvirt_barray_ptr *src_coef_arrays,
- 	    jvirt_barray_ptr *dst_coef_arrays)
- /* 180 degree rotation is equivalent to
-- *   1.Qt::Vertical mirroring;
-- *   2.Qt::Horizontal mirroring.
-+ *   1. Vertical mirroring;
-+ *   2. Horizontal mirroring.
-  * These two steps are merged into a single processing routine.
-  */
- {
-@@ -463,9 +463,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-  *   1. 180 degree rotation;
-  *   2. Transposition;
-  * or
-- *   1.Qt::Horizontal mirroring;
-+ *   1. Horizontal mirroring;
-  *   2. Transposition;
-- *   3.Qt::Horizontal mirroring.
-+ *   3. Horizontal mirroring.
-  * These steps are merged into a single processing routine.
-  */
- {
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch b/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
deleted file mode 100644
index 0cd290983..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-jpegint-ftbfs.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Nuar gwenview.ORI/src/imageutils/jpegint.h gwenview/src/imageutils/jpegint.h
---- gwenview.ORI/src/imageutils/jpegint.h	2011-05-26 23:04:57.000000000 +0200
-+++ gwenview/src/imageutils/jpegint.h	2011-11-01 20:45:15.494165195 +0100
-@@ -43,9 +43,9 @@
- 
- /* Master control module */
- struct jpeg_comp_master {
--  JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean call_pass_startup;	/* True if pass_startup must be called */
-@@ -54,16 +54,16 @@
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_c_main_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
- 			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
- 			       JDIMENSION in_rows_avail));
- };
- 
- /* Compression preprocessing (downsampling input buffer control) */
- struct jpeg_c_prep_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
- 				   JSAMPARRAY input_buf,
- 				   JDIMENSION *in_row_ctr,
- 				   JDIMENSION in_rows_avail,
-@@ -74,23 +74,23 @@
- 
- /* Coefficient buffer control */
- struct jpeg_c_coef_controller {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(boolean, compress_data, (j_compress_ptr cinfo,
- 				   JSAMPIMAGE input_buf));
- };
- 
- /* Colorspace conversion */
- struct jpeg_color_converter {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
- 				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
- 				JDIMENSION output_row, int num_rows));
- };
- 
- /* Downsampling */
- struct jpeg_downsampler {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, downsample, (j_compress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
- 			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
- 			     JSAMPIMAGE output_buf,
- 			     JDIMENSION out_row_group_index));
-@@ -100,9 +100,9 @@
- 
- /* Forward DCT (also controls coefficient quantization) */
- struct jpeg_forward_dct {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-   /* perhaps this should be an array??? */
--  JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo,
-+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
- 			      jpeg_component_info * compptr,
- 			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
- 			      JDIMENSION start_row, JDIMENSION start_col,
-@@ -111,23 +111,23 @@
- 
- /* Entropy encoding */
- struct jpeg_entropy_encoder {
--  JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
--  JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
--  JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics));
-+  JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
- };
- 
- /* Marker writing */
- struct jpeg_marker_writer {
--  JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo));
--  JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-   /* These routines are exported to allow insertion of extra markers */
-   /* Probably only COM and APPn markers should be written this way */
--  JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
- 				      unsigned int datalen));
--  JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
- };
- 
- 
-@@ -135,8 +135,8 @@
- 
- /* Master control module */
- struct jpeg_decomp_master {
--  JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-@@ -144,10 +144,10 @@
- 
- /* Input control module */
- struct jpeg_input_controller {
--  JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
- 
-   /* State variables made visible to other modules */
-   boolean has_multiple_scans;	/* True if file has multiple scans */
-@@ -156,18 +156,18 @@
- 
- /* Main buffer control (downsampled-data buffer) */
- struct jpeg_d_main_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
- 			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
- 			       JDIMENSION out_rows_avail));
- };
- 
- /* Coefficient buffer control */
- struct jpeg_d_coef_controller {
--  JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
- 				 JSAMPIMAGE output_buf));
-   /* Pointer to array of coefficient virtual arrays, or NULL if none */
-   jvirt_barray_ptr *coef_arrays;
-@@ -175,8 +175,8 @@
- 
- /* Decompression postprocessing (color quantization buffer control) */
- struct jpeg_d_post_controller {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
--  JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
- 				    JSAMPIMAGE input_buf,
- 				    JDIMENSION *in_row_group_ctr,
- 				    JDIMENSION in_row_groups_avail,
-@@ -187,12 +187,12 @@
- 
- /* Marker reading & parsing */
- struct jpeg_marker_reader {
--  JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-   /* Read markers until SOS or EOI.
-    * Returns same codes as are defined for jpeg_consume_input:
-    * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-    */
--  JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo));
-+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-   /* Read a restart marker --- exported for use by entropy decoder only */
-   jpeg_marker_parser_method read_restart_marker;
- 
-@@ -207,8 +207,8 @@
- 
- /* Entropy decoding */
- struct jpeg_entropy_decoder {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo,
- 				JBLOCKROW *MCU_data));
- 
-   /* This is here to share code between baseline and progressive decoders; */
-@@ -217,21 +217,21 @@
- };
- 
- /* Inverse DCT (also performs dequantization) */
--typedef JTQT_METHOD(void, inverse_DCT_method_ptr,
-+typedef JMETHOD(void, inverse_DCT_method_ptr,
- 		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
- 		 JCOEFPTR coef_block,
- 		 JSAMPARRAY output_buf, JDIMENSION output_col));
- 
- struct jpeg_inverse_dct {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-   /* It is useful to allow each component to have a separate IDCT method. */
-   inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
- };
- 
- /* Upsampling (note that upsampler must also call color converter) */
- struct jpeg_upsampler {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
- 			   JSAMPIMAGE input_buf,
- 			   JDIMENSION *in_row_group_ctr,
- 			   JDIMENSION in_row_groups_avail,
-@@ -244,20 +244,20 @@
- 
- /* Colorspace conversion */
- struct jpeg_color_deconverter {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
- 				JSAMPIMAGE input_buf, JDIMENSION input_row,
- 				JSAMPARRAY output_buf, int num_rows));
- };
- 
- /* Color quantization or color precision reduction */
- struct jpeg_color_quantizer {
--  JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
--  JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo,
-+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan));
-+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
- 				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
- 				 int num_rows));
--  JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo));
--  JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo));
-+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
- };
- 
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch b/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch
deleted file mode 100644
index bcf206288..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gwenview/src/gvcore/Makefile.am.ORI	2012-08-04 12:50:37.306573906 +0200
-+++ gwenview/src/gvcore/Makefile.am	2012-08-04 12:50:46.112710411 +0200
-@@ -6,7 +6,7 @@
- 
- libgwenviewcore_la_LIBADD   = \
- 	$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
--	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\
-+	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -lkdefx \
- 	-lkmediaplayer ../imageutils/libgvimageutils.la \
- 	../tsthread/libtsthread.la
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch
deleted file mode 100644
index 195d89ea6..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-remove_additional_tq_conversions.patch
+++ /dev/null
@@ -1,915 +0,0 @@
-commit eba1d381626d92b860239417f21d813f02ee6394
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316139 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
-index 68ee9f0..d09156a 100644
---- a/src/app/bookmarkviewcontroller.cpp
-+++ b/src/app/bookmarkviewcontroller.cpp
-@@ -392,11 +392,11 @@ void BookmarkViewController::deleteCurrentBookmark() {
- 	TQString title;
- 	if (bookmark.isGroup()) {
- 		msg=i18n("Are you sure you want to delete the bookmark folder <b>%1</b>?<br>This will delete the folder and all the bookmarks in it.")
--			.tqarg(bookmark.text());
-+			.arg(bookmark.text());
- 		title=i18n("Delete Bookmark &Folder");
- 	} else {
- 		msg=i18n("Are you sure you want to delete the bookmark <b>%1</b>?")
--			.tqarg(bookmark.text());
-+			.arg(bookmark.text());
- 		title=i18n("Delete &Bookmark");
- 	}
- 
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index d274188..a429095 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() {
- 	KURL url;
- 	url.setPath(ThumbnailLoadJob::thumbnailBaseDir());
- 	unsigned long size=KDirSize::dirSize(url);
--	KMessageBox::information( this,i18n("Cache size is %1").tqarg(KIO::convertSize(size)) );
-+	KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) );
- }
- 
- 
-@@ -281,7 +281,7 @@ void ConfigDialog::emptyCache() {
- 
- 	int response=KMessageBox::warningContinueCancel(this,
- 		"<qt>" + i18n("Are you sure you want to empty the thumbnail cache?"
--		" This will delete the folder <b>%1</b>.").tqarg(TQStyleSheet::escape(dir)) + "</qt>",
-+		" This will delete the folder <b>%1</b>.").arg(TQStyleSheet::escape(dir)) + "</qt>",
- 		TQString(),
- 		KStdGuiItem::del());
- 
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index 32fb346..2f816c0 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -217,7 +217,7 @@
-                                 <string>Using this option, Gwenview will display the image as fast as possible, and smooth it after a short delay.
- Use this option if your computer is not very fast.</string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>WordBreak|AlignTop</set>
-                             </property>
-                             <property name="buddy" stdset="0">
-diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
-index 9a35ef3..f95fe54 100644
---- a/src/app/kipiinterface.cpp
-+++ b/src/app/kipiinterface.cpp
-@@ -163,7 +163,7 @@ KIPI::ImageCollection KIPIInterface::currentSelection() {
- 	LOG("");
- 	KURL::List list=d->mFileView->selectedImageURLs();
- 	KURL url=d->mFileView->dirURL();
--	return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").tqarg(url.fileName()), list));
-+	return KIPI::ImageCollection(new ImageCollection(url, i18n("%1 (Selected Images)").arg(url.fileName()), list));
- }
- 
- 
-@@ -189,12 +189,12 @@ int KIPIInterface::features() const {
-  * here, it is however necessary to discard caches if the plugin preserves timestamp
-  */
- bool KIPIInterface::addImage(const KURL& url, TQString&) {
--	Cache::instance()->tqinvalidate( url );
-+	Cache::instance()->invalidate( url );
- 	return true;
- }
- 
- void KIPIInterface::delImage(const KURL& url) {
--	Cache::instance()->tqinvalidate( url );
-+	Cache::instance()->invalidate( url );
- }
- 
- // TODO currently KDirWatch doesn't have watching of files in a directory
-@@ -203,7 +203,7 @@ void KIPIInterface::refreshImages( const KURL::List& urls ) {
- 	for( KURL::List::ConstIterator it = urls.begin();
- 	     it != urls.end();
- 	     ++it ) {
--		Cache::instance()->tqinvalidate( *it );
-+		Cache::instance()->invalidate( *it );
- 	}
- 	d->mFileView->refreshItems( urls );
- }
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index f9acc9b..2f2275b 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -806,7 +806,7 @@ void MainWindow::updateStatusInfo() {
- 		int pos = mFileViewController->shownFilePosition();
- 		uint count = mFileViewController->fileCount();
- 		if (count > 0) {
--			tokens << i18n("%1/%2").tqarg(pos+1).tqarg(count);
-+			tokens << i18n("%1/%2").arg(pos+1).arg(count);
- 		} else {
- 			tokens << i18n("No images");
- 		}
-@@ -816,7 +816,7 @@ void MainWindow::updateStatusInfo() {
- 
- 	TQSize size = mDocument->image().size();
- 	if (!size.isEmpty()) {
--		tokens << i18n("%1 x %2 pixels").tqarg(size.width()).tqarg(size.height());
-+		tokens << i18n("%1 x %2 pixels").arg(size.width()).arg(size.height());
- 	}
- 	
- 	mSBDetailLabel->setText(tokens.join(" - "));
-@@ -1094,9 +1094,9 @@ void MainWindow::createObjectInteractions() {
- void MainWindow::createHideShowAction(KDockWidget* dock) {
- 	TQString caption;
- 	if (dock->mayBeHide()) {
--		caption=i18n("Hide %1").tqarg(dock->caption());
-+		caption=i18n("Hide %1").arg(dock->caption());
- 	} else {
--		caption=i18n("Show %1").tqarg(dock->caption());
-+		caption=i18n("Show %1").arg(dock->caption());
- 	}
- 
- 	KAction* action=new KAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
-diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
-index 3fa9e19..7aa3ced 100644
---- a/src/app/metaedit.cpp
-+++ b/src/app/metaedit.cpp
-@@ -132,7 +132,7 @@ void MetaEdit::setComment(const TQString& comment) {
- void MetaEdit::setMessage(const TQString& msg) {
- 	mCommentEdit->setTextFormat(TQTextEdit::RichText);
- 	mCommentEdit->setReadOnly(true);
--	mCommentEdit->setText(TQString("<i>%1</i>").tqarg(msg));
-+	mCommentEdit->setText(TQString("<i>%1</i>").arg(msg));
- }
- 
- } // namespace
-diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp
-index 448d8f6..8f4bfb3 100644
---- a/src/gvcore/cache.cpp
-+++ b/src/gvcore/cache.cpp
-@@ -179,7 +179,7 @@ void Cache::addThumbnail( const KURL& url, const TQPixmap& thumbnail, TQSize ima
- 	checkMaxSize();
- }
- 
--void Cache::tqinvalidate( const KURL& url ) {
-+void Cache::invalidate( const KURL& url ) {
- 	d->mImages.remove( url );
- }
- 
-diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h
-index 199bc46..68591a5 100644
---- a/src/gvcore/cache.h
-+++ b/src/gvcore/cache.h
-@@ -52,7 +52,7 @@ public:
- 	void getFrames( const KURL& url, ImageFrames* frames, TQCString* format ) const;
- 	TQPixmap thumbnail( const KURL& url, TQSize& imagesize ) const;
- 	void setPriorityURL( const KURL& url, bool set );
--	void tqinvalidate( const KURL& url );
-+	void invalidate( const KURL& url );
- 	void checkThumbnailSize( int size );
- 	void readConfig(KConfig*,const TQString& group);
- 	void updateAge();
-diff --git a/src/gvcore/captionformatter.cpp b/src/gvcore/captionformatter.cpp
-index 74514f3..4b0a593 100644
---- a/src/gvcore/captionformatter.cpp
-+++ b/src/gvcore/captionformatter.cpp
-@@ -35,7 +35,7 @@ TQString CaptionFormatter::format(const TQString& format) {
- 
- 	TQString resolution;
- 	if (mImageSize.isValid()) {
--		resolution = TQString( "%1x%2" ).tqarg( mImageSize.width()).tqarg( mImageSize.height());
-+		resolution = TQString( "%1x%2" ).arg( mImageSize.width()).arg( mImageSize.height());
- 	}
- 	
- 	TQString str=format;
-diff --git a/src/gvcore/clicklineedit.cpp b/src/gvcore/clicklineedit.cpp
-index 58c09ac..dfbe3bb 100644
---- a/src/gvcore/clicklineedit.cpp
-+++ b/src/gvcore/clicklineedit.cpp
-@@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit(TQWidget *parent, const char* name ) :
- void ClickLineEdit::setClickMessage( const TQString &msg )
- {
-     mClickMessage = msg;
--    tqrepaint();
-+    repaint();
- }
- 
- 
- void ClickLineEdit::setText( const TQString &txt )
- {
-     mDrawClickMsg = txt.isEmpty();
--    tqrepaint();
-+    repaint();
-     KLineEdit::setText( txt );
- }
- 
-@@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
- {
-     if ( mDrawClickMsg == true ) {
-         mDrawClickMsg = false;
--        tqrepaint();
-+        repaint();
-     }
-     TQLineEdit::focusInEvent( ev );
- }
-@@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
- {
-     if ( text().isEmpty() ) {
-         mDrawClickMsg = true;
--        tqrepaint();
-+        repaint();
-     }
-     TQLineEdit::focusOutEvent( ev );
- }
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index 6abab10..f7d6f90 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -56,7 +56,7 @@
-                     <property name="text">
-                         <string>Deletion method placeholder, not in GUI</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>WordBreak|AlignCenter</set>
-                     </property>
-                 </widget>
-@@ -80,7 +80,7 @@
-             <property name="text">
-                 <string>Placeholder for number of files, not in GUI</string>
-             </property>
--            <property name="tqalignment">
-+            <property name="alignment">
-                 <set>AlignVCenter|AlignRight</set>
-             </property>
-         </widget>
-diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
-index caa93f5..b81a229 100644
---- a/src/gvcore/document.cpp
-+++ b/src/gvcore/document.cpp
-@@ -343,7 +343,7 @@ void Document::slotLoaded() {
- //
- //---------------------------------------------------------------------
- void Document::reload() {
--	Cache::instance()->tqinvalidate( url());
-+	Cache::instance()->invalidate( url());
- 	load();
- 	emit reloaded(url());
- }
-@@ -378,7 +378,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 	TQString t = "true";
- 	TQString f = "false";
- 
--	int tqalignment = (printer->option("app-gwenview-position").isEmpty() ?
-+	int alignment = (printer->option("app-gwenview-position").isEmpty() ?
- 		TQt::AlignCenter : printer->option("app-gwenview-position").toInt());
- 
- 	// Compute filename offset
-@@ -407,7 +407,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 	if (scaling==GV_FITTOPAGE /* Fit to page */) {
- 		bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f;
- 		if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) {
--			size.tqscale( pdWidth, pdHeight, TQSize::ScaleMin );
-+			size.scale( pdWidth, pdHeight, TQSize::ScaleMin );
- 		}
- 	} else {
- 		if (scaling==GV_SCALE /* Scale To */) {
-@@ -452,24 +452,24 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
- 				printer->abort();
- 				return;
- 			} else if (resp == KMessageBox::No) { // Shrink
--				size.tqscale(pdWidth, pdHeight, TQSize::ScaleMin);
-+				size.scale(pdWidth, pdHeight, TQSize::ScaleMin);
- 			}
- 		}
- 	}
- 
- 	// Compute x and y
--	if ( tqalignment & TQt::AlignHCenter )
-+	if ( alignment & TQt::AlignHCenter )
- 		x = (pdWidth - size.width())/2;
--	else if ( tqalignment & TQt::AlignLeft )
-+	else if ( alignment & TQt::AlignLeft )
- 		x = 0;
--	else if ( tqalignment & TQt::AlignRight )
-+	else if ( alignment & TQt::AlignRight )
- 		x = pdWidth - size.width();
- 
--	if ( tqalignment & TQt::AlignVCenter )
-+	if ( alignment & TQt::AlignVCenter )
- 		y = (pdHeight - size.height())/2;
--	else if ( tqalignment & TQt::AlignTop )
-+	else if ( alignment & TQt::AlignTop )
- 		y = 0;
--	else if ( tqalignment & TQt::AlignBottom )
-+	else if ( alignment & TQt::AlignBottom )
- 		y = pdHeight - size.height();
- 
- 	// Draw, the image will be scaled to fit the given area if necessary
-@@ -532,7 +532,7 @@ void Document::saveBeforeClosing() {
- 	if (!d->mModified) return;
- 
- 	TQString msg=i18n("<qt>The image <b>%1</b> has been modified, do you want to save the changes?</qt>")
--		.tqarg(url().prettyURL());
-+		.arg(url().prettyURL());
- 
- 	int result=KMessageBox::questionYesNo(dialogParentWidget(), msg, TQString(),
- 		KStdGuiItem::save(), KStdGuiItem::discard(), CONFIG_SAVE_AUTOMATICALLY);		
-@@ -605,7 +605,7 @@ TQString Document::saveInternal(const KURL& url, const TQCString& format) {
- 	
- 	LOG("Save failed: " << msg);
- 	return TQString("<qt><b>%1</b><br/>")
--		.tqarg(i18n("Could not save the image to %1.").tqarg(url.prettyURL()))
-+		.arg(i18n("Could not save the image to %1.").arg(url.prettyURL()))
- 		+ msg + "</qt>";
- }
- 
-diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
-index aacea94..31baec0 100644
---- a/src/gvcore/documentloadedimpl.cpp
-+++ b/src/gvcore/documentloadedimpl.cpp
-@@ -134,7 +134,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 			if (!parent.isWritable()) {
- 				return
- 					i18n("The %1 folder is read-only.")
--					.tqarg(parent.filePath());
-+					.arg(parent.filePath());
- 			}
- 		}
- 	}
-@@ -152,7 +152,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	if (tmp.status()!=0) {
- 		TQString reason( strerror(tmp.status()) );
- 		return i18n("Could not create a temporary file.\nReason: %1.")
--			.tqarg(reason);
-+			.arg(reason);
- 	}
- 	TQFile* file=tmp.file();
- 	msg=localSave(file, format);
-@@ -162,7 +162,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	if (tmp.status()!=0) {
- 		TQString reason( strerror(tmp.status()) );
- 		return i18n("Saving image to a temporary file failed.\nReason: %1.")
--			.tqarg(reason);
-+			.arg(reason);
- 	}
- 	
- 	TQString tmpName=tmp.name();
-@@ -172,11 +172,11 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
- 	// Move the tmp file to the final dest
- 	if (url.isLocalFile()) {
- 		if( ::rename( TQFile::encodeName(tmpName), TQFile::encodeName( url.path())) < 0 ) {
--			return i18n("Could not write to %1.").tqarg(url.path());
-+			return i18n("Could not write to %1.").arg(url.path());
- 		}
- 	} else {
- 		if (!KIO::NetAccess::upload(tmp.name(), url, KApplication::kApplication()->mainWidget() )) {
--			return i18n("Could not upload the file to %1.").tqarg(url.prettyURL());
-+			return i18n("Could not upload the file to %1.").arg(url.prettyURL());
- 		}
- 	}
- 
-diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp
-index 072229e..02020ad 100644
---- a/src/gvcore/documentloadingimpl.cpp
-+++ b/src/gvcore/documentloadingimpl.cpp
-@@ -99,7 +99,7 @@ void DocumentLoadingImpl::init() {
- 			emitImageRectUpdated();
- 		} else {
- 			setImage(image);
--			TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).tqrects();
-+			TQMemArray< TQRect > rects = TQRegion(d->mLoader->loadedRegion()).rects();
- 			for( unsigned int i = 0; i < rects.count(); ++i ) {
- 				emit rectUpdated(rects[i]);
- 			}
-diff --git a/src/gvcore/dragpixmapgenerator.h b/src/gvcore/dragpixmapgenerator.h
-index efbbd93..308c391 100644
---- a/src/gvcore/dragpixmapgenerator.h
-+++ b/src/gvcore/dragpixmapgenerator.h
-@@ -128,7 +128,7 @@ public:
- 		if (listCropped) {
- 			// If list has been cropped, leave space for item count text
- 			height += fm.height();
--			bottomText = i18n("%1 items").tqarg(mItemList.count());
-+			bottomText = i18n("%1 items").arg(mItemList.count());
- 			width = TQMAX(width, fm.width("... " + bottomText));
- 		}
- 		
-diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
-index e579b99..a71351b 100644
---- a/src/gvcore/externaltooldialog.cpp
-+++ b/src/gvcore/externaltooldialog.cpp
-@@ -144,7 +144,7 @@ struct ExternalToolDialogPrivate {
- 		for (; item; item=item->nextSibling()) {
- 			if (item==mSelectedItem) continue;
- 			if (name==item->text(0)) {
--				KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").tqarg(name));
-+				KMessageBox::sorry(mContent, i18n("There is already a tool named \"%1\"").arg(name));
- 				return false;
- 			}
- 		}
-diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
-index 4fd4e03..3a43d26 100644
---- a/src/gvcore/externaltoolmanager.cpp
-+++ b/src/gvcore/externaltoolmanager.cpp
-@@ -222,7 +222,7 @@ TQDict<KDesktopFile>& ExternalToolManager::desktopFiles() const {
- 
- void ExternalToolManager::hideDesktopFile(KDesktopFile* desktopFile) {
- 	TQFileInfo fi(desktopFile->fileName());
--	TQString name=TQString("%1.desktop").tqarg( fi.baseName(true) );
-+	TQString name=TQString("%1.desktop").arg( fi.baseName(true) );
- 	d->mDesktopFiles.take(name);
- 	
- 	if (desktopFile->isReadOnly()) {
-@@ -240,7 +240,7 @@ KDesktopFile* ExternalToolManager::editSystemDesktopFile(const KDesktopFile* des
- 	TQFileInfo fi(desktopFile->fileName());
- 
- 	TQString name=fi.baseName(true);
--	d->mDesktopFiles.remove(TQString("%1.desktop").tqarg(name));
-+	d->mDesktopFiles.remove(TQString("%1.desktop").arg(name));
- 	
- 	return createUserDesktopFile(name);
- }
-@@ -250,7 +250,7 @@ KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) {
- 	Q_ASSERT(!name.isEmpty());
- 	KDesktopFile* desktopFile=new KDesktopFile(
- 		d->mUserToolDir + "/" + name + ".desktop", false);
--	d->mDesktopFiles.insert(TQString("%1.desktop").tqarg(name), desktopFile);	
-+	d->mDesktopFiles.insert(TQString("%1.desktop").arg(name), desktopFile);	
- 
- 	return desktopFile;
- }
-diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
-index a8eba49..a7d9f64 100644
---- a/src/gvcore/filedetailview.cpp
-+++ b/src/gvcore/filedetailview.cpp
-@@ -525,8 +525,8 @@ void FileDetailView::setShownFileItem(KFileItem* fileItem)
- 	FileDetailViewItem* newShownItem=viewItem(fileItem);
- 	
- 	FileViewBase::setShownFileItem(fileItem);
--	if (oldShownItem) oldShownItem->tqrepaint();
--	if (newShownItem) newShownItem->tqrepaint();
-+	if (oldShownItem) oldShownItem->repaint();
-+	if (newShownItem) newShownItem->repaint();
- }
- 
- 
-diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
-index 9f09438..cf6b036 100644
---- a/src/gvcore/fileopobject.cpp
-+++ b/src/gvcore/fileopobject.cpp
-@@ -259,7 +259,7 @@ void FileOpTrashObject::operator()() {
- 		} else {
- 			TQString filename=TQStyleSheet::escape(mURLList.first().filename());
- 			response=KMessageBox::warningContinueCancel(mParent,
--				i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").tqarg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash"));
-+				i18n("<p>Do you really want to move <b>%1</b> to the trash?</p>").arg(filename),i18n("Trash used as a verb", "Trash File"),KGuiItem(i18n("Trash used as a verb", "&Trash"),"edittrash"));
- 		}
- 		if (response!=KMessageBox::Continue) return;
- 	}
-@@ -287,7 +287,7 @@ void FileOpRealDeleteObject::operator()() {
- 		} else {
- 			TQString filename=TQStyleSheet::escape(mURLList.first().filename());
- 			response=KMessageBox::warningContinueCancel(mParent,
--				i18n("<p>Do you really want to delete <b>%1</b>?</p>").tqarg(filename),
-+				i18n("<p>Do you really want to delete <b>%1</b>?</p>").arg(filename),
- 				i18n("Delete File"),
- 				KStdGuiItem::del()
- 				);
-@@ -309,7 +309,7 @@ void FileOpRenameObject::operator()() {
- 	TQString filename = srcURL.filename();
- 	InputDialog dlg(mParent);
- 	dlg.setCaption(i18n("Renaming File"));
--	dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").tqarg(TQStyleSheet::escape(filename)));
-+	dlg.setLabel(i18n("<p>Rename file <b>%1</b> to:</p>").arg(TQStyleSheet::escape(filename)));
- 	dlg.setButtonOK( KGuiItem(i18n("&Rename"), "edit") );
- 
- 	dlg.lineEdit()->setText(filename);
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index 3910e48..c6760fe 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -285,7 +285,7 @@ void FileThumbnailView::setThumbnailPixmap(const KFileItem* fileItem, const TQPi
- 	if (size.isValid()) {
- 		iconItem->setImageSize(size);
- 	}
--	iconItem->tqrepaint();
-+	iconItem->repaint();
- 
- 	// Notify progress
- 	if (d->mProgressWidget) {
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index bb57a07..1cd795e 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -747,7 +747,7 @@ void FileViewController::updateViewMode() {
- 
- void FileViewController::updateThumbnailSize(int size) {
- 	size*=SLIDER_RESOLUTION;
--	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").tqarg(size).tqarg(size));
-+	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").arg(size).arg(size));
- 	FileViewConfig::setThumbnailSize(size);
- 	mFileThumbnailView->setThumbnailSize(size);
- 	Cache::instance()->checkThumbnailSize(size);
-diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
-index 699d088..c74b7ae 100644
---- a/src/gvcore/imageloader.cpp
-+++ b/src/gvcore/imageloader.cpp
-@@ -113,7 +113,7 @@ public:
- 	int getch() {
- 		if (mThread->testCancel()) {
- 			LOG("cancel detected");
--			seStatus(IO_ReadError);
-+			setStatus(IO_ReadError);
- 			return -1;
- 		}
- 		return TQBuffer::getch();
-diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
-index 7831830..17101e2 100644
---- a/src/gvcore/imagesavedialog.cpp
-+++ b/src/gvcore/imagesavedialog.cpp
-@@ -70,7 +70,7 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg
- 			if (!patterns.contains(pattern)) patterns.append(pattern);
- 		}
- 		if (patterns.isEmpty()) {
--			patterns.append( TQString("*.%1").tqarg(format.lower()) );
-+			patterns.append( TQString("*.%1").arg(format.lower()) );
- 		}
- 		TQString patternString=patterns.join(" ");
- 
-diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
-index f9da66f..cbfc459 100644
---- a/src/gvcore/imageview.cpp
-+++ b/src/gvcore/imageview.cpp
-@@ -113,7 +113,7 @@ as approximate as possible). However when converting from widget to image and ba
- this can result in the final rectangle being smaller than the original.
- The widgetToImageBounding() function converts from widget to image coordinates
- in a way which makes sure the reverse conversion will be at least as large
--as the original tqgeometry.
-+as the original geometry.
- 
- There are no conversion functions for only width/height, as their conversion
- depends on the position (because of the rounding etc.). For similar reasons
-@@ -257,7 +257,7 @@ struct ImageView::Private {
- 		const double zoomValues[] = { 0.5, 1, 2 };
- 		int nbValues=sizeof(zoomValues) / sizeof(double);
- 		for (int pos=0; pos<nbValues; ++pos) {
--			TQString txt=TQString("%1%").tqarg( int(zoomValues[pos]*100) );
-+			TQString txt=TQString("%1%").arg( int(zoomValues[pos]*100) );
- 			mZoomCombo->insertItem(txt);
- 		}
- 	}
-@@ -423,7 +423,7 @@ ImageView::~ImageView() {
- void ImageView::slotLoaded() {
- 	if (d->mDocument->isNull()) {
- 		resizeContents(0,0);
--		viewport()->tqrepaint(false);
-+		viewport()->repaint(false);
- 		return;
- 	}
- 
-@@ -488,7 +488,7 @@ KToggleAction* ImageView::zoomToFit() const {
- 
- 
- void ImageView::updateFromSettings() {
--	// Reset, so that next tqrepaint doesn't possibly take longer because of
-+	// Reset, so that next repaint doesn't possibly take longer because of
- 	// smoothing
- 	ImageViewConfig::setMaxRepaintSize(DEFAULT_MAX_REPAINT_SIZE);
- 	ImageViewConfig::setMaxScaleRepaintSize(DEFAULT_MAX_REPAINT_SIZE);
-@@ -625,7 +625,7 @@ void ImageView::drawContents(TQPainter* painter,int clipx,int clipy,int clipw,in
- 	TQRect widgetRect = TQRect(0, 0, visibleWidth(), visibleHeight());
- 
- 	TQRegion region = TQRegion(widgetRect) - imageRect;
--	TQMemArray<TQRect> rects = region.tqrects();
-+	TQMemArray<TQRect> rects = region.rects();
- 	for(unsigned int pos = 0; pos < rects.count(); ++pos ) {
- 		painter->eraseRect(rects[pos]);
- 	}
-@@ -701,7 +701,7 @@ void ImageView::limitPaintSize( PendingPaint& paint ) {
- 	// don't paint more than max_size pixels at a time
- 	int maxHeight = ( maxSize + paint.rect.width() - 1 ) / paint.rect.width(); // round up
- 	maxHeight = TQMAX( maxHeight, 5 ); // at least 5 lines together
--	// can't tqrepaint whole paint at once, adjust height and schedule the rest
-+	// can't repaint whole paint at once, adjust height and schedule the rest
- 	if( maxHeight < paint.rect.height()) {
- 		TQRect remaining = paint.rect;
- 		remaining.setTop( remaining.top() + maxHeight );
-@@ -781,12 +781,12 @@ void ImageView::slotBusyLevelChanged( BusyLevel level ) {
- // How to do painting:
- // When something needs to be erased: TQPainter on viewport and eraseRect()
- // When whole picture needs to be repainted: fullRepaint()
--// When a part of the picture needs to be updated: viewport()->tqrepaint(area,false)
-+// When a part of the picture needs to be updated: viewport()->repaint(area,false)
- // All other paints will be changed to progressive painting.
- void ImageView::fullRepaint() {
- 	if( !viewport()->isUpdatesEnabled()) return;
- 	cancelPending();
--	viewport()->tqrepaint(false);
-+	viewport()->repaint(false);
- }
- 
- void ImageView::cancelPending() {
-@@ -832,7 +832,7 @@ void ImageView::performPaint( TQPainter* painter, int clipx, int clipy, int clip
- 	int extraPixels = ImageUtils::extraScalePixels( smoothAlgo, zoom());
- 	TQRect imageRect = d->widgetToImageBounding( TQRect(clipx,clipy,clipw,cliph), extraPixels );
- 	imageRect = imageRect.intersect( TQRect( 0, 0, d->mDocument->width(), d->mDocument->height()));
--	TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).tqrects();
-+	TQMemArray< TQRect > rects = TQRegion(d->mValidImageArea.intersect( imageRect )).rects();
- 	for( unsigned int i = 1; i < rects.count(); ++i ) {
- 		addPendingPaint( secondPass, d->imageToWidget( rects[ i ] ));
- 	}
-@@ -1024,7 +1024,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) {
- 		return true;
- 
- 	// Getting/loosing focus causes repaints, but repainting here is expensive,
--	// and there's no need to tqrepaint on focus changes, as the focus is not
-+	// and there's no need to repaint on focus changes, as the focus is not
- 	// indicated.
- 	case TQEvent::FocusIn:
- 	case TQEvent::FocusOut:
-@@ -1313,7 +1313,7 @@ void ImageView::slotImageSizeUpdated() {
- 
- void ImageView::slotImageRectUpdated(const TQRect& imageRect) {
- 	d->mValidImageArea += imageRect;
--	viewport()->tqrepaint( d->imageToWidget( imageRect ), false );
-+	viewport()->repaint( d->imageToWidget( imageRect ), false );
- }
- 
- 
-@@ -1339,7 +1339,7 @@ double ImageView::computeZoomToFit() const {
- 		return 1.0;
- 	}
- 	TQSize size=d->mDocument->image().size();
--	size.tqscale(width(),height(),TQSize::ScaleMin);
-+	size.scale(width(),height(),TQSize::ScaleMin);
- 
- 	double zoom=double(size.width())/d->mDocument->width();
- 	if (zoom>1.0 && !ImageViewConfig::enlargeSmallImages()) return 1.0;
-@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show()
-+	int sw = verticalScrollBar()->sizeHint().width(); // geometry is not valid before first show()
- 	int w = width();
- 	int dw = d->mDocument->width();
- 	switch( vScrollBarMode()) {
-@@ -1425,7 +1425,7 @@ void ImageView::updateImageOffset() {
- 	int zpixHeight=int(d->mDocument->height() * d->mZoom);
- 
- 	if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) {
--		// use sizeHint() - tqgeometry is not valid before first show()
-+		// use sizeHint() - geometry is not valid before first show()
- 		viewHeight-=horizontalScrollBar()->sizeHint().height();
- 	}
- 	if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) {
-@@ -1457,7 +1457,7 @@ void ImageView::updateZoomActions() {
- 	if (d->mZoomMode==ZOOM_FREE) {
- 		d->mZoomIn->setEnabled(d->mZoom<MAX_ZOOM);
- 		d->mZoomOut->setEnabled(d->mZoom>1/MAX_ZOOM);
--		TQString zoomText=TQString("%1%").tqarg(int(d->mZoom*100));
-+		TQString zoomText=TQString("%1%").arg(int(d->mZoom*100));
- 		d->mZoomCombo->setCurrentText(zoomText);
- 	} else {
- 		d->mZoomIn->setEnabled(true);
-diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
-index 699868a..da9044a 100644
---- a/src/gvcore/imageviewtools.cpp
-+++ b/src/gvcore/imageviewtools.cpp
-@@ -36,7 +36,7 @@ namespace Gwenview {
- // Helper function
- static TQCursor loadCursor(const TQString& name) {
- 	TQString path;
--	path=locate("data", TQString("gwenview/cursors/%1.png").tqarg(name));
-+	path=locate("data", TQString("gwenview/cursors/%1.png").arg(name));
- 	return TQCursor(TQPixmap(path));
- }
- 
-diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
-index 98524af..003fb3a 100644
---- a/src/gvcore/printdialog.cpp
-+++ b/src/gvcore/printdialog.cpp
-@@ -169,57 +169,57 @@ void PrintDialogPage::setScaleHeight( double value ) {
- }
- 
- int PrintDialogPage::getPosition(const TQString& align) {
--	int tqalignment;
-+	int alignment;
- 
- 	if (align == i18n("Central-Left")) {
--		tqalignment = TQt::AlignLeft | TQt::AlignVCenter;
-+		alignment = TQt::AlignLeft | TQt::AlignVCenter;
- 	} else if (align == i18n("Central-Right")) {
--		tqalignment = TQt::AlignRight | TQt::AlignVCenter;
-+		alignment = TQt::AlignRight | TQt::AlignVCenter;
- 	} else if (align == i18n("Top-Left")) {
--		tqalignment = TQt::AlignTop | TQt::AlignLeft;
-+		alignment = TQt::AlignTop | TQt::AlignLeft;
- 	} else if (align == i18n("Top-Right")) {
--		tqalignment = TQt::AlignTop | TQt::AlignRight;
-+		alignment = TQt::AlignTop | TQt::AlignRight;
- 	} else if (align == i18n("Bottom-Left")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignLeft;
-+		alignment = TQt::AlignBottom | TQt::AlignLeft;
- 	} else if (align == i18n("Bottom-Right")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignRight;
-+		alignment = TQt::AlignBottom | TQt::AlignRight;
- 	} else if (align == i18n("Top-Central")) {
--		tqalignment = TQt::AlignTop | TQt::AlignHCenter;
-+		alignment = TQt::AlignTop | TQt::AlignHCenter;
- 	} else if (align == i18n("Bottom-Central")) {
--		tqalignment = TQt::AlignBottom | TQt::AlignHCenter;
-+		alignment = TQt::AlignBottom | TQt::AlignHCenter;
- 	} else	{
- 		// Central
--		tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter
-+		alignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter
- 	}
- 
--	return tqalignment;
-+	return alignment;
- }
- 
- TQString PrintDialogPage::setPosition(int align) {
--	TQString tqalignment;
-+	TQString alignment;
- 
- 	if (align == (TQt::AlignLeft | TQt::AlignVCenter)) {
--		tqalignment = i18n("Central-Left");
-+		alignment = i18n("Central-Left");
- 	} else if (align == (TQt::AlignRight | TQt::AlignVCenter)) {
--		tqalignment = i18n("Central-Right");
-+		alignment = i18n("Central-Right");
- 	} else if (align == (TQt::AlignTop | TQt::AlignLeft)) {
--		tqalignment = i18n("Top-Left");
-+		alignment = i18n("Top-Left");
- 	} else if (align == (TQt::AlignTop | TQt::AlignRight)) {
--		tqalignment = i18n("Top-Right");
-+		alignment = i18n("Top-Right");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignLeft)) {
--		tqalignment = i18n("Bottom-Left");
-+		alignment = i18n("Bottom-Left");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignRight)) {
--		tqalignment = i18n("Bottom-Right");
-+		alignment = i18n("Bottom-Right");
- 	} else if (align == (TQt::AlignTop | TQt::AlignHCenter)) {
--		tqalignment = i18n("Top-Central");
-+		alignment = i18n("Top-Central");
- 	} else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) {
--		tqalignment = i18n("Bottom-Central");
-+		alignment = i18n("Bottom-Central");
- 	} else	{
- 		// Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter)
--		tqalignment = i18n("Central");
-+		alignment = i18n("Central");
- 	}
- 
--	return tqalignment;
-+	return alignment;
- }
- 
- // SLOTS
-diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
-index 27ad0b9..8e6559f 100644
---- a/src/gvcore/qxcfi.cpp
-+++ b/src/gvcore/qxcfi.cpp
-@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
-   }
- 
-   image_io->setImage( xcf_image.image );
--  image_io->seStatus( 0 );
-+  image_io->setStatus( 0 );
- }
- 
- /*!
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index b56ba59..a021c55 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -161,7 +161,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     int i, cpp, ncols, w, h, index = 0;
- 
-     if ( iio ) {
--	iio->seStatus( 1 );
-+	iio->setStatus( 1 );
- 	d = iio ? iio->ioDevice() : 0;
- 	d->readLine( buf.data(), buf.size() );	// "/* XPM */"
- 	TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") );
-@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     }
-     if ( iio ) {
- 	iio->setImage( image );
--	iio->seStatus( 0 );			// image ok
-+	iio->setStatus( 0 );			// image ok
-     }
- }
- 
-@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index )
- static void write_xpm_image( TQImageIO * iio )
- {
-     if ( iio )
--	iio->seStatus( 1 );
-+	iio->setStatus( 1 );
-     else
- 	return;
- 
-@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio )
-     }
-     s << "};" << endl;
- 
--    iio->seStatus( 0 );
-+    iio->setStatus( 0 );
- }
- 
- // TQt code end ---------------------------
-diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
-index 4745bfe..3f321e5 100644
---- a/src/gvdirpart/gvdirpart.cpp
-+++ b/src/gvdirpart/gvdirpart.cpp
-@@ -173,7 +173,7 @@ bool GVDirPart::openURL(const KURL& url) {
- void GVDirPart::loaded(const KURL& url) {
- 	TQString caption = url.filename();
- 	if( !mDocument->image().isNull())
--		caption += TQString(" %1 x %2").tqarg(mDocument->width()).tqarg(mDocument->height());
-+		caption += TQString(" %1 x %2").arg(mDocument->width()).arg(mDocument->height());
- 	emit setWindowCaption(caption);
- 	emit completed();
- }
-diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
-index 95712b5..95c67e3 100644
---- a/src/gvimagepart/gvimagepart.cpp
-+++ b/src/gvimagepart/gvimagepart.cpp
-@@ -194,7 +194,7 @@ void GVImagePart::slotLoading() {
- }
- 
- void GVImagePart::slotLoaded(const KURL& url) {
--	TQString caption = url.filename() + TQString(" - %1x%2").tqarg(mDocument->width()).tqarg(mDocument->height());
-+	TQString caption = url.filename() + TQString(" - %1x%2").arg(mDocument->width()).arg(mDocument->height());
- 	emit setWindowCaption(caption);
- 	emit completed();
- 	emit setStatusBarText(i18n("Done."));
-@@ -363,7 +363,7 @@ void GVImagePart::saveOriginalAs() {
- 		if (!file.open(IO_WriteOnly)) {
- 			KMessageBox::error(
- 				widget(),
--				i18n("Could not open '%1' for writing.").tqarg(path));
-+				i18n("Could not open '%1' for writing.").arg(path));
- 			return;
- 		}
- 		storeData(widget(), &file, data);
-diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp
-index 5bcb7ef..c007267 100644
---- a/src/imageutils/jpegcontent.cpp
-+++ b/src/imageutils/jpegcontent.cpp
-@@ -120,7 +120,7 @@ struct inmem_dest_mgr : public jpeg_destination_mgr {
- void inmem_init_destination(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
- 	if (dest->mOutput->size()==0) {
--		bool result=dest->mOutput->tqresize(INMEM_DST_DELTA);
-+		bool result=dest->mOutput->resize(INMEM_DST_DELTA);
- 		Q_ASSERT(result);
- 	}
- 	dest->free_in_buffer=dest->mOutput->size();
-@@ -129,7 +129,7 @@ void inmem_init_destination(j_compress_ptr cinfo) {
- 
- int inmem_empty_output_buffer(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
--	bool result=dest->mOutput->tqresize(dest->mOutput->size() + INMEM_DST_DELTA);
-+	bool result=dest->mOutput->resize(dest->mOutput->size() + INMEM_DST_DELTA);
- 	Q_ASSERT(result);
- 	dest->next_output_byte=(JOCTET*)( dest->mOutput->data() + dest->mOutput->size() - INMEM_DST_DELTA );
- 	dest->free_in_buffer=INMEM_DST_DELTA;
-@@ -141,7 +141,7 @@ void inmem_term_destination(j_compress_ptr cinfo) {
- 	inmem_dest_mgr* dest=(inmem_dest_mgr*)(cinfo->dest);
- 	int finalSize=dest->next_output_byte - (JOCTET*)(dest->mOutput->data());
- 	Q_ASSERT(finalSize>=0);
--	dest->mOutput->tqresize(finalSize);
-+	dest->mOutput->resize(finalSize);
- }
- 
- 
-diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp
-index c8a70a7..733dc1a 100644
---- a/src/imageutils/scale.cpp
-+++ b/src/imageutils/scale.cpp
-@@ -1929,7 +1929,7 @@ TQImage scale(const TQImage& image, int width, int height,
- 	if( image.isNull()) return image.copy();
- 	
- 	TQSize newSize( image.size() );
--	newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
-+	newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
- 	newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null
- 
- 	if ( newSize == image.size() ) return image.copy();
-diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
-index e2ad754..67a3cdf 100644
---- a/src/spec/gwenview-mdk.spec
-+++ b/src/spec/gwenview-mdk.spec
-@@ -272,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
-    o Update the EXIF thumbnail when rotating a JPEG file.
-    o In the folder view, folders now open with a single click (By Daniel Thaler).
-    o Reworked coordinate conversions in order to avoid subtle paint errors.
--   o Remember computed optimal tqrepaint sizes in the config file, 
-+   o Remember computed optimal repaint sizes in the config file, 
-      so they are available immediately after next start.
-    o Remember shown URL after session restore.
- * Sat Oct 16 2004 Angelo Naselli <anaselli@mandrake.org> 1.1.5-0.3mdk
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch
deleted file mode 100644
index 2075f3345..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_a_few_stragglers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b4881a61a24b3df9af47ee6d7e7de4ca8d369f81
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324747996 -0600
-
-    Rename a few stragglers
-
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index e5c1e04..d93051a 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -2,7 +2,7 @@
- <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
- <kcfg> 
-   <include>tqapplication.h</include>
--  <include>tqpalette.h</include>
-+  <include>palette.h</include>
-   <kcfgfile name="gwenviewrc"/> 
-   <group name="pixmap widget">
-     <entry name="smoothAlgorithm" key="smooth scale" type="Enum"> 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch
deleted file mode 100644
index 4be46b5e1..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_obsolete_tq_methods.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-commit 04fccf73370ad95a70b8e107240e50f9fdbf98fc
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497836 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index a429095..3dbdb53 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -93,9 +93,9 @@ template<class T>
- void addConfigPage(KDialogBase* dialog, T* content, const TQString& header, const TQString& name, const char* iconName) {
- 	TQFrame* page=dialog->addPage(name, header, BarIcon(iconName, 32));
- 	content->reparent(page, TQPoint(0,0));
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
--	tqlayout->addWidget(content);
--	tqlayout->addStretch();
-+	TQVBoxLayout* layout=new TQVBoxLayout(page, 0, KDialog::spacingHint());
-+	layout->addWidget(content);
-+	layout->addStretch();
- }
- 
- template<class T>
-diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
-index e2fb15b..01cfe95 100644
---- a/src/app/configimagelistpage.ui
-+++ b/src/app/configimagelistpage.ui
-@@ -150,7 +150,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-@@ -258,7 +258,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index 2f816c0..963f13d 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -73,7 +73,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6">
-             <property name="name">
--                <cstring>tqlayout4</cstring>
-+                <cstring>layout4</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
-index 9df8e96..7e5874e 100644
---- a/src/app/configmiscpage.ui
-+++ b/src/app/configmiscpage.ui
-@@ -137,7 +137,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-diff --git a/src/app/main.cpp b/src/app/main.cpp
-index bef08ae..989bffd 100644
---- a/src/app/main.cpp
-+++ b/src/app/main.cpp
-@@ -117,7 +117,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
- 	aboutData.addCredit("Marco Gazzetta", I18N_NOOP("Fixed crash when trying to generate a thumbnail for a broken JPEG file (v0.16.0)"), "mililani@pobox.com");
- 	aboutData.addCredit("GeniusR13", I18N_NOOP("Fixed compilation on KDE 3.0 (v0.16.1)"), "geniusr13@gmx.net");
- 	aboutData.addCredit("Ian Koenig", I18N_NOOP("First RPM spec file"), "iguy@ionsphere.org");
--	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar tqlayout patch for RTL languages (v0.16.0)"), "livne@kde.org");
-+	aboutData.addCredit("Meni Livne", I18N_NOOP("Toolbar layout patch for RTL languages (v0.16.0)"), "livne@kde.org");
- 	aboutData.addCredit("Angelo Naselli", I18N_NOOP("Printing support (v1.0.0)"), "anaselli@linux.it");
- 	aboutData.addCredit("Jos van den Oever", I18N_NOOP("File info view (v1.0.0)\nPatch to toggle auto-zoom on click (v1.0.0)"), "jos@vandenoever.info");
- 	aboutData.addCredit("Jeroen Peters", I18N_NOOP("Configurable mouse wheel behavior (v1.1.1)"), "jpeters@coldmail.nl");
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index 2f2275b..70b42d7 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -199,8 +199,8 @@ bool MainWindow::queryClose() {
- 
- 	KConfig* config=KGlobal::config();
- 
--	// Don't store dock tqlayout if only the image dock is visible. This avoid
--	// saving tqlayout when in "fullscreen" or "image only" mode.
-+	// Don't store dock layout if only the image dock is visible. This avoid
-+	// saving layout when in "fullscreen" or "image only" mode.
- 	if (mFileViewController->isVisible() || mDirViewController->widget()->isVisible()) {
- 		mDockArea->writeDockConfig(config,CONFIG_DOCK_GROUP);
- 	}
-@@ -867,8 +867,8 @@ void MainWindow::createWidgets() {
- 	mDockArea->manager()->setSplitterOpaqueResize(true);
- 	
- 	mViewModeWidget=new TQWidget(mCentralStack);
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(mViewModeWidget);
--	tqlayout->setAutoAdd(true);
-+	TQVBoxLayout* layout=new TQVBoxLayout(mViewModeWidget);
-+	layout->setAutoAdd(true);
- 	mCentralStack->addWidget(mViewModeWidget);
- 
- 	// Status bar
-@@ -923,7 +923,7 @@ void MainWindow::createWidgets() {
- 	setGeometry(20,20,720,520);
- 
- 	// Default dock config
--	// (The "magic numbers" were found by adjusting the tqlayout from within the
-+	// (The "magic numbers" were found by adjusting the layout from within the
- 	// app and looking at the result in the configuration file)
- 	mFolderDock->manualDock(mFileDock, KDockWidget::DockLeft, 4000);
- 	mImageDock->manualDock(mFolderDock, KDockWidget::DockBottom, 3734);
-diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
-index 66e9b9e..40a1a0a 100644
---- a/src/app/vtabwidget.cpp
-+++ b/src/app/vtabwidget.cpp
-@@ -47,9 +47,9 @@ VTabWidget::VTabWidget(TQWidget* parent)
- 	d->mTabBar->setPosition(KMultiTabBar::Left);
- 	d->mTabBar->setStyle(KMultiTabBar::KDEV3ICON);
- 	d->mStack=new TQWidgetStack(this);
--	TQHBoxLayout* tqlayout=new TQHBoxLayout(this);
--	tqlayout->add(d->mTabBar);
--	tqlayout->add(d->mStack);
-+	TQHBoxLayout* layout=new TQHBoxLayout(this);
-+	layout->add(d->mTabBar);
-+	layout->add(d->mStack);
- }
- 
- 
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index f7d6f90..7a8ffd4 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
-index 2c25a92..e35f222 100644
---- a/src/gvcore/externaltooldialogbase.ui
-+++ b/src/gvcore/externaltooldialogbase.ui
-@@ -153,7 +153,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index c6760fe..4867781 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -77,8 +77,8 @@ public:
- 	ProgressWidget(FileThumbnailView* view, int count)
- 	: TQFrame(view)
- 	{
--		TQHBoxLayout* tqlayout=new TQHBoxLayout(this, 3, 3);
--		tqlayout->setAutoAdd(true);
-+		TQHBoxLayout* layout=new TQHBoxLayout(this, 3, 3);
-+		layout->setAutoAdd(true);
- 		setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
- 		
- 		mStop=new TQPushButton(this);
-@@ -93,7 +93,7 @@ public:
- 	
- 	void polish() {
- 		TQFrame::polish();
--		setMinimumWidth(tqlayout()->minimumSize().width());
-+		setMinimumWidth(layout()->minimumSize().width());
- 		//setFixedHeight( mProgressBar->height() );
- 		setFixedHeight( mStop->height() );
- 	}
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index 1cd795e..86a0282 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 	d->initFilterCombo();
- 	d->mStack=new TQWidgetStack(this);
- 	
--	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
--	tqlayout->addWidget(d->mToolBar);
--	tqlayout->addWidget(d->mFilterBar);
--	tqlayout->addWidget(d->mStack);
-+	TQVBoxLayout *layout=new TQVBoxLayout(this);
-+	layout->addWidget(d->mToolBar);
-+	layout->addWidget(d->mFilterBar);
-+	layout->addWidget(d->mStack);
- 
- 	// Actions
- 	mSelectFirst=new KAction(i18n("&First"),
-diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
-index be2b517..bc8375f 100644
---- a/src/gvcore/fullscreenbar.cpp
-+++ b/src/gvcore/fullscreenbar.cpp
-@@ -123,7 +123,7 @@ void FullScreenBar::showEvent(TQShowEvent* event) {
- 	if (!d->mFirstShow) return;
- 	d->mFirstShow=false;
- 	move(0, -height());
--	tqlayout()->setResizeMode(TQLayout::Fixed);
-+	layout()->setResizeMode(TQLayout::Fixed);
- }
- 
- 
-diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg
-index 6424202..e5c1e04 100644
---- a/src/gvcore/imageviewconfig.kcfg
-+++ b/src/gvcore/imageviewconfig.kcfg
-@@ -18,7 +18,7 @@
-       <default>false</default>
-     </entry>
-     <entry name="backgroundColor" key="background color" type="Color">
--      <default code="true">TQApplication::tqpalette().active().dark()</default>
-+      <default code="true">TQApplication::palette().active().dark()</default>
-     </entry>
-     <entry name="enlargeSmallImages" key="enlarge small images" type="Bool">
-       <default>false</default>
-diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
-index f24a2e8..7387cb8 100644
---- a/src/gvcore/imageviewcontroller.cpp
-+++ b/src/gvcore/imageviewcontroller.cpp
-@@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
- 
- 	d->mContainer=new TQWidget(parent);
- 	d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
--	TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer);
-+	TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer);
- 	d->mToolBar=new KToolBar(d->mContainer, "", true);
- 
--	tqlayout->add(d->mToolBar);
-+	layout->add(d->mToolBar);
- 	d->mStack=new TQWidgetStack(d->mContainer);
--	tqlayout->add(d->mStack);
-+	layout->add(d->mStack);
- 	
- 	d->mImageView=new ImageView(d->mStack, document, actionCollection);
- 	d->mStack->addWidget(d->mImageView);
-diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
-index 003fb3a..3b013b3 100644
---- a/src/gvcore/printdialog.cpp
-+++ b/src/gvcore/printdialog.cpp
-@@ -82,8 +82,8 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch
- 	mContent = new PrintDialogPageBase(this);
- 	setTitle( mContent->caption() );
- 
--	TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
--	tqlayout->addWidget( mContent );
-+	TQVBoxLayout *layout = new TQVBoxLayout( this );
-+	layout->addWidget( mContent );
- 
- 	connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double )));
- 	connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double )));
-diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
-index 543877c..6ae7696 100644
---- a/src/gvcore/printdialogpagebase.ui
-+++ b/src/gvcore/printdialogpagebase.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout2</cstring>
-+                <cstring>layout2</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -170,7 +170,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -236,7 +236,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui
-index e9ef011..ae03c98 100644
---- a/src/gvcore/thumbnaildetailsdialogbase.ui
-+++ b/src/gvcore/thumbnaildetailsdialogbase.ui
-@@ -29,7 +29,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec
-index 67a3cdf..c524954 100644
---- a/src/spec/gwenview-mdk.spec
-+++ b/src/spec/gwenview-mdk.spec
-@@ -317,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
-  - Avoid data loss if the JPEG images are saved while being rotated by
-    JPEGTran.
-  - The back button in Konqueror now works correctly with gvimagepart.
-- - The default tqlayout is more user-friendly.
-+ - The default layout is more user-friendly.
-  - Non-trivial URLs (e.g. http query URL) are correctly handled.
-  - You can now drop images on the image view.
- 
diff --git a/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch b/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch
deleted file mode 100644
index 2f9e42d5b..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13-rename_old_tq_method.patch
+++ /dev/null
@@ -1,796 +0,0 @@
-commit d0bdd0d7a768f9935b521f3bd12a4cd72739b96f
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253323 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui
-index d4db944..08ccea2 100644
---- a/src/app/bookmarkdialogbase.ui
-+++ b/src/app/bookmarkdialogbase.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>400</width>
-             <height>0</height>
-@@ -88,7 +88,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>383</width>
-                     <height>16</height>
-diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
-index b40f70e..68ee9f0 100644
---- a/src/app/bookmarkviewcontroller.cpp
-+++ b/src/app/bookmarkviewcontroller.cpp
-@@ -98,7 +98,7 @@ public:
- 		if ( !item) return;
- 		if (item->mBookmark.isGroup()) return;
- 		
--		TQRect rect=mListView->tqitemRect(item);
-+		TQRect rect=mListView->itemRect(item);
- 		tip(rect, item->mBookmark.url().prettyURL());
- 	};
- 	
-diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
-index 0fb33df..d274188 100644
---- a/src/app/configdialog.cpp
-+++ b/src/app/configdialog.cpp
-@@ -289,7 +289,7 @@ void ConfigDialog::emptyCache() {
- 
- 	KURL url;
- 	url.setPath(dir);
--	if (KIO::NetAccess::del(url, tqtopLevelWidget()) ) {
-+	if (KIO::NetAccess::del(url, topLevelWidget()) ) {
- 		KMessageBox::information( this,i18n("Cache emptied.") );
- 	}
- }
-diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui
-index 78ac6d3..451a030 100644
---- a/src/app/configfileoperationspage.ui
-+++ b/src/app/configfileoperationspage.ui
-@@ -93,7 +93,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui
-index e7da709..855869f 100644
---- a/src/app/configfullscreenpage.ui
-+++ b/src/app/configfullscreenpage.ui
-@@ -43,7 +43,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-@@ -131,7 +131,7 @@ You can use the following keywords to format the On Screen Display:
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>18</height>
-diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
-index 6670dbd..e2fb15b 100644
---- a/src/app/configimagelistpage.ui
-+++ b/src/app/configimagelistpage.ui
-@@ -40,7 +40,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-@@ -131,7 +131,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>0</height>
-@@ -166,7 +166,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>21</width>
-                             <height>20</height>
-@@ -217,7 +217,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
-index a99b945..32fb346 100644
---- a/src/app/configimageviewpage.ui
-+++ b/src/app/configimageviewpage.ui
-@@ -56,7 +56,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>181</width>
-                     <height>21</height>
-@@ -238,7 +238,7 @@ Use this option if your computer is not very fast.</string>
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>16</height>
-diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
-index 9b69c2d..9df8e96 100644
---- a/src/app/configmiscpage.ui
-+++ b/src/app/configmiscpage.ui
-@@ -92,7 +92,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>24</height>
-@@ -120,7 +120,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>24</height>
-@@ -153,7 +153,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>11</width>
-                             <height>20</height>
-@@ -191,7 +191,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>41</height>
-diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui
-index 62ab807..ccf0c15 100644
---- a/src/app/configslideshowpage.ui
-+++ b/src/app/configslideshowpage.ui
-@@ -88,7 +88,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>180</width>
-                     <height>20</height>
-diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
-index 1464a09..f9acc9b 100644
---- a/src/app/mainwindow.cpp
-+++ b/src/app/mainwindow.cpp
-@@ -871,7 +871,7 @@ void MainWindow::createWidgets() {
- 	tqlayout->setAutoAdd(true);
- 	mCentralStack->addWidget(mViewModeWidget);
- 
--	// tqStatus bar
-+	// Status bar
- 	mSBDetailLabel=new TQLabel("", statusBar());
- 	
- 	mSBHintLabel=new TruncatedTextLabel(statusBar());
-@@ -1216,7 +1216,7 @@ void MainWindow::createLocationToolBar() {
- 
- 	// Do not let the combobox get wider than available space, as this would
- 	// hide the toolbuttons after it
--	mURLEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
-+	mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
- 	
- 	// Avoid stealing focus
- 	mURLEdit->setFocusPolicy(TQ_ClickFocus);
-diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h
-index 8e126ed..2351890 100644
---- a/src/app/truncatedtextlabel.h
-+++ b/src/app/truncatedtextlabel.h
-@@ -39,14 +39,14 @@ public:
- 	TruncatedTextLabel(TQWidget* parent)
- 	: TQLabel(parent) {}
- 
--	TQSize tqminimumSizeHint() const {
--		TQSize size=TQLabel::tqminimumSizeHint();
-+	TQSize minimumSizeHint() const {
-+		TQSize size=TQLabel::minimumSizeHint();
- 		size.setWidth(-1);
- 		return size;
- 	}
- 
--	TQSize tqsizeHint() const {
--		return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
-+	TQSize sizeHint() const {
-+		return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
- 	}
- 
- 	void setText(const TQString& text) {
-diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp
-index 00f1736..3569dc8 100644
---- a/src/gvcore/cursortracker.cpp
-+++ b/src/gvcore/cursortracker.cpp
-@@ -79,7 +79,7 @@ TipTracker::TipTracker(const TQString& txt, TQWidget* reference)
- 	setPalette(TQToolTip::palette());
- 	setFrameStyle(TQFrame::Plain | TQFrame::Box);
- 	setLineWidth(1);
--	tqsetAlignment(AlignAuto | AlignTop);
-+	setAlignment(AlignAuto | AlignTop);
- }
- 	
- 
-diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
-index 3d6308b..9fdfac5 100644
---- a/src/gvcore/deletedialog.cpp
-+++ b/src/gvcore/deletedialog.cpp
-@@ -113,9 +113,9 @@ bool DeleteDialog::shouldDelete() const {
- }
- 
- 
--TQSize DeleteDialog::tqsizeHint() const {
-+TQSize DeleteDialog::sizeHint() const {
-     m_widget->adjustSize();
--    TQSize hint = m_widget->tqminimumSize();
-+    TQSize hint = m_widget->minimumSize();
-     hint = calculateSize(hint.width(), hint.height());
- 
-     // For some reason calculateSize does not return a correct height. As I'm
-diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h
-index 6825368..1bdc5ab 100644
---- a/src/gvcore/deletedialog.h
-+++ b/src/gvcore/deletedialog.h
-@@ -36,7 +36,7 @@ public:
-     void setURLList(const KURL::List &files);
-     bool shouldDelete() const;
- 
--    TQSize tqsizeHint() const;
-+    TQSize sizeHint() const;
- 
- protected slots:
-     virtual void accept();
-diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
-index 4725920..6abab10 100644
---- a/src/gvcore/deletedialogbase.ui
-+++ b/src/gvcore/deletedialogbase.ui
-@@ -47,7 +47,7 @@
-                     <property name="name">
-                         <cstring>ddDeleteText</cstring>
-                     </property>
--                    <property name="tqminimumSize">
-+                    <property name="minimumSize">
-                         <size>
-                             <width>0</width>
-                             <height>60</height>
-diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
-index 00d2954..2c25a92 100644
---- a/src/gvcore/externaltooldialogbase.ui
-+++ b/src/gvcore/externaltooldialogbase.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>720</width>
-             <height>0</height>
-@@ -49,7 +49,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>487</width>
-                     <height>16</height>
-@@ -304,7 +304,7 @@ You can use keywords in the Command field:
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>21</width>
-                                     <height>140</height>
-diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
-index f061c13..a8eba49 100644
---- a/src/gvcore/filedetailview.cpp
-+++ b/src/gvcore/filedetailview.cpp
-@@ -125,8 +125,8 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name)
- 	setDropHighlighter(false);
- 
- 	int size = IconSize(KIcon::Small);
--	mShownItemUnselectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlight());
--	mShownItemSelectedPixmap = createShownItemPixmap(size, tqcolorGroup().highlightedText());
-+	mShownItemUnselectedPixmap = createShownItemPixmap(size, colorGroup().highlight());
-+	mShownItemSelectedPixmap = createShownItemPixmap(size, colorGroup().highlightedText());
- }
- 
- 
-diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
-index 1104bce..a0ad5df 100644
---- a/src/gvcore/filedetailviewitem.h
-+++ b/src/gvcore/filedetailviewitem.h
-@@ -71,7 +71,7 @@ public:
- 
- 	TQRect rect() const
- 	{
--		TQRect r = listView()->tqitemRect(this);
-+		TQRect r = listView()->itemRect(this);
- 		return TQRect( listView()->viewportToContents( r.topLeft() ),
- 					  TQSize( r.width(), r.height() ) );
- 	}
-diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
-index e72d192..9f09438 100644
---- a/src/gvcore/fileopobject.cpp
-+++ b/src/gvcore/fileopobject.cpp
-@@ -89,7 +89,7 @@ void FileOpObject::slotResult(KIO::Job* job) {
- 
- 
- void FileOpObject::polishJob(KIO::Job* job) {
--	job->setWindow(mParent->tqtopLevelWidget());
-+	job->setWindow(mParent->topLevelWidget());
- 	connect( job, TQT_SIGNAL( result(KIO::Job*) ),
- 		this, TQT_SLOT( slotResult(KIO::Job*) ) );
- }
-diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
-index 51445be..3910e48 100644
---- a/src/gvcore/filethumbnailview.cpp
-+++ b/src/gvcore/filethumbnailview.cpp
-@@ -93,7 +93,7 @@ public:
- 	
- 	void polish() {
- 		TQFrame::polish();
--		setMinimumWidth(tqlayout()->tqminimumSize().width());
-+		setMinimumWidth(tqlayout()->minimumSize().width());
- 		//setFixedHeight( mProgressBar->height() );
- 		setFixedHeight( mStop->height() );
- 	}
-@@ -142,7 +142,7 @@ struct FileThumbnailView::Private {
- 		mWaitThumbnail.fill(view->paletteBackgroundColor());
- 		TQPainter painter(&mWaitThumbnail);
- 		
--		painter.setPen(view->tqcolorGroup().button());
-+		painter.setPen(view->colorGroup().button());
- 		painter.drawRect(0,0,mThumbnailSize,mThumbnailSize);
- 		painter.drawPixmap(
- 			(mThumbnailSize-mWaitPixmap.width())/2,
-diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp
-index 65da494..cd607b7 100644
---- a/src/gvcore/filethumbnailviewitem.cpp
-+++ b/src/gvcore/filethumbnailviewitem.cpp
-@@ -271,16 +271,16 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
- 		textH+=(*it)->height();
- 	}
- 	
--	TQRect tqitemRect(x(), y(), view->gridX(), 0);
-+	TQRect itemRect(x(), y(), view->gridX(), 0);
- 	TQRect itemPixmapRect(PADDING, PADDING, thumbnailSize, thumbnailSize);
- 	TQRect itemTextRect(0, 0, textW, textH);
- 	if (isRight) {
--		tqitemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) );
-+		itemRect.setHeight( TQMAX(thumbnailSize + PADDING*2, textH) );
- 		itemTextRect.moveLeft(thumbnailSize + PADDING * 2 );
--		itemTextRect.moveTop((tqitemRect.height() - textH)/2);
-+		itemTextRect.moveTop((itemRect.height() - textH)/2);
- 	} else {
--		itemPixmapRect.moveLeft( (tqitemRect.width() - itemPixmapRect.width()) / 2 );
--		tqitemRect.setHeight(thumbnailSize + PADDING*3 + textH);
-+		itemPixmapRect.moveLeft( (itemRect.width() - itemPixmapRect.width()) / 2 );
-+		itemRect.setHeight(thumbnailSize + PADDING*3 + textH);
- 		itemTextRect.moveLeft(PADDING);
- 		itemTextRect.moveTop(thumbnailSize + PADDING * 2);
- 	}
-@@ -292,8 +292,8 @@ void FileThumbnailViewItem::calcRect(const TQString&) {
- 	if ( itemTextRect != textRect() ) {
- 		setTextRect( itemTextRect );
- 	}
--	if ( tqitemRect != rect() ) {
--		setItemRect( tqitemRect );
-+	if ( itemRect != rect() ) {
-+		setItemRect( itemRect );
- 	}
- }
- 
-diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h
-index b242355..d3a1063 100644
---- a/src/gvcore/filethumbnailviewitem.h
-+++ b/src/gvcore/filethumbnailviewitem.h
-@@ -52,7 +52,7 @@ public:
- 	void updateLines();
- 
- protected:
--	void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup);
-+	void paintItem(TQPainter* painter, const TQColorGroup& colorGroup);
- 	void calcRect( const TQString& text_=TQString() );
- 	void paintFocus(TQPainter*, const TQColorGroup&) {}
- 	bool acceptDrop(const TQMimeSource*) const;
-diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
-index bdacf01..bb57a07 100644
---- a/src/gvcore/fileviewcontroller.cpp
-+++ b/src/gvcore/fileviewcontroller.cpp
-@@ -191,7 +191,7 @@ public:
- 
- 	void initFilterBar() {
- 		mFilterBar=new FilterBar(that);
--		mFilterBar->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
-+		mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
- 		mFilterBar->hide();
- 
- 		TQIconSet resetIS=BarIcon("locationbar_erase");
-@@ -256,7 +256,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- : TQWidget(parent)
- , mMode(FILE_LIST)
- , mPrefetch( NULL )
--, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE)
-+, mChangeDirStatus(CHANGE_DIR_STATUS_NONE)
- , mBrowsing(false)
- , mSelecting(false)
- {
-@@ -338,7 +338,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
- 
- 	// Dir lister
- 	mDirLister=new DirLister;
--	mDirLister->setMainWindow(tqtopLevelWidget());
-+	mDirLister->setMainWindow(topLevelWidget());
- 	connect(mDirLister,TQT_SIGNAL(clear()),
- 		TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) );
- 
-@@ -575,13 +575,13 @@ void FileViewController::slotSelectNext() {
- }
- 
- void FileViewController::slotSelectPreviousDir() {
--	mChangeDirtqStatus = CHANGE_DIR_STATUS_PREV;
-+	mChangeDirStatus = CHANGE_DIR_STATUS_PREV;
- 	mDirLister->clearError();
- 	mDirLister->openURL(mDirURL.upURL());
- }
- 
- void FileViewController::slotSelectNextDir() {
--	mChangeDirtqStatus = CHANGE_DIR_STATUS_NEXT;
-+	mChangeDirStatus = CHANGE_DIR_STATUS_NEXT;
- 	mDirLister->clearError();
- 	mDirLister->openURL(mDirURL.upURL());
- }
-@@ -1102,12 +1102,12 @@ void FileViewController::delayedDirListerCompleted() {
- 		mFileThumbnailView->sort(mFileThumbnailView->sortDirection());
- 	}
- 
--	if (mChangeDirtqStatus != CHANGE_DIR_STATUS_NONE) {
-+	if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) {
- 		KFileItem *item;
- 		TQString fileName = mDirURL.filename();
- 		for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) {
- 			if (item->name() == fileName) {
--				if (mChangeDirtqStatus == CHANGE_DIR_STATUS_NEXT) {
-+				if (mChangeDirStatus == CHANGE_DIR_STATUS_NEXT) {
- 					do {
- 						item=currentFileView()->nextItem(item);
- 					} while (item && !Archive::fileItemIsDirOrArchive(item));
-@@ -1119,7 +1119,7 @@ void FileViewController::delayedDirListerCompleted() {
- 				break;
- 			};
- 		}
--		mChangeDirtqStatus = CHANGE_DIR_STATUS_NONE;
-+		mChangeDirStatus = CHANGE_DIR_STATUS_NONE;
- 		if (!item) {
- 			mDirLister->openURL(mDirURL);
- 		} else {
-diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
-index de0de53..8339659 100644
---- a/src/gvcore/fileviewcontroller.h
-+++ b/src/gvcore/fileviewcontroller.h
-@@ -227,7 +227,7 @@ private:
- 		CHANGE_DIR_STATUS_NONE,
- 		CHANGE_DIR_STATUS_PREV,
- 		CHANGE_DIR_STATUS_NEXT
--	} mChangeDirtqStatus;
-+	} mChangeDirStatus;
- 
- 	bool mBrowsing;
- 	bool mSelecting;
-diff --git a/src/gvcore/filterbar.ui b/src/gvcore/filterbar.ui
-index b407ce1..2c9f11c 100644
---- a/src/gvcore/filterbar.ui
-+++ b/src/gvcore/filterbar.ui
-@@ -64,7 +64,7 @@
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -125,7 +125,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -185,7 +185,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-@@ -210,7 +210,7 @@ equal to this date</string>
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>16</width>
-                     <height>16</height>
-diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
-index 311b98d..be2b517 100644
---- a/src/gvcore/fullscreenbar.cpp
-+++ b/src/gvcore/fullscreenbar.cpp
-@@ -83,8 +83,8 @@ FullScreenBar::FullScreenBar(TQWidget* parent)
- 	setIconSize(FULLSCREEN_ICON_SIZE);
- 	setMovingEnabled(false);
- 
--	TQColor bg=tqcolorGroup().highlight();
--	TQColor fg=tqcolorGroup().highlightedText();
-+	TQColor bg=colorGroup().highlight();
-+	TQColor fg=colorGroup().highlightedText();
- 	TQPalette pal(palette());
- 	pal.setColor(TQColorGroup::Background, bg);
- 	pal.setColor(TQColorGroup::Foreground, fg);
-diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
-index 06a9011..699d088 100644
---- a/src/gvcore/imageloader.cpp
-+++ b/src/gvcore/imageloader.cpp
-@@ -113,7 +113,7 @@ public:
- 	int getch() {
- 		if (mThread->testCancel()) {
- 			LOG("cancel detected");
--			setqStatus(IO_ReadError);
-+			seStatus(IO_ReadError);
- 			return -1;
- 		}
- 		return TQBuffer::getch();
-diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
-index a6c5b9f..f9da66f 100644
---- a/src/gvcore/imageview.cpp
-+++ b/src/gvcore/imageview.cpp
-@@ -1350,7 +1350,7 @@ double ImageView::computeZoomToWidth() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sw = verticalScrollBar()->tqsizeHint().width(); // tqgeometry is not valid before first show()
-+	int sw = verticalScrollBar()->sizeHint().width(); // tqgeometry is not valid before first show()
- 	int w = width();
- 	int dw = d->mDocument->width();
- 	switch( vScrollBarMode()) {
-@@ -1370,7 +1370,7 @@ double ImageView::computeZoomToHeight() const {
- 	if (d->mDocument->isNull()) {
- 		return 1.0;
- 	}
--	int sh = horizontalScrollBar()->tqsizeHint().height();
-+	int sh = horizontalScrollBar()->sizeHint().height();
- 	int h = height();
- 	int dh = d->mDocument->height();
- 	switch( vScrollBarMode()) {
-@@ -1425,11 +1425,11 @@ void ImageView::updateImageOffset() {
- 	int zpixHeight=int(d->mDocument->height() * d->mZoom);
- 
- 	if (zpixWidth>viewWidth && hScrollBarMode()!=AlwaysOff) {
--		// use tqsizeHint() - tqgeometry is not valid before first show()
--		viewHeight-=horizontalScrollBar()->tqsizeHint().height();
-+		// use sizeHint() - tqgeometry is not valid before first show()
-+		viewHeight-=horizontalScrollBar()->sizeHint().height();
- 	}
- 	if (zpixHeight>viewHeight && vScrollBarMode()!=AlwaysOff) {
--		viewWidth-=verticalScrollBar()->tqsizeHint().width();
-+		viewWidth-=verticalScrollBar()->sizeHint().width();
- 	}
- 
- 	d->mXOffset=TQMAX(0,(viewWidth-zpixWidth)/2);
-diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
-index 6d92eda..543877c 100644
---- a/src/gvcore/printdialogpagebase.ui
-+++ b/src/gvcore/printdialogpagebase.ui
-@@ -98,7 +98,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>101</width>
-                             <height>21</height>
-@@ -186,7 +186,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -214,7 +214,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>240</width>
-                                     <height>21</height>
-@@ -252,7 +252,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -351,7 +351,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>16</width>
-                                     <height>20</height>
-diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
-index 9fb146a..27ad0b9 100644
---- a/src/gvcore/qxcfi.cpp
-+++ b/src/gvcore/qxcfi.cpp
-@@ -486,7 +486,7 @@ void XCFImageFormat::readXCF ( TQImageIO* image_io )
-   }
- 
-   image_io->setImage( xcf_image.image );
--  image_io->setqStatus( 0 );
-+  image_io->seStatus( 0 );
- }
- 
- /*!
-diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui
-index 1dd6646..e9ef011 100644
---- a/src/gvcore/thumbnaildetailsdialogbase.ui
-+++ b/src/gvcore/thumbnaildetailsdialogbase.ui
-@@ -45,7 +45,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>21</width>
-                             <height>20</height>
-@@ -96,7 +96,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>21</height>
-diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp
-index cc2cabc..b56ba59 100644
---- a/src/gvcore/xpm.cpp
-+++ b/src/gvcore/xpm.cpp
-@@ -74,7 +74,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of
- 	    s = s.mid( i );
- 	if ( (i = s.findRev('\\')) >= 0 )
- 	    s = s.mid( i );
--	TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") );
-+	TQRegExp r( TQString::fromLatin1("[a-zA-Z][a-zA-Z0-9_]*") );
- 	int p = r.search( s );
- 	if ( p == -1 )
- 	    s.truncate( 0 );
-@@ -82,7 +82,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of
- 	    s = s.mid( p, r.matchedLength() );
-     }
-     if ( s.isEmpty() )
--	s = TQString::tqfromLatin1( "dummy" );
-+	s = TQString::fromLatin1( "dummy" );
-     return s;
- }
- 
-@@ -161,10 +161,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     int i, cpp, ncols, w, h, index = 0;
- 
-     if ( iio ) {
--	iio->setqStatus( 1 );
-+	iio->seStatus( 1 );
- 	d = iio ? iio->ioDevice() : 0;
- 	d->readLine( buf.data(), buf.size() );	// "/* XPM */"
--	TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") );
-+	TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") );
- 	if ( buf.find(r) == -1 )
- 	    return;					// bad magic
-     } else if ( !source ) {
-@@ -291,7 +291,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
-     }
-     if ( iio ) {
- 	iio->setImage( image );
--	iio->setqStatus( 0 );			// image ok
-+	iio->seStatus( 0 );			// image ok
-     }
- }
- 
-@@ -340,7 +340,7 @@ static const char* xpm_color_name( int cpp, int index )
- static void write_xpm_image( TQImageIO * iio )
- {
-     if ( iio )
--	iio->setqStatus( 1 );
-+	iio->seStatus( 1 );
-     else
- 	return;
- 
-@@ -424,7 +424,7 @@ static void write_xpm_image( TQImageIO * iio )
-     }
-     s << "};" << endl;
- 
--    iio->setqStatus( 0 );
-+    iio->seStatus( 0 );
- }
- 
- // TQt code end ---------------------------
-diff --git a/src/tsthread/tsthread.cpp b/src/tsthread/tsthread.cpp
-index 6363f2e..c845cce 100644
---- a/src/tsthread/tsthread.cpp
-+++ b/src/tsthread/tsthread.cpp
-@@ -175,7 +175,7 @@ void TSThread::customEvent( TQCustomEvent* ev )
-         }
-     bool deleted = false;
-     deleted_flag = &deleted; // this is like TQGuardedPtr for self, but faster
--    int signal_id = e->object->tqmetaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true );
-+    int signal_id = e->object->metaObject()->findSignal( normalizeSignalSlot( e->signal ).data() + 1, true );
-     if( signal_id >= 0 )
-         e->object->qt_emit( signal_id, e->args );
-     else
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.1.spec b/redhat/applications/gwenview/gwenview-3.5.13.1.spec
deleted file mode 100644
index 69d17dfc1..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.1.spec
+++ /dev/null
@@ -1,255 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	9%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-Patch11:	gwenview-3.5.13-fix_libmng_check.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch4 -p1
-%patch5 -p1
-%patch11 -p1 -b .libmng
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%if 0%{?rhel} == 5
-echo "%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/" >"%{kdecomp}.lang"
-%else
-%find_lang %{kdecomp} --with-kde --without-mo
-%endif
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-%{tde_tdedocdir}/HTML/en/gwenview/
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9
-- Initial release for TDE 3.5.13.1
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
-- Add support for Mageia 2 and Mandriva 2011
-- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Adds patches from GIT
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6
-- Fix HTML directory location
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
-- Adds missing files
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec
deleted file mode 100644
index 55105a6c9..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-# Default version for this component
-%define tde_pkg gwenview
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Gwenview is an image viewer for TDE.
-Version:		1.4.2
-Release:		%{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
-
-%changelog
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.spec b/redhat/applications/gwenview/gwenview-3.5.13.spec
deleted file mode 100644
index 6129af795..000000000
--- a/redhat/applications/gwenview/gwenview-3.5.13.spec
+++ /dev/null
@@ -1,269 +0,0 @@
-# Default version for this component
-%define kdecomp gwenview
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Gwenview is an image viewer for KDE.
-Version:	1.4.2
-Release:	8%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [gwenview] Rename old tq methods that no longer need a unique name [Commit #d0bdd0d7]
-Patch1:	gwenview-3.5.13-rename_old_tq_method.patch
-# [gwenview] Remove additional unneeded tq method conversions [Commit #eba1d381]
-Patch2:	gwenview-3.5.13-remove_additional_tq_conversions.patch
-# [gwenview] Rename obsolete tq methods to standard names [Commit #04fccf73]
-Patch3:	gwenview-3.5.13-rename_obsolete_tq_methods.patch
-# [gwenview] Rename a few stragglers [Commit #b4881a61]
-Patch4:	gwenview-3.5.13-rename_a_few_stragglers.patch
-# [gwenview] Fix FTBFS [Commit #1ca2f739]
-Patch5:	gwenview-3.5.13-fix_ftbfs.patch
-# [gwenview] Fix FTBFS in jpeg code [Commit #ace6f270]
-Patch6:	gwenview-3.5.13-fix_ftbfs_in_jpeg_code.patch
-# [gwenview] Fix linear alphabet string errors [Commit #9cb99cdb]
-Patch7:	gwenview-3.5.13-fix_alphabet_string_error.patch
-# [gwenview] Fix building with libpng 1.5. [Commit #303be455]
-Patch8:	gwenview-3.5.13-fix_building_libpng15.patch
-# [gwenview] Fix inadvertent tqt changes. Part of an extensive cleanup of various problems
-#   with kipi-plugins, digikam, and gwenview to resolve bug reports 241, 962, 963. [Commit #1eac443e]
-Patch9:	gwenview-3.5.13-fix_various_problems.patch
-# [gwenview] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch10:	gwenview-3.5.13-missing_ldflags.patch
-# [gwenview] Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-Patch11:	gwenview-3.5.13-fix_libmng_check.patch
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%else
-BuildRequires: exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1 -b .ldflags
-%patch11 -p1 -b .libmng
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%if 0%{?rhel} == 5
-echo "%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/" >"%{kdecomp}.lang"
-%else
-%find_lang %{kdecomp} --with-kde --without-mo
-%endif
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libkdeinit_gwenview.la
-%{tde_libdir}/libkdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-
-
-%Changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
-- Add support for Mageia 2 and Mandriva 2011
-- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Adds patches from GIT
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6
-- Fix HTML directory location
-
-* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5
-- Adds missing files
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec
deleted file mode 100644
index 12a9678a8..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec
+++ /dev/null
@@ -1,325 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-k3b-i18n
-Summary:	Locale files for K3B
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:   Applications/Archiving
-License: GPLv2+
-
-Source0: k3b-i18n-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:	trinity-k3b
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%package da
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Danish (da) translations for K3B [Trinity]
-%description da
-This package contains the Danish translations for K3B.
-
-%package de
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: German (de) translations for K3B [Trinity]
-%description de
-This package contains the German translations for K3B.
-
-%package el
-Group:   Applications/Archiving
-Requires: trinity-k3b >= %{version}
-Summary: Greek (el) translations for K3B [Trinity]
-%description el
-This package contains the greek translations for K3B.
-
-%package es
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Spanish (es) translations for K3B [Trinity]
-%description es
-This package contains the Spanish translations for K3B.
-
-%package et
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Estonian (et) translations for K3B [Trinity]
-%description et
-This package contains the Estonian translations for K3B.
-
-%package fr
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: French (fr) translations for K3B [Trinity]
-%description fr
-This package contains the French translations for K3B.
-
-%package it
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Italian (it) translations for K3B [Trinity]
-%description it
-This package contains the Italian translations for K3B.
-
-%package nl
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Dutch (nl) translations for K3B [Trinity]
-%description nl
-This package contains the Dutch translations for K3B.
-
-%package pl
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Polish (pl) translations for K3B [Trinity]
-%description pl
-This package contains the Polish translations for K3B.
-
-%package pt
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Portuguese (pt) translations for K3B [Trinity]
-%description pt
-This package contains the Portuguese translations for K3B.
-
-%package ptbr
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
-%description ptbr
-This package contains the Brazilian Portuguese translations for K3B.
-
-%package ru
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Russian (ru) translations for K3B [Trinity]
-%description ru
-This package contains the Russian translations for K3B.
-
-%package sv
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Swedish (sv) translations for K3B [Trinity]
-%description sv
-This package contains the Swedish translations for K3B.
-
-%package uk
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Ukrainian (uk) translations for K3B [Trinity]
-%description uk
-This package contains the Ukrainian translations for K3B.
-
-
-%prep
-%setup -q -n k3b-i18n-3.5.13.1
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__rm -rf %{buildroot}%{tde_datadir}/locale/af
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ar
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bg
-%__rm -rf %{buildroot}%{tde_datadir}/locale/br
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ca
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cy
-%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
-%__rm -rf %{buildroot}%{tde_datadir}/locale/eu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ga
-%__rm -rf %{buildroot}%{tde_datadir}/locale/gl
-%__rm -rf %{buildroot}%{tde_datadir}/locale/he
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/is
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ja
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ka
-%__rm -rf %{buildroot}%{tde_datadir}/locale/km
-%__rm -rf %{buildroot}%{tde_datadir}/locale/lt
-%__rm -rf %{buildroot}%{tde_datadir}/locale/mk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ms
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nb
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nds
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ne
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/pa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/rw
-%__rm -rf %{buildroot}%{tde_datadir}/locale/se
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ta
-%__rm -rf %{buildroot}%{tde_datadir}/locale/tr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files da
-%defattr(-,root,root,-)
-%lang(da) %{tde_tdedocdir}/HTML/da/k3b
-%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo
-
-%files de
-%defattr(-,root,root,-)
-%lang(de) %{tde_tdedocdir}/HTML/de/k3b
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-
-%files el
-%defattr(-,root,root,-)
-#%lang(el) %{tde_tdedocdir}/HTML/el/k3b
-%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo
-
-%files es
-%defattr(-,root,root,-)
-%lang(es) %{tde_tdedocdir}/HTML/es/k3b
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
-
-%files et
-%defattr(-,root,root,-)
-%lang(et) %{tde_tdedocdir}/HTML/et/k3b
-%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo
-
-%files fr
-%defattr(-,root,root,-)
-%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
-
-%files it
-%defattr(-,root,root,-)
-%lang(it) %{tde_tdedocdir}/HTML/it/k3b
-%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo
-
-%files nl
-%defattr(-,root,root,-)
-%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b
-%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
-
-%files pl
-%defattr(-,root,root,-)
-%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
-
-%files pt
-%defattr(-,root,root,-)
-%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b
-%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
-
-%files ptbr
-%defattr(-,root,root,-)
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b
-%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
-
-%files ru
-%defattr(-,root,root,-)
-%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b
-%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-%files sv
-%defattr(-,root,root,-)
-%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
-
-%files uk
-%defattr(-,root,root,-)
-%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b
-%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial release for TDE 3.5.13.1
-
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
deleted file mode 100644
index 13ce2e60f..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,405 +0,0 @@
-# Default version for this component
-%define tde_pkg k3n-i18n
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-k3b-i18n
-Summary:		Internationalization support for TDE [Trinity]
-Version:		1.0.5
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:			Applications/Archiving
-License:		GPLv2+
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:		trinity-k3b
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-##########
-
-%package Danish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Danish (da) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-da < %{version}-%{release}
-Provides:		trinity-k3b-i18n-da = %{version}-%{release}
-
-%description Danish
-This package contains the Danish translations for K3B.
-
-%files Danish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/da/k3b
-%{tde_datadir}/locale/da/LC_MESSAGES/*.mo
-
-##########
-
-%package German
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		German (de) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-de < %{version}-%{release}
-Provides:		trinity-k3b-i18n-de = %{version}-%{release}
-
-%description German
-This package contains the German translations for K3B.
-
-%files German
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/de/k3b
-%{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-
-##########
-
-%package Greek
-Group:			Applications/Archiving
-Requires:		trinity-k3b >= %{version}
-Summary:		Greek (el) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-el < %{version}-%{release}
-Provides:		trinity-k3b-i18n-el = %{version}-%{release}
-
-%description Greek
-This package contains the greek translations for K3B.
-
-%files Greek
-%defattr(-,root,root,-)
-#%{tde_tdedocdir}/HTML/el/k3b
-%{tde_datadir}/locale/el/LC_MESSAGES/*.mo
-
-##########
-
-%package Spanish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Spanish (es) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-es < %{version}-%{release}
-Provides:		trinity-k3b-i18n-es = %{version}-%{release}
-
-%description Spanish
-This package contains the Spanish translations for K3B.
-
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/es/k3b
-%{tde_datadir}/locale/es/LC_MESSAGES/*.mo
-
-##########
-
-%package Estonian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Estonian (et) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-et < %{version}-%{release}
-Provides:		trinity-k3b-i18n-et = %{version}-%{release}
-
-%description Estonian
-This package contains the Estonian translations for K3B.
-
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/et/k3b
-%{tde_datadir}/locale/et/LC_MESSAGES/*.mo
-
-##########
-
-%package French
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		French (fr) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-fr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-fr = %{version}-%{release}
-
-%description French
-This package contains the French translations for K3B.
-
-%files French
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/fr/k3b
-%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
-
-##########
-
-%package Italian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Italian (it) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-it < %{version}-%{release}
-Provides:		trinity-k3b-i18n-it = %{version}-%{release}
-
-%description Italian
-This package contains the Italian translations for K3B.
-
-%files Italian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/it/k3b
-%{tde_datadir}/locale/it/LC_MESSAGES/*.mo
-
-##########
-
-%package Dutch
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Dutch (nl) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-nl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-nl = %{version}-%{release}
-
-%description Dutch
-This package contains the Dutch translations for K3B.
-
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/nl/k3b
-%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
-
-##########
-
-%package Polish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Polish (pl) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pl < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pl = %{version}-%{release}
-
-%description Polish
-This package contains the Polish translations for K3B.
-
-%files Polish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pl/k3b
-%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
-
-##########
-
-%package Portuguese
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Portuguese (pt) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pt < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt = %{version}-%{release}
-
-%description Portuguese
-This package contains the Portuguese translations for K3B.
-
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt/k3b
-%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
-
-##########
-
-%package Brazil
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pt_BR < %{version}-%{release}
-Provides:		trinity-k3b-i18n-pt_BR = %{version}-%{release}
-Obsoletes:		trinity-k3b-i18n-ptbr < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ptbr = %{version}-%{release}
-
-%description Brazil
-This package contains the Brazilian Portuguese translations for K3B.
-
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt_BR/k3b
-%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
-
-##########
-
-%package Russian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Russian (ru) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-ru < %{version}-%{release}
-Provides:		trinity-k3b-i18n-ru = %{version}-%{release}
-
-%description Russian
-This package contains the Russian translations for K3B.
-
-%files Russian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/ru/k3b
-%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-##########
-
-%package Swedish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Swedish (sv) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-sv < %{version}-%{release}
-Provides:		trinity-k3b-i18n-sv = %{version}-%{release}
-
-%description Swedish
-This package contains the Swedish translations for K3B.
-
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/sv/k3b
-%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
-
-##########
-
-%package Ukrainian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Ukrainian (uk) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-uk < %{version}-%{release}
-Provides:		trinity-k3b-i18n-uk = %{version}-%{release}
-
-%description Ukrainian
-This package contains the Ukrainian translations for K3B.
-
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/k3b
-%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-./configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__rm -rf %{buildroot}%{tde_datadir}/locale/af
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ar
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bg
-%__rm -rf %{buildroot}%{tde_datadir}/locale/br
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ca
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cy
-%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
-%__rm -rf %{buildroot}%{tde_datadir}/locale/eu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ga
-%__rm -rf %{buildroot}%{tde_datadir}/locale/gl
-%__rm -rf %{buildroot}%{tde_datadir}/locale/he
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/is
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ja
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ka
-%__rm -rf %{buildroot}%{tde_datadir}/locale/km
-%__rm -rf %{buildroot}%{tde_datadir}/locale/lt
-%__rm -rf %{buildroot}%{tde_datadir}/locale/mk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ms
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nb
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nds
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ne
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/pa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/rw
-%__rm -rf %{buildroot}%{tde_datadir}/locale/se
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ta
-%__rm -rf %{buildroot}%{tde_datadir}/locale/tr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec
deleted file mode 100644
index 1b10a6802..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec
+++ /dev/null
@@ -1,308 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_datadir}/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-
-Name:    trinity-k3b-i18n
-Summary: Locale files for K3B
-Version: 1.0.5
-Release: 1%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:   Applications/Archiving
-License: GPLv2+
-
-Source0: k3b-i18n-1.0.5.tar.bz2
-
-# [kde-i18n] Fix automake detection
-Patch1:		k3b-i18n-trinity.patch
-
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:	trinity-k3b
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%package da
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Danish (da) translations for K3B [Trinity]
-%description da
-This package contains the Danish translations for K3B.
-
-%package de
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: German (de) translations for K3B [Trinity]
-%description de
-This package contains the German translations for K3B.
-
-%package el
-Group:   Applications/Archiving
-Requires: trinity-k3b >= %{version}
-Summary: Greek (el) translations for K3B [Trinity]
-%description el
-This package contains the greek translations for K3B.
-
-%package es
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Spanish (es) translations for K3B [Trinity]
-%description es
-This package contains the Spanish translations for K3B.
-
-%package et
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Estonian (et) translations for K3B [Trinity]
-%description et
-This package contains the Estonian translations for K3B.
-
-%package fr
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: French (fr) translations for K3B [Trinity]
-%description fr
-This package contains the French translations for K3B.
-
-%package it
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Italian (it) translations for K3B [Trinity]
-%description it
-This package contains the Italian translations for K3B.
-
-%package nl
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Dutch (nl) translations for K3B [Trinity]
-%description nl
-This package contains the Dutch translations for K3B.
-
-%package pl
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Polish (pl) translations for K3B [Trinity]
-%description pl
-This package contains the Polish translations for K3B.
-
-%package pt
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Portuguese (pt) translations for K3B [Trinity]
-%description pt
-This package contains the Portuguese translations for K3B.
-
-%package ptbr
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
-%description ptbr
-This package contains the Brazilian Portuguese translations for K3B.
-
-%package ru
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Russian (ru) translations for K3B [Trinity]
-%description ru
-This package contains the Russian translations for K3B.
-
-%package sv
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Swedish (sv) translations for K3B [Trinity]
-%description sv
-This package contains the Swedish translations for K3B.
-
-%package uk
-Group:   Applications/Archiving
-Requires: trinity-k3b
-Summary: Ukrainian (uk) translations for K3B [Trinity]
-%description uk
-This package contains the Ukrainian translations for K3B.
-
-
-%prep
-%setup -q -n k3b-i18n-%{version}
-
-# set in k3brc too 
-%patch1 -p1 -b .automake
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/opt/kde3|%{_prefix}|g" \
-  -e "s|kde3/plugins|trinity/plugins|g" \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --target=%{_host}
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files da
-%defattr(-,root,root,-)
-%lang(da) %{tde_docdir}/HTML/da/k3b
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*.mo
-
-%files de
-%defattr(-,root,root,-)
-%lang(de) %{tde_docdir}/HTML/de/k3b
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*.mo
-
-%files el
-%defattr(-,root,root,-)
-#%lang(el) %{tde_docdir}/HTML/el/k3b
-%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*.mo
-
-%files es
-%defattr(-,root,root,-)
-%lang(es) %{tde_docdir}/HTML/es/k3b
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*.mo
-
-%files et
-%defattr(-,root,root,-)
-%lang(et) %{tde_docdir}/HTML/et/k3b
-%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*.mo
-
-%files fr
-%defattr(-,root,root,-)
-%lang(fr) %{tde_docdir}/HTML/fr/k3b
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*.mo
-
-%files it
-%defattr(-,root,root,-)
-%lang(it) %{tde_docdir}/HTML/it/k3b
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*.mo
-
-%files nl
-%defattr(-,root,root,-)
-%lang(nl) %{tde_docdir}/HTML/nl/k3b
-%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*.mo
-
-%files pl
-%defattr(-,root,root,-)
-%lang(pl) %{tde_docdir}/HTML/pl/k3b
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*.mo
-
-%files pt
-%defattr(-,root,root,-)
-%lang(pt) %{tde_docdir}/HTML/pt/k3b
-%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*.mo
-
-%files ptbr
-%defattr(-,root,root,-)
-%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/k3b
-%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
-
-%files ru
-%defattr(-,root,root,-)
-%lang(ru) %{tde_docdir}/HTML/ru/k3b
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-%files sv
-%defattr(-,root,root,-)
-%lang(sv) %{tde_docdir}/HTML/sv/k3b
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*.mo
-
-%files uk
-%defattr(-,root,root,-)
-%lang(uk) %{tde_docdir}/HTML/uk/k3b
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*.mo
-
-%exclude %{_datadir}/locale/af
-%exclude %{_datadir}/locale/ar
-%exclude %{_datadir}/locale/bg
-%exclude %{_datadir}/locale/br
-%exclude %{_datadir}/locale/bs
-%exclude %{_datadir}/locale/ca
-%exclude %{_datadir}/locale/cs
-%exclude %{_datadir}/locale/cy
-%exclude %{_datadir}/locale/en_GB
-%exclude %{_datadir}/locale/eu
-%exclude %{_datadir}/locale/fa
-%exclude %{_datadir}/locale/fi
-%exclude %{_datadir}/locale/ga
-%exclude %{_datadir}/locale/gl
-%exclude %{_datadir}/locale/he
-%exclude %{_datadir}/locale/hi
-%exclude %{_datadir}/locale/hu
-%exclude %{_datadir}/locale/is
-%exclude %{_datadir}/locale/ja
-%exclude %{_datadir}/locale/ka
-%exclude %{_datadir}/locale/km
-%exclude %{_datadir}/locale/lt
-%exclude %{_datadir}/locale/mk
-%exclude %{_datadir}/locale/ms
-%exclude %{_datadir}/locale/nb
-%exclude %{_datadir}/locale/nds
-%exclude %{_datadir}/locale/ne
-%exclude %{_datadir}/locale/nn
-%exclude %{_datadir}/locale/pa
-%exclude %{_datadir}/locale/rw
-%exclude %{_datadir}/locale/se
-%exclude %{_datadir}/locale/sk
-%exclude %{_datadir}/locale/sr
-%exclude %{_datadir}/locale/sr@Latn
-%exclude %{_datadir}/locale/ta
-%exclude %{_datadir}/locale/tr
-%exclude %{_datadir}/locale/uz
-%exclude %{_datadir}/locale/uz@cyrillic
-%exclude %{_datadir}/locale/zh_CN
-%exclude %{_datadir}/locale/zh_TW
-
-
-%changelog
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-trinity.patch b/redhat/applications/k3b-i18n/k3b-i18n-trinity.patch
deleted file mode 100644
index dccbfa1ae..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n-trinity.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- k3b-i18n-1.0.5/admin/cvs.sh.ORI	2012-05-09 19:45:56.106421990 +0200
-+++ k3b-i18n-1.0.5/admin/cvs.sh	2012-05-09 19:46:16.264708192 +0200
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
diff --git a/redhat/applications/k3b/k3b-1.0.3-umount.patch b/redhat/applications/k3b/k3b-1.0.3-umount.patch
deleted file mode 100644
index 394aff152..000000000
--- a/redhat/applications/k3b/k3b-1.0.3-umount.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount	2007-07-27 21:26:30.000000000 +0200
-+++ k3b-1.0.3/libk3b/core/k3bglobals.cpp	2007-07-27 21:31:26.000000000 +0200
-@@ -569,7 +569,24 @@
-       return true;
-   }
- 
--  // now try pmount
-+#ifdef HAVE_HAL
-+    if (!K3bDevice::HalConnection::instance()->unmount( dev ))
-+      return true;
-+#endif
-+
-+  QString gumountBin = K3b::findExe( "gnome-umount" );
-+  if( !gumountBin.isEmpty() ) {
-+    KProcess p;
-+    p << gumountBin;
-+    p << "-u";
-+    p << "-d";
-+    p << dev->blockDeviceName();
-+    p.start( KProcess::Block );
-+    if( !p.exitStatus() )
-+      return true;
-+  }
-+  
-+// now try pmount
-   QString pumountBin = K3b::findExe( "pumount" );
-   if( !pumountBin.isEmpty() ) {
-     KProcess p;
-@@ -577,15 +592,11 @@
-     p << "-l"; // lazy unmount
-     p << dev->blockDeviceName();
-     p.start( KProcess::Block );
--    return !p.exitStatus();
--  }
--  else {
--#ifdef HAVE_HAL
--    return !K3bDevice::HalConnection::instance()->unmount( dev );
--#else
--    return false;
--#endif
-+    if( !p.exitStatus() )
-+      return true;
-   }
-+
-+  return false;
- }
- 
- 
diff --git a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch b/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
deleted file mode 100644
index 4ee6105a0..000000000
--- a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
---- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize	2007-11-02 10:55:39.000000000 +0100
-+++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp	2008-04-22 14:15:06.000000000 +0200
-@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
-   : m_eject(true),
-     m_burnfree(true),
-     m_overburn(false),
--    m_useManualBufferSize(false),
-+    m_useManualBufferSize(true),
-     m_bufferSize(4),
-     m_force(false)
- {
-@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
-   m_eject = !c->readBoolEntry( "No cd eject", false );
-   m_burnfree = c->readBoolEntry( "burnfree", true );
-   m_overburn = c->readBoolEntry( "Allow overburning", false );
--  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
-+  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
-   m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
-   m_force = c->readBoolEntry( "Force unsafe operations", false );
- 
diff --git a/redhat/applications/k3b/k3b-1.0.5-hidden.patch b/redhat/applications/k3b/k3b-1.0.5-hidden.patch
deleted file mode 100644
index f27f0b391..000000000
--- a/redhat/applications/k3b/k3b-1.0.5-hidden.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
---- k3b-1.0.5/src/Makefile.in.hidden	2008-05-27 03:34:44.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.in	2008-08-27 14:18:54.000000000 -0500
-@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
- 	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
- 
- SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
--xdg_apps_DATA = k3b.desktop
--silent_DATA = k3b-iso.desktop k3b-cue.desktop
--silentdir = $(kde_appsdir)/.hidden/
-+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
-+#silent_DATA = k3b-iso.desktop k3b-cue.desktop
-+#silentdir = $(kde_appsdir)/.hidden/
- 
- ###################
- # this 10 paths are KDE specific. Use them:
-diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
---- k3b-1.0.5/src/Makefile.am.hidden	2008-05-27 03:24:04.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.am	2008-08-27 14:13:36.000000000 -0500
-@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
- 
- SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
- 
--xdg_apps_DATA = k3b.desktop
--
--silent_DATA = k3b-iso.desktop k3b-cue.desktop
--silentdir = $(kde_appsdir)/.hidden/
-+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
- 
- ###################
- # this 10 paths are KDE specific. Use them:
diff --git a/redhat/applications/k3b/k3b-3.5.12.spec b/redhat/applications/k3b/k3b-3.5.12.spec
deleted file mode 100644
index 0d17f7958..000000000
--- a/redhat/applications/k3b/k3b-3.5.12.spec
+++ /dev/null
@@ -1,282 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 7
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:    trinity-k3b
-Summary: CD/DVD burning application
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if "%{?_prefix}" == "/usr"
-Obsoletes: k3b
-%endif
-
-Group:   Applications/Archiving
-License: GPLv2+
-
-Source0: k3b-%{version}.tar.gz
-Source1: k3b-i18n-1.0.5.tar.bz2
-Source2: k3brc
-
-# Legacy RedHat / Fedora patches
-Patch2: k3b-1.0.3-umount.patch
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
-# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30 
-Patch102: reload-for-verification.diff
-# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
-# upstreamed 2008-08-27
-Patch105: k3b-1.0.5-hidden.patch
-# RHEL6: Fix K3B icon
-Patch106: trinity-k3b-icons.patch
-
-
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-BuildRequires: dbus-qt-devel hal-devel
-BuildRequires: flac-devel
-BuildRequires: gettext
-BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
-BuildRequires: libmpcdec-devel
-%else
-BuildRequires: musepack-tools-devel
-%endif
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-
-Obsoletes: k3b-extras < 0:1.0-1
-Provides:  k3b-extras = %{version}-%{release} 
-
-Obsoletes: %{name}-i18n
-Provides: %{name}-i18n
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildArch: noarch
-%endif
-%description common
-%{summary}.
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-%description devel
-%{summary}.
-
-
-%prep
-%setup -q -a 1 -n applications/k3b
-
-%patch2 -p1 -b .umount
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch102 -p0 -b .kde#156684
-%patch106 -p1 -b .desktopfile
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%patch105 -p1 -b .hidden
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-CFLAGS="%optflags -fno-strict-aliasing" \
-CXXFLAGS="%optflags -fno-strict-aliasing" \
-%configure \
-  --includedir=%{_includedir}/k3b \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  --without-ffmpeg --without-lame --without-libmad \
-  --with-musepack \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-# Build for i18n tarball
-pushd k3b-i18n-1.0.5
-%configure
-%__make %{?_smp_mflags}
-popd
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-%__rm -fr %{buildroot}%{_datadir}/locale/nds
-
-%find_lang k3b --with-kde
-%find_lang k3bsetup 
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
-
-
-%check
-export PATH="%{_bindir}:${PATH}"
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-%post common
-touch --no-create %{_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{_bindir}/k3b
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/*/k3b/*
-
-%files common -f all.lang
-%defattr(-,root,root,-)
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/k3b/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{_datadir}/config/k3brc
-%{_datadir}/mimelnk/application/x-k3b.desktop
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/services/kfile_k3b.desktop
-%{_datadir}/services/videodvd.protocol
-%{_datadir}/sounds/k3b_*.wav
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/libk3b.so.3*
-%{_libdir}/libk3bdevice.so.5*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/libk3b.so
-%{_libdir}/libk3bdevice.so
-
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add fix for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Correct macro to install under "/opt", if desired
-
-* Thu Apr 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Fix config file '/usr/share/config/k3brc'
-
-* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add i18n translations
-- Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0')
-- Renamed 'patch0' to 'patch106'
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version built for RHEL 6.0
-- Add 'patch0' : invalid syntax in 'k3b.desktop'
-
diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
deleted file mode 100644
index 3de442b61..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- k3b/src/projects/k3baudioeditorwidget.cpp
-+++ k3b/src/projects/k3baudioeditorwidget.cpp	2012-04-18 16:48:00.794902506 -0500
-@@ -663,15 +663,16 @@
- {
-   m_draggedRange = 0;
-   m_draggedMarker = 0;
--
-   bool end;
--  if( Range* r = findRangeEdge( e->pos(), &end ) ) {
-+  Range* r = findRangeEdge( e->pos(), &end );
-+
-+  if (r) {
-     m_draggedRange = r;
-     m_draggingRangeEnd = end;
-     setSelectedRange( r );
-   }
-   else {
--    Range* r = findRange( e->pos() );
-+    r = findRange( e->pos() );
-     d->movedRange = r;
-     d->lastMovePosition = posToMsf( e->pos().x() );
-     setSelectedRange( r );
diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch b/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch
deleted file mode 100644
index fcd293c01..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-fix_dbus_tqt_detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- k3b/applications/k3b/libk3bdevice/configure.in.in.ORI	2012-08-04 14:47:03.081813892 +0200
-+++ k3b/applications/k3b/libk3bdevice/configure.in.in	2012-08-04 14:47:25.421612485 +0200
-@@ -165,7 +165,7 @@
-   dbusqt_lib=NOTFOUND
-   dbusqt=NOTFOUND
- 
--  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
-   AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
- 
-   if test -r $dbusqt_incdir/dbus/connection.h ; then
---- k3b/libk3bdevice/configure.in.in.ORI	2012-08-04 14:57:19.624255359 +0200
-+++ k3b/libk3bdevice/configure.in.in	2012-08-04 14:57:33.719128285 +0200
-@@ -165,7 +165,7 @@
-   dbusqt_lib=NOTFOUND
-   dbusqt=NOTFOUND
- 
--  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
-   AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
- 
-   if test -r $dbusqt_incdir/dbus/connection.h ; then
diff --git a/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch b/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 1ae2079e9..000000000
--- a/redhat/applications/k3b/k3b-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- k3b/libk3bdevice/Makefile.am.ORI	2012-08-04 14:09:53.794930123 +0200
-+++ k3b/libk3bdevice/Makefile.am	2012-08-04 14:10:08.246593402 +0200
-@@ -6,7 +6,7 @@
- 
- lib_LTLIBRARIES = libk3bdevice.la
- 
--libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS)
-+libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_KDECORE)
- 
- # lib version 5 for K3b 1.0
- libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined
---- k3b/libk3b/Makefile.am.ORI	2012-08-04 14:13:26.067400663 +0200
-+++ k3b/libk3b/Makefile.am	2012-08-04 14:13:34.150243648 +0200
-@@ -16,7 +16,7 @@
- 	plugin/libk3bplugin.la \
- 	tools/libk3btools.la \
- 	jobs/libjobs.la \
--	$(VIDEODVDLIB) \
-+	$(VIDEODVDLIB) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIBDL) -lkdefx -lDCOP \
- 	../libk3bdevice/libk3bdevice.la
- 
- libk3b_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
---- k3b/plugins/decoder/wave/Makefile.am.ORI	2012-08-04 15:26:55.434435396 -0400
-+++ k3b/plugins/decoder/wave/Makefile.am	2012-08-04 15:27:06.802685139 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
- 
--libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la
-+libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la
- libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/ogg/Makefile.am.ORI	2012-08-04 15:33:41.805310213 -0400
-+++ k3b/plugins/decoder/ogg/Makefile.am	2012-08-04 15:34:09.767685132 -0400
-@@ -5,6 +5,6 @@
- libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
- 
--libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile 
-+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
- libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/flac/Makefile.am.ORI	2012-08-04 15:39:28.418435409 -0400
-+++ k3b/plugins/decoder/flac/Makefile.am	2012-08-04 15:39:41.490685093 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
- 
--libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++ -lFLAC $(taglib_libs) 
-+libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs)
- libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/libsndfile/Makefile.am.ORI	2012-08-04 15:43:24.035435310 -0400
-+++ k3b/plugins/decoder/libsndfile/Makefile.am	2012-08-04 15:43:33.579684947 -0400
-@@ -4,7 +4,7 @@
- 
- libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
- 
--libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lsndfile
-+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lsndfile
- libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/decoder/musepack/Makefile.am.ORI	2012-08-04 15:46:29.503435327 -0400
-+++ k3b/plugins/decoder/musepack/Makefile.am	2012-08-04 15:46:37.662685065 -0400
-@@ -7,7 +7,7 @@
- 
- libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
- 
--libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS)
-+libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
- libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/sox/Makefile.am.ORI	2012-08-04 15:48:44.045310191 -0400
-+++ k3b/plugins/encoder/sox/Makefile.am	2012-08-04 15:48:53.509685113 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp
- 
--libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT)
- libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/external/Makefile.am.ORI	2012-08-04 15:51:06.900310165 -0400
-+++ k3b/plugins/encoder/external/Makefile.am	2012-08-04 15:51:16.084435154 -0400
-@@ -6,7 +6,7 @@
- 	base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
- 	k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
- 
--libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
- libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/encoder/ogg/Makefile.am.ORI	2012-08-04 15:53:42.509310180 -0400
-+++ k3b/plugins/encoder/ogg/Makefile.am	2012-08-04 15:53:52.493684861 -0400
-@@ -4,7 +4,7 @@
- 
- libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp
- 
--libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc
-+libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_KDEUI)
- libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/audiooutput/arts/Makefile.am.ORI	2012-08-04 15:56:16.309435344 -0400
-+++ k3b/plugins/audiooutput/arts/Makefile.am	2012-08-04 15:56:26.541685090 -0400
-@@ -4,7 +4,7 @@
- 
- libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp
- 
--libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc
-+libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_KDECORE) $(LIB_QT)
- libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b/plugins/audiooutput/alsa/Makefile.am.ORI	2012-08-04 15:58:27.539435332 -0400
-+++ k3b/plugins/audiooutput/alsa/Makefile.am	2012-08-04 15:58:42.595685074 -0400
-@@ -5,7 +5,7 @@
- libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp
- 
- libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS)
--libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS)
-+libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
- libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
- 
- pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/redhat/applications/k3b/k3b-3.5.13.1.spec b/redhat/applications/k3b/k3b-3.5.13.1.spec
deleted file mode 100644
index 5cb371b5f..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.1.spec
+++ /dev/null
@@ -1,409 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-k3b
-Summary:	CD/DVD burning application
-Version:	3.5.13.1
-Release:	2%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:		Applications/Archiving
-License:	GPLv2+
-
-Source0:	k3b-%{version}.tar.gz
-Source2:	k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:		k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106:	trinity-k3b-icons.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	alsa-lib-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	hal-devel
-BuildRequires:	gettext
-BuildRequires:	libdvdread-devel
-BuildRequires:	libmpcdec-devel
-BuildRequires:	libmusicbrainz-devel
-BuildRequires:	libsamplerate-devel
-BuildRequires:	libsndfile-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	taglib-devel
-BuildRequires:	zlib-devel
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%else
-BuildRequires:	flac-devel
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_mad 1
-BuildRequires:		%{_lib}mad-devel
-%endif
-
-# LAME support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_lame 1
-BuildRequires:		%{_lib}lame-devel
-%endif
-
-# FFMPEG support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define with_ffmpeg 1
-BuildRequires:		%{_lib}ffmpeg-devel
-%endif
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_mad}
-%package plugin-mad
-Summary: The MAD plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-mad
-%{summary}.
-
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
-and the MPEG-2  extension to Lower Sampling Frequencies, as well as the
-so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-and Layer III a.k.a. MP3) are fully implemented.
-
-%files plugin-mad
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bmaddecoder.la
-%{tde_tdelibdir}/libk3bmaddecoder.so
-%endif
-
-##########
-
-%if 0%{?with_lame}
-%package plugin-lame
-Summary: The LAME plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-lame
-%{summary}.
-
-Personal and commercial use of compiled versions of LAME (or any other mp3
-encoder) requires a patent license in some countries.
-
-This package is in tainted, as MP3 encoding is covered by software patents.
-
-%files plugin-lame
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3blameencoder.la
-%{tde_tdelibdir}/libk3blameencoder.so
-%endif
-
-##########
-
-%if 0%{?with_ffmpeg}
-%package plugin-ffmpeg
-Summary: The FFMPEG plugin for K3B
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description plugin-ffmpeg
-%{summary}.
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
-and a generic audio and video file converter.
-
-%files plugin-ffmpeg
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bffmpegdecoder.la
-%{tde_tdelibdir}/libk3bffmpegdecoder.so
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -a 0 -n k3b-3.5.13.1
-
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \
-  %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \
-  %{?with_mad:--with-libmad} %{?!with_mad:--without-libmad} \
-  --with-musepack \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sun Jan 06 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
-- Enables FFMPEG support
-- Enables LAME support
-- Enables MAD support
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
-- Remove requirement for resmgr
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add support for Mageia 2 and Mandriva 2011
-- Fix DBUS-TQT detection that prevented HAL support
-- Adds requirement for resmgr
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Removes i18 files (built separately)
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
deleted file mode 100644
index bd3bfdebf..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ORI	2013-09-07 12:10:15.846286823 +0200
-+++ trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-09-07 12:11:08.020207223 +0200
-@@ -49,7 +49,7 @@
-   K3b::Msf length;
- 
-   // for decoding
--  char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-+  char outputBuffer[192000];
-   char* outputBufferPos;
-   int outputBufferSize;
-   AVPacket packet;
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
deleted file mode 100644
index 851cf978e..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ /dev/null
@@ -1,468 +0,0 @@
-# Default version for this component
-%define tde_pkg k3b
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		CD/DVD burning application
-Epoch:			1
-Version:		1.0.5
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:			Applications/Archiving
-License:		GPLv2+
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source2:		k3brc
-
-# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete
-Patch1:			k3b-3.5.13.2-fix_ffmpeg_support.patch
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:			k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106:	trinity-k3b-icons.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	alsa-lib-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	hal-devel
-BuildRequires:	gettext
-BuildRequires:	libmpcdec-devel
-BuildRequires:	libmusicbrainz-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	taglib-devel
-BuildRequires:	zlib-devel
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?suse_version} >= 1310
-Requires:		wodim
-REquires:		genisoimage
-%else
-Requires:		cdrecord
-REquires:		mkisofs
-%endif
-Requires:		dvd+rw-tools
-
-# CDRDAO support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5
-Requires:		cdrdao
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt >= 0.22-12.EL.9p1
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-Requires:		trinity-dbus-tqt >= 1:0.63
-%endif
-
-# SNDFILE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_sndfile 1
-BuildRequires:	libsndfile-devel
-%endif
-
-# SAMPLERATE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_samplerate 1
-BuildRequires:	libsamplerate-devel
-%endif
-
-# DVDREAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_dvdread 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}dvdread-devel
-%else
-BuildRequires:	libdvdread-devel
-%endif
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libflac-devel
-BuildRequires:	libflac++-devel
-%else
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%endif
-%else
-BuildRequires:	flac-devel
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	libmad-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	liblame-devel
-%else
-BuildRequires:	%{_lib}lame-devel
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libmp3lame-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	lame-devel
-%endif
-%endif
-
-# FFMPEG support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_ffmpeg 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ffmpeg-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	ffmpeg-devel
-%endif
-%endif
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%if 0%{?with_sndfile}
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%endif
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:		Common files of %{name}
-Group:			Applications/Archiving
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary:		Runtime libraries for %{name}
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary:		Files for the development of applications which will use %{name} 
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_libmad}
-%package plugin-mad
-Summary:		The MAD plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-mad
-%{summary}.
-
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
-and the MPEG-2  extension to Lower Sampling Frequencies, as well as the
-so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-and Layer III a.k.a. MP3) are fully implemented.
-
-%files plugin-mad
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bmaddecoder.la
-%{tde_tdelibdir}/libk3bmaddecoder.so
-%endif
-
-##########
-
-%if 0%{?with_lame}
-%package plugin-lame
-Summary:		The LAME plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-lame
-%{summary}.
-
-Personal and commercial use of compiled versions of LAME (or any other mp3
-encoder) requires a patent license in some countries.
-
-This package is in tainted, as MP3 encoding is covered by software patents.
-
-%files plugin-lame
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3blameencoder.la
-%{tde_tdelibdir}/libk3blameencoder.so
-%endif
-
-##########
-
-%if 0%{?with_ffmpeg}
-%package plugin-ffmpeg
-Summary:		The FFMPEG plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-ffmpeg
-%{summary}.
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
-and a generic audio and video file converter.
-
-%files plugin-ffmpeg
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bffmpegdecoder.la
-%{tde_tdelibdir}/libk3bffmpegdecoder.so
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%patch1 -p1 -b .ffmpeg
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# FFMPEG trick ...
-if [ -d /usr/include/ffmpeg ]; then
-	export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
-
-# Notice: extra-includes is required to find arts headers
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=%{tde_includedir} \
-  \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  %{?with_samplerate:--with-external-libsamplerate} \
-  %{?with_dvdread:--with-libdvdread} %{?!with_dvdread:--without-libdvdread} \
-  --with-musicbrainz \
-  %{?with_sndfile:--with-sndfile} %{?!with_sndfile:--without-sndfile} \
-  %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \
-  %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \
-  %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \
-  --with-musepack \
-  --without-resmgr \
-  --with-hal
-
-# Strange behaviour on RHEL4 ...
-%if 0%{?rhel} == 4
-%__sed -i "libk3b/jobs/Makefile" -e "/^am_libjobs_la_final_OBJECTS/ s/ lo//g"
-%__mkdir_p "libk3bdevice/.libs"
-%__ln_s . "libk3bdevice/.libs/.libs"
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k3b/k3b-3.5.13.spec b/redhat/applications/k3b/k3b-3.5.13.spec
deleted file mode 100644
index aca04f95e..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.spec
+++ /dev/null
@@ -1,319 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-k3b
-Summary:	CD/DVD burning application
-Version:	3.5.13
-Release:	5%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Group:		Applications/Archiving
-License:	GPLv2+
-
-Source0:	k3b-%{version}.tar.gz
-Source2:	k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:		k3b-1.0.4-manualbufsize.patch
-# RHEL6: Fix K3B icon
-Patch106:	trinity-k3b-icons.patch
-# [k3b] Fix compilation with GCC 4.7 [Bug #958]
-Patch108:	k3b-3.5.13-fix_Range_r_3-gcc47.patch
-# [k3b] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch109:	k3b-3.5.13-missing_ldflags.patch
-# [k3b] Fix dbus-tqt header detection, required for HAL support
-Patch110:	k3b-3.5.13-fix_dbus_tqt_detection.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: desktop-file-utils
-BuildRequires: alsa-lib-devel
-BuildRequires: audiofile-devel
-BuildRequires: dbus-tqt-devel hal-devel
-BuildRequires: gettext
-BuildRequires: libdvdread-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: taglib-devel
-BuildRequires: zlib-devel
-BuildRequires: %{_lib}resmgr-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%else
-BuildRequires:	flac-devel
-%endif
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-common = %{version}-%{release}
-
-Requires: cdrecord mkisofs
-Requires: cdrdao
-Requires: dvd+rw-tools
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/kfile_k3b.la
-%{tde_tdelibdir}/kfile_k3b.so
-%{tde_tdelibdir}/kio_videodvd.la
-%{tde_tdelibdir}/kio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:  Common files of %{name}
-Group:    Applications/Archiving
-Requires: %{name} = %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/applnk/.hidden/k3b-iso.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/config/k3brc
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/kfile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-
-
-%post common
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-
-%postun common
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  update-desktop-database %{tde_appdir} -q &> /dev/null
-fi
-
-%posttrans common
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-update-desktop-database %{tde_appdir} -q &> /dev/null
-
-##########
-
-%package libs
-Summary: Runtime libraries for %{name}
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Files for the development of applications which will use %{name} 
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/k3b/
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%prep
-%setup -q -a 0 -n applications/k3b
-
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-%patch106 -p1 -b .desktopfile
-%patch108 -p1
-%patch109 -p1 -b .ldflags
-%patch110 -p1 -b .dbustqt
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir}/k3b \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-k3bsetup=no \
-  --without-cdrecord-suid-root \
-  --with-oggvorbis \
-  --with-flac \
-  --with-external-libsamplerate \
-  --with-libdvdread \
-  --with-musicbrainz \
-  --with-sndfile \
-  --without-ffmpeg --without-lame --without-libmad \
-  --with-musepack \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-# remove i18n for Plattdeutsch (Low Saxon)
-#%__rm -fr %{buildroot}%{tde_datadir}/locale/nds
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Add support for Mageia 2 and Mandriva 2011
-- Fix DBUS-TQT detection that prevented HAL support
-- Adds requirement for resmgr
-
-* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Removes i18 files (built separately)
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Rebuilt for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
diff --git a/redhat/applications/k3b/reload-for-verification.diff b/redhat/applications/k3b/reload-for-verification.diff
deleted file mode 100644
index a94298181..000000000
--- a/redhat/applications/k3b/reload-for-verification.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- libk3b/jobs/k3bverificationjob.cpp.sav	2008-05-27 10:24:20.000000000 +0200
-+++ libk3b/jobs/k3bverificationjob.cpp	2009-06-11 17:58:58.000000000 +0200
-@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
-   emit newTask( i18n("Checking medium") );
- 
-   d->mediumHasBeenReloaded = false;
-+  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
-+           SIGNAL(finished(K3bDevice::DeviceHandler*)),
-+           this,
-+           SLOT(slotMediaLoaded()) );
-+}
-+
-+void K3bVerificationJob::slotMediaLoaded()
-+{
-+    // we always need to wait for the medium. Otherwise the diskinfo below
-+    // may run before the drive is ready!
-+    waitForMedia( d->device,
-+                  K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
-+                  K3bDevice::MEDIA_WRITABLE );
-+
-   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
-            SIGNAL(finished(K3bDevice::DeviceHandler*)),
-            this,
---- libk3b/jobs/k3bverificationjob.h.sav	2008-05-27 10:24:20.000000000 +0200
-+++ libk3b/jobs/k3bverificationjob.h	2009-06-11 17:13:37.000000000 +0200
-@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
-   void setGrownSessionSize( const K3b::Msf& );
- 
-  private slots:
-+  void slotMediaLoaded();
-   void slotMediaReloaded( bool success );
-   void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
-   void readTrack( int trackIndex );
diff --git a/redhat/applications/k3b/trinity-k3b-icons.patch b/redhat/applications/k3b/trinity-k3b-icons.patch
deleted file mode 100644
index 4dd762215..000000000
--- a/redhat/applications/k3b/trinity-k3b-icons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop
-*** k3b.ori/src/k3b.desktop	Wed Dec 15 14:23:05 2010
---- k3b/src/k3b.desktop	Wed Dec 15 14:28:55 2010
-***************
-*** 116,123 ****
-  Name[ar]= K3b
-  Name[bn]=কে-থ্রি-বি
-  Name[hi]=के3बी
-! MimeType=application/x-k3b;application/x-iso;application/x-cue
-  X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
-! Categories=KDE;Application;AudioVideo;DiscBurning;
-  X-DCOP-ServiceType=Unique
---- 116,124 ----
-  Name[ar]= K3b
-  Name[bn]=কে-থ্রি-বি
-  Name[hi]=के3बी
-! Encoding=UTF-8
-! MimeType=application/x-k3b;application/x-iso;application/x-cue;
-  X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue;
-! Categories=KDE;AudioVideo;DiscBurning;
-  X-DCOP-ServiceType=Unique
diff --git a/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch b/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
deleted file mode 100644
index c21df175c..000000000
--- a/redhat/applications/k9copy/k9copy-14.0.0-fix_k3b_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs	2013-07-21 09:56:44.000000000 +0200
-+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am	2013-08-02 11:00:55.291717387 +0200
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread
-+	$(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -lk3b -lk3bdevice
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch
deleted file mode 100644
index e9b026778..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_another_string_format_error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b3bb8a8f4438bdab23809387e9f6b85a5b5914f3
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336103211 -0500
-
-    Fix another string format error
-
-diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp
-index edc4162..23613d8 100644
---- a/libk9copy/k9saveimage.cpp
-+++ b/libk9copy/k9saveimage.cpp
-@@ -76,7 +76,7 @@ void k9SaveImage::run() {
-     TQString sFileName=m_tempFile->name();
-     m_image.save(sFileName,"PNG");
-     sFileName="\rINFOIMAGE:"+sFileName;
--    fprintf(stderr,sFileName.utf8());
-+    fprintf(stderr,"%s",sFileName.utf8());
- 
-     m_mutex.unlock();
- }
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch
deleted file mode 100644
index db4c99a63..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 3bfc84b0fc3558c377e2f5a99548a6903a9ee7c3
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336066302 -0500
-
-    Fix 'format not a string literal' error
-    Clean up warning
-
-diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
-index e6f6675..9f95352 100644
---- a/libk9copy/k9burndvd.cpp
-+++ b/libk9copy/k9burndvd.cpp
-@@ -112,7 +112,7 @@ void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) {
-     ;
- }
- 
--const TQString &k9BurnDVD::getImageSize() {
-+const TQString k9BurnDVD::getImageSize() {
-     TQString c;
-     c="mkisofs";
-     proc2=new k9Process;
-@@ -215,8 +215,8 @@ void k9BurnDVD::burnWithGenisoimage() {
-                 if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
-                     cancelled=true;
-             }
--            qDebug(proc->debug());
--        }        
-+            qDebug("%s", proc->debug());
-+        }
- 
- 
-         if (!cancelled) {
-@@ -239,7 +239,7 @@ void k9BurnDVD::burnWithGenisoimage() {
-                     }
-                 }
-             }
--        }      
-+        }
-     }
- }
- 
-diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h
-index fc2edce..94e1e71 100644
---- a/libk9copy/k9burndvd.h
-+++ b/libk9copy/k9burndvd.h
-@@ -71,7 +71,7 @@ private:
-     void getWodimCmd(k9Process *proc);
- 
-     void burnWithK3b();
--    const TQString &getImageSize();
-+    const TQString getImageSize();
-     TQString imageSize;
-     TQString m_speed;
- private slots: // Private slots    
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch
deleted file mode 100644
index 561bcbb22..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_not_string_literal_2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d9ed8b3291e596eafed777956a062dc8816d0d3c
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336083386 -0500
-
-    Fix 'format not a string literal' error
-
-diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp
-index be4e406..31e85a3 100644
---- a/libk9copy/k9cellcopylist.cpp
-+++ b/libk9copy/k9cellcopylist.cpp
-@@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
-    double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes;
-    totalSize/=2.50;
- 
--qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes));
-+   qDebug("%s", (TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)).ascii());
- 
-    double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
--   qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes));
-+   qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii());
-    
-    if (minFactor<1)
- 	minFactor=1;
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch
deleted file mode 100644
index 7ab4962e0..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_format_string_error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit a016df82c8970a2aaccbf3b061e102af3a3f04ab
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336190259 -0500
-
-    Fix format string error
-
-diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp
-index d7bd43d..ebf4164 100755
---- a/k9vamps/k9vamps.cpp
-+++ b/k9vamps/k9vamps.cpp
-@@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
-         pad_packet_start_code |= (uint32_t) (ptr [3]);
- 
-         if (pad_packet_start_code != 0x000001be)
--            qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code));
-+            qDebug ("%s", (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)).ascii());
-         else {
-             pad_packet_length  = ptr [4] << 8;
-             pad_packet_length |= ptr [5];
-@@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
- 
-     // length of video packet plus padding packet must always match sector size
-     if (14 + vid_packet_length + pad_packet_length != SECT_SIZE)
--        qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length));
-+        qDebug ("%s", (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)).ascii());
- 
-     return rc;
- }
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch
deleted file mode 100644
index f6dc49802..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62acebb74cc50671eebf21a314912b12b082be1d
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336073612 -0500
-
-    Fix FTBFS
-
-diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
-index 9f95352..3860b79 100644
---- a/libk9copy/k9burndvd.cpp
-+++ b/libk9copy/k9burndvd.cpp
-@@ -215,7 +215,7 @@ void k9BurnDVD::burnWithGenisoimage() {
-                 if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
-                     cancelled=true;
-             }
--            qDebug("%s", proc->debug());
-+            qDebug("%s", proc->debug().ascii());
-         }
- 
- 
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch
deleted file mode 100644
index f78d858df..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_ftbfs_2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit ca864edeed0fe99b91c63616d4ec6d31ecdee217
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336121912 -0500
-
-    Fix FTBFS
-
-diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp
-index 23613d8..758f8de 100644
---- a/libk9copy/k9saveimage.cpp
-+++ b/libk9copy/k9saveimage.cpp
-@@ -76,7 +76,7 @@ void k9SaveImage::run() {
-     TQString sFileName=m_tempFile->name();
-     m_image.save(sFileName,"PNG");
-     sFileName="\rINFOIMAGE:"+sFileName;
--    fprintf(stderr,"%s",sFileName.utf8());
-+    fprintf(stderr,"%s",sFileName.data());
- 
-     m_mutex.unlock();
- }
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch b/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch
deleted file mode 100644
index fbf9cd56a..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-fix_remaining_string_format_errors.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-commit a8e98ad9ce209af0aba35ce26ec9200761b397df
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336091322 -0500
-
-    Fix remaining string format errors
-
-diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp
-index 29f2b02..ea9c622 100644
---- a/k9author/k9menu.cpp
-+++ b/k9author/k9menu.cpp
-@@ -143,7 +143,7 @@ void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageM
-     if (!process->normalExit()) {
-         qDebug("error converting jpeg to mpeg");
-     }
--    qDebug(process->debug().latin1());
-+    qDebug("%s", process->debug().latin1());
- }
- 
- void k9Menu::createAudio(const TQString & _audioFile) {
-diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
-index a2c02e7..454099e 100644
---- a/k9author/k9newdvd.cpp
-+++ b/k9author/k9newdvd.cpp
-@@ -257,7 +257,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
-     *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000";
-     *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower());
-     *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName();
--    qDebug(process->debug()); 
-+    qDebug("%s", process->debug().ascii());
- /*
-     if (!m_progress->execute()) {
-         m_cancel=true;
-diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp
-index 76c6882..e55c0b3 100644
---- a/k9devices/k9halconnection.cpp
-+++ b/k9devices/k9halconnection.cpp
-@@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
-   dbus_error_init( &error );
-   m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error );
-   if( dbus_error_is_set(&error) ) {
--    qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message));
-+    qDebug("%s", (TQString("Error connecting to DBUS : %1").tqarg(error.message)).ascii());
-     return;
-   }
- 
-diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp
-index 9ddff76..0129efe 100644
---- a/k9devices/k9haldevice.cpp
-+++ b/k9devices/k9haldevice.cpp
-@@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() {
-     m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM;
-     m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR;
-     m_model=TQString(libhal_drive_get_model(drive));
--    //    qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model));
-+    //    qDebug("%s", (TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)).ascii());
- 
- 
-     libhal_drive_free(drive);
-diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp
-index f910979..d7bd43d 100755
---- a/k9vamps/k9vamps.cpp
-+++ b/k9vamps/k9vamps.cpp
-@@ -368,7 +368,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
- 
-     if (ptr [7]) {
-         if ((ptr [7] & 0xc0) != 0xc0)
--           qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7]));
-+           qDebug ("%s", (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])).ascii());
-         else {
-             sequence_header_code  = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24;
-             sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16;
-diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp
-index 31e85a3..fe880ac 100644
---- a/libk9copy/k9cellcopylist.cpp
-+++ b/libk9copy/k9cellcopylist.cpp
-@@ -298,7 +298,7 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
- 
-    double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
-    qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii());
--   
-+
-    if (minFactor<1)
- 	minFactor=1;
-    return minFactor;
-@@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
-  
-     if (dvdSize2 <0) {
-     	factor=2.5;
--    	//qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2));	
-+    	//qDebug("%s", (TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2).ascii()));
-     }
-     else {
- 	factor=(totalSize +menuSize -  fforced -m_inbytes)/ dvdSize2 ;
-@@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
- 	uint64_t i=m_inbytes;
- 	//if (o==0)
- 	//	o=1;
--	//qDebug(TQString("factor : %1   realise : %2").tqarg(factor).tqarg((double)i/(double)o));
-+	//qDebug("%s", (TQString("factor : %1   realise : %2").tqarg(factor).tqarg((double)i/(double)o).ascii()));
- 	
- 	if (factor<=1)
- 		factor=1;
-diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp
-index 3676109..256cf53 100755
---- a/libk9copy/k9dvdauthor.cpp
-+++ b/libk9copy/k9dvdauthor.cpp
-@@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
-         //   m_copied+=totalBytes - m_lastPos;
-         m_copied=totalBytes;
-         m_lastPos=totalBytes;
--        //qDebug(TQString("copied : %1   totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512));
-+        //qDebug("%s", (TQString("copied : %1   totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512).ascii());
-         m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN );
- 
- 
-@@ -526,7 +526,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
-     }
-     /*    else {
-             if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav"))
--    	   qDebug(m_stderr);
-+    	   qDebug("%s", m_stderr.ascii());
-         }
-     */
-     int end;
-diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp
-index 57643c4..8c73213 100644
---- a/libk9copy/k9ifo2.cpp
-+++ b/libk9copy/k9ifo2.cpp
-@@ -870,7 +870,7 @@ void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) {
-     if (memcmp(bufCopy,_buffer,bufCopySize)!=0) {
-         TQString c;
-         c="Buffer de sortie altéré: " +lib;
--        qDebug(c.latin1());
-+        qDebug("%s", c.latin1());
-     }
- }
- 
-diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp
-index e29f206..0f4aaca 100644
---- a/libk9copy/k9mp4enc.cpp
-+++ b/libk9copy/k9mp4enc.cpp
-@@ -392,7 +392,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
- 				TQCString str=* ( m_process->args().at ( i ) );
- 				s +=TQString ( str ) +" ";
- 			}
--			qDebug ( s );
-+			qDebug ( "%s", s.ascii() );
- 			time->start();
- 			m_timer3.start();
- 			connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) );
diff --git a/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch b/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 3cce7ea00..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- k9copy/src/Makefile.am.ldflags	2011-10-15 01:43:52.000000000 +0200
-+++ k9copy/src/Makefile.am	2012-08-04 17:40:13.574823034 +0200
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi
-+	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL)
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.1.spec b/redhat/applications/k9copy/k9copy-3.5.13.1.spec
deleted file mode 100644
index c3798c154..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.1.spec
+++ /dev/null
@@ -1,148 +0,0 @@
-# Default version for this component
-%define kdecomp k9copy
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	DVD backup tool for Trinity
-Version:	1.2.3
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires: ffmpeg-devel
-#Requires:	ffmpeg
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Add support for MGA2 and MDV2011
-- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0]
-- Fix FTBFS [Commit #62acebb7]
-- Fix 'format not a string literal' error [Commit #d9ed8b32]
-- Fix remaining string format errors [Commit #a8e98ad9]
-- Fix another string format error [Commit #b3bb8a8f]
-- Fix FTBFS [Commit #ca864ede]
-- Fix format string error [Commit #a016df82]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
deleted file mode 100644
index f6a362d40..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI	2013-07-29 21:52:57.859615464 +0200
-+++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h	2013-07-29 21:57:19.206481299 +0200
-@@ -43,7 +43,11 @@
- #else
- typedef int (*av_find_stream_info_t)(AVFormatContext *);
- #endif
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0)
-+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
-+#else
- typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
-+#endif
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
- typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
- #else
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch
deleted file mode 100644
index f7858c0a0..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-fix_k3b_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI	2013-06-17 20:59:49.620929488 +0200
-+++ trinity-k9copy-3.5.13.2/src/Makefile.am	2013-06-17 21:00:11.150425671 +0200
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL)
-+	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 4dfb39787..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI	2013-07-28 19:42:30.331485057 +0200
-+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h	2013-07-28 19:43:09.713519110 +0200
-@@ -21,6 +21,9 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#ifndef __MPEG2_INTERNAL_H__
-+#define __MPEG2_INTERNAL_H__
-+
- /* macroblock modes */
- #define MACROBLOCK_INTRA 1
- #define MACROBLOCK_PATTERN 2
-@@ -298,3 +301,5 @@
- extern mpeg2_mc_t mpeg2_mc_altivec;
- extern mpeg2_mc_t mpeg2_mc_alpha;
- extern mpeg2_mc_t mpeg2_mc_vis;
-+
-+#endif // __MPEG2_INTERNAL_H__
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
deleted file mode 100644
index 0cf01006e..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-use_external_dvdread.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- ./k9author/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9author/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -14,5 +14,5 @@
- 	k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
- 	k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
- libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI)
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
---- ./k9decmpeg/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9decmpeg/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -12,7 +12,7 @@
- 	motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
- 	mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
- 	uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
- 	-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
- 
- noinst_HEADERS = k9decodethread.h k9plaympeg2.h
---- ./k9devices/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9devices/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
- 	$(HAL_INCS) $(K3B_INCS) $(all_includes)
- METASOURCES = AUTO
- libk9devices_la_LDFLAGS = $(all_libraries) 
---- ./k9Mplayer/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9Mplayer/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
- METASOURCES = AUTO
- 
- noinst_LTLIBRARIES = libk9mplayer.la
---- ./k9vamps/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9vamps/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -7,6 +7,6 @@
- noinst_LTLIBRARIES = libk9vamps.la
- libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
- 	k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
- 	-I$(top_srcdir)/libk9copy
- noinst_HEADERS = k9requant.h ac.h k9fifo.h
---- ./libdvdnav/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./libdvdnav/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -11,4 +11,4 @@
- 
- 
- 
--INCLUDES = -I$(top_srcdir)/dvdread
-+INCLUDES = -I/usr/include/dvdread
---- ./libk9copy/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./libk9copy/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -24,6 +24,6 @@
- 	k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
- 
- 
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
- libk9copy_la_LDFLAGS = $(all_libraries)
---- ./src/Makefile.am.dvdread	2013-07-28 20:05:20.855621729 +0200
-+++ ./src/Makefile.am	2013-07-28 20:09:10.620642017 +0200
-@@ -1,5 +1,5 @@
- # set the include path for X, qt and KDE
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
- 	-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes)
- 
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
-+	-ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
---- ./Makefile.am.ORI	2013-07-28 20:15:29.961786846 +0200
-+++ ./Makefile.am	2013-07-28 20:15:43.375094511 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
-+SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
- 	 po src
- 
- $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-@@ -29,11 +29,3 @@
- 
- AM_CXXFLAGS = -O0 -g3
- 
--
--
--
--
--
--
--
--INCLUDES = -I$(top_srcdir)/dvdread
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
deleted file mode 100644
index a7a026ab9..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg k9copy
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		DVD backup tool for Trinity
-Version:		1.2.3
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:			k9copy-3.5.13.2-fix_k3b_link.patch
-Patch2:			k9copy-3.5.13.2-ftbfs.patch
-Patch3:			k9copy-3.5.13.2-use_external_dvdread.patch
-Patch4:			k9copy-3.5.13.2-avcodec.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-k3b-devel
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires:	ffmpeg-devel
-Requires:		ffmpeg
-
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-%patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .dvdread
-%patch4 -p1 -b .avcodec
-
-# Removes internal dvdread headers
-%__rm -rf dvdread
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# FFMPEG ...
-if [ -d /usr/include/ffmpeg ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
- 
-# NOTICE: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --enable-k3bdevices
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%changelog
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.spec b/redhat/applications/k9copy/k9copy-3.5.13.spec
deleted file mode 100644
index 187016882..000000000
--- a/redhat/applications/k9copy/k9copy-3.5.13.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp k9copy
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	DVD backup tool for Trinity
-Version:	1.2.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [k9copy] Missing LDFLAGS cause FTBFS
-Patch0:		k9copy-3.5.13-missing_ldflags.patch
-# [k9copy] Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0]
-Patch1:		k9copy-3.5.13-fix_format_not_string_literal.patch
-# [k9copy] Fix FTBFS [Commit #62acebb7]
-Patch2:		k9copy-3.5.13-fix_ftbfs.patch
-# [k9copy] Fix 'format not a string literal' error [Commit #d9ed8b32]
-Patch3:		k9copy-3.5.13-fix_format_not_string_literal_2.patch
-# [k9copy] Fix remaining string format errors [Commit #a8e98ad9]
-Patch4:		k9copy-3.5.13-fix_remaining_string_format_errors.patch
-# [k9copy] Fix another string format error [Commit #b3bb8a8f]
-Patch5:		k9copy-3.5.13-fix_another_string_format_error.patch
-# [k9copy] Fix FTBFS [Commit #ca864ede]
-Patch6:		k9copy-3.5.13-fix_ftbfs_2.patch
-# [k9copy] Fix format string error [Commit #a016df82]
-Patch7:		k9copy-3.5.13-fix_format_string_error.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: desktop-file-utils
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires: ffmpeg-devel
-#Requires:	ffmpeg
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1 -b .ldflags
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%Changelog
-* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Add support for MGA2 and MDV2011
-- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0]
-- Fix FTBFS [Commit #62acebb7]
-- Fix 'format not a string literal' error [Commit #d9ed8b32]
-- Fix remaining string format errors [Commit #a8e98ad9]
-- Fix another string format error [Commit #b3bb8a8f]
-- Fix FTBFS [Commit #ca864ede]
-- Fix format string error [Commit #a016df82]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch
deleted file mode 100644
index 210fff5f1..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kaffeine-mozilla/src/jni_md.h.ORI	2012-04-26 20:44:15.080210122 +0200
-+++ kaffeine-mozilla/src/jni_md.h	2012-04-26 20:44:28.006895031 +0200
-@@ -40,7 +40,7 @@
- #ifndef JNI_MD_H
- #define JNI_MD_H
- 
--#include <nspr/prtypes.h> /* needed for _declspec */
-+#include <nspr4/prtypes.h> /* needed for _declspec */
- 
- /*******************************************************************************
-  * WHAT'S UP WITH THIS FILE?
---- kaffeine-mozilla/src/jri_md.h.ORI	2012-04-26 20:44:20.528077329 +0200
-+++ kaffeine-mozilla/src/jri_md.h	2012-04-26 20:44:36.239694357 +0200
-@@ -43,7 +43,7 @@
- #define JRI_MD_H
- 
- #include <assert.h>
--#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
-+#include <nspr4/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
deleted file mode 100644
index e00b81a06..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine-mozilla
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version:	0.4.3.1
-Release:	3%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# Fix 'nspr' includes location
-Patch1:		kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%if 0%{?suse_version}
-BuildRequires:	mozilla-nspr-devel
-%else
-BuildRequires:	nspr-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xaw-devel
-%else
-BuildRequires:	libXaw-devel
-%endif
-
-Requires:		trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
-when a page containing a supported media format is loaded.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
-
-autoreconf -fiv
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure \
-    --prefix=%{_libdir}/mozilla
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
deleted file mode 100644
index e4a255dce..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI	2014-03-23 11:29:59.873837637 +0100
-+++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh	2014-03-23 11:30:39.942924217 +0100
-@@ -130,7 +130,7 @@
- fi
- 
- echo "*** Creating Makefile templates"
--$AUTOMAKE || exit 1
-+$AUTOMAKE --add-missing || exit 1
- 
- if test "$UNSERMAKE" = no; then
-   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
deleted file mode 100644
index b2230c6b3..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ /dev/null
@@ -1,131 +0,0 @@
-# Default version for this component
-%define tde_pkg kaffeine-mozilla
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version:		0.4.3.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# Fix 'nspr' includes location
-Patch1:		kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-# Fix build with newer automake
-Patch2:			kaffeine-mozilla-3.5.13.2-fix_automake.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-%if 0%{?suse_version}
-BuildRequires:	mozilla-nspr-devel
-%else
-BuildRequires:	nspr-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xaw-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXaw-devel
-%endif
-
-Requires:		trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for TDE,
-when a page containing a supported media format is loaded.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .nspr
-%patch2 -p1 -b .automake
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{_libdir}/mozilla \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
deleted file mode 100644
index fdaafa4b0..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine-mozilla
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version:	0.4.3.1
-Release:	2%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# Fix 'nspr' includes location
-Patch1:		kaffeine-mozilla-3.5.13-fix_nspr_include.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires:	nspr-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xaw-devel
-%else
-BuildRequires:	libXaw-devel
-%endif
-
-Requires:		trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for KDE,
-when a page containing a supported media format is loaded.
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt.sh
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-%__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
-
-autoreconf -fiv
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure \
-    --prefix=%{_libdir}/mozilla
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
deleted file mode 100644
index 9c01d1056..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 25b89439bbdcbc245b2a4125d2345afaa32fb952
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326858742 -0600
-
-    Error out if critical OSD-related defines are not set
-
-diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-index acc9937..68d47ac 100644
---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -1513,6 +1513,14 @@ bool KXineWidget::playDvb()
- 	return true;
- }
- 
-+#ifndef Q_BYTE_ORDER
-+#error Q_BYTE_ORDER is not defined!
-+#endif
-+
-+#ifndef TQ_LITTLE_ENDIAN
-+#error TQ_LITTLE_ENDIAN is not defined!
-+#endif
-+
- #if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN
- #define rgb2yuv(R,G,B) ((((((66*R+129*G+25*B+128)>>8)+16)<<8)|(((112*R-94*G-18*B+128)>>8)+128))<<8|(((-38*R-74*G+112*B+128)>>8)+128))
- #else
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch
deleted file mode 100644
index 175998916..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -aruN kaffeine-trinity-3.5.13.orig/admin/am_edit kaffeine-trinity-3.5.13/admin/am_edit
---- kaffeine-trinity-3.5.13.orig/admin/am_edit	2011-05-28 07:48:53.000000000 +0200
-+++ kaffeine-trinity-3.5.13/admin/am_edit	2012-02-26 19:05:36.000000000 +0100
-@@ -1643,6 +1643,10 @@
- 
-   $target_adds{"install-data-am"} .= "install-nls ";
- 
-+  if (!$lang) {
-+    $tmp = "PACKAGE_BASE=`echo \"\$(PACKAGE)\" | sed \"s|-trinity-.*||\"`\n";
-+    appendLines ($tmp);
-+  }
-   $tmp = "install-nls:\n";
-   if ($lang) {
-     $tmp  .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES\n";
-@@ -1661,10 +1665,10 @@
-     $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-     $tmp .= "\t  fi ;\\\n";
-   } else {
--    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-+    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
-     $tmp .= "\t  \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n";
--    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
--    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-+    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
-+    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
-     $tmp .= "\t  fi ;\\\n";
-   }
-   $tmp .= "\tdone\n\n";
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_program_name.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_program_name.patch
deleted file mode 100644
index 5042d4bed..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_program_name.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 4e982fa326fb619ec61e86cb0088d4b3002b2281
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1343089272 +0200
-
-    Added automake initialization with proper program name and version
-    This resolves Bug 858
-
-diff --git a/configure.in.in b/configure.in.in
-index 144aef9..9751e7c 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -1,4 +1,7 @@
- #MIN_CONFIG(3.3)
-+
-+AM_INIT_AUTOMAKE(kaffeine, 0.8.8)
-+
- CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
- 
- if test "$build_arts" = "yes"; then
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch
deleted file mode 100644
index 71b71cc6e..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331343133 -0600
-
-    Fix nominal "tqt" typos and fix slow DVB start.
-    This closes bug reports 729 and 899.
-
-diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-index 96752aa..32c8817 100644
---- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame )
- 		case FOURBYTHREE: factor = 4.0 / 3.0; break;
- 		case ANAMORPHIC: factor = 16.0 / 9.0; break;
- 		case DVB:	factor = 2.11; break;
--		case STQUARE: factor = 1.0; break;
-+		case SQUARE: factor = 1.0; break;
- 	}
- 
- 	float frameAspect = (float)frame.width() / (float)frame.height();
-@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB()
- 
- void VideoWindow::slotAspectRatioSquare()
- {
--	m_aspectRatio = STQUARE;
-+	m_aspectRatio = SQUARE;
- 	TQSize frame = getFrameSize();
- 	correctByAspectRatio( frame );
- 	emit signalNewFrameSize( frame );
-diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
-index c4d9f74..f7c5180 100644
---- a/kaffeine/src/player-parts/gstreamer-part/video.h
-+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
-@@ -47,7 +47,7 @@ public:
- 		FOURBYTHREE,
- 		ANAMORPHIC,
- 		DVB,
--		STQUARE
-+		SQUARE
- 	};
- 
- 	void newState();
-diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-index edc2fa9..6987de3 100644
---- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#ifndef DEINTERLACETQUALITY_H
--#define DEINTERLACETQUALITY_H
-+#ifndef DEINTERLACEQUALITY_H
-+#define DEINTERLACEQUALITY_H
- 
- #include <kdialogbase.h>
- 
-@@ -77,4 +77,4 @@ private:
-   KPushButton* m_customConfigButton;
- };
- 
--#endif /* DEINTERLACETQUALITY_H */
-+#endif /* DEINTERLACEQUALITY_H */
-diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
-index 7d43ec0..2e81096 100644
---- a/kaffeine/src/player-parts/xine-part/equalizer.h
-+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#ifndef ETQUALIZER_H
--#define ETQUALIZER_H
-+#ifndef EQUALIZER_H
-+#define EQUALIZER_H
- 
- #include <kdialogbase.h>
- #include <kconfig.h>
-@@ -77,4 +77,4 @@ private:
-   TQSlider* eq16kSlider;
- };
- 
--#endif /* ETQUALIZER_H */
-+#endif /* EQUALIZER_H */
-diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-index 68d47ac..ab87338 100644
---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
- 	      break;
- 	    default:
- 	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio));
--	    case XINE_VO_ASPECT_STQUARE:
-+	    case XINE_VO_ASPECT_SQUARE:
- 	      debugOut("Screenshot: got video aspect: 1:1");
- 	      desired_ratio = image_ratio;
- 	      break;
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
deleted file mode 100644
index 07d58235a..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit b480e3db3a01b75376fa6b83e5b01efe104ccaec
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331957353 -0500
-
-    Change location where Kaffeine stores temporary pipe files from $HOME to
-    the more appropriate $TDEHOME/tmp-$HOSTNAME.
-
-diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
-index 365b7ac..969b62b 100644
---- a/kaffeine/src/input/dvb/dvbpanel.cpp
-+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
-@@ -1065,7 +1065,8 @@ void DvbPanel::setConfig()
- 		connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) );
- 		connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) );
- 	}
--	fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
-+// 	fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
-+	fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts";
- 	TQFile f( fifoName );
- 	if ( f.exists() )
- 		f.remove();
-@@ -1073,7 +1074,8 @@ void DvbPanel::setConfig()
- 		perror( fifoName.latin1() );
- 		fifoName = "";
- 	}
--	fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
-+// 	fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
-+	fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts";
- 	TQFile f1( fifoName1 );
- 	if ( f1.exists() )
- 		f1.remove();
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
deleted file mode 100644
index f4473d621..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-commit 0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1333649519 -0500
-
-    Fix typos, branding, and inadvertent tqt changes.
-
-diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
-index 969b62b..bbc4e32 100644
---- a/kaffeine/src/input/dvb/dvbpanel.cpp
-+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
-@@ -1065,8 +1065,7 @@ void DvbPanel::setConfig()
- 		connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) );
- 		connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) );
- 	}
--// 	fifoName = TQDir::homeDirPath()+"/.kaxtv.ts";
--	fifoName = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv.ts";
-+	fifoName = KGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts";
- 	TQFile f( fifoName );
- 	if ( f.exists() )
- 		f.remove();
-@@ -1074,8 +1073,7 @@ void DvbPanel::setConfig()
- 		perror( fifoName.latin1() );
- 		fifoName = "";
- 	}
--// 	fifoName1 = TQDir::homeDirPath()+"/.kaxtv1.ts";
--	fifoName1 = KGlobal::dirs()->saveLocation("tmp")+"/.kaxtv1.ts";
-+	fifoName1 = KGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts";
- 	TQFile f1( fifoName1 );
- 	if ( f1.exists() )
- 		f1.remove();
-diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
-index 2b1d2e7..57b9254 100644
---- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
-+++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
-@@ -42,7 +42,7 @@ extern "C" {
-  * @param session_number Session number concerned.
-  * @param auth_protocol_id Auth protocol id.
-  * @param auth_data Data for the request.
-- * @param auth_data_lenghth Number of bytes.
-+ * @param auth_data_length Number of bytes.
-  * @return 0 on success, -1 on failure.
-  */
- typedef int (*en50221_app_auth_request_callback) (void *arg,
-diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
-index 8d85e01..e8148a7 100644
---- a/kaffeine/src/kmultitabbar.cpp
-+++ b/kaffeine/src/kmultitabbar.cpp
-@@ -347,7 +347,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString&
- 	tab->installEventFilter(this);
- 	tab->showActiveTabText(m_showActiveTabTexts);
- 
--	if (m_style==KMultiTabBar::KONTQSBC)
-+	if (m_style==KMultiTabBar::KONQSBC)
- 	{
- 		if (m_expandedTabSize<tab->neededSize()) {
- 			m_expandedTabSize=tab->neededSize();
-@@ -570,7 +570,7 @@ void KMultiTabBarTab::setState(bool b)
- void KMultiTabBarTab::updateState()
- {
- 
--	if (m_style!=KMultiTabBar::KONTQSBC) {
-+	if (m_style!=KMultiTabBar::KONQSBC) {
- 		if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
- 			TQPushButton::setText(m_text);
- 		} else {
-@@ -626,7 +626,7 @@ void KMultiTabBarTab::drawButtonLabel(TQPainter *p) {
- }
- void KMultiTabBarTab::drawButton(TQPainter *paint)
- {
--	if (m_style!=KMultiTabBar::KONTQSBC) drawButtonStyled(paint);
-+	if (m_style!=KMultiTabBar::KONQSBC) drawButtonStyled(paint);
- 	else  drawButtonClassic(paint);
- }
- 
-@@ -858,7 +858,7 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
- 	setPosition((bm==KMultiTabBar::Vertical)?KMultiTabBar::Right:KMultiTabBar::Bottom);
- 	setStyle(VSNET);
- 	//	setStyle(KDEV3);
--	//setStyle(KONTQSBC);
-+	//setStyle(KONQSBC);
- 	m_l->insertWidget(0,m_internal);
- 	m_l->insertWidget(0,m_btnTabSep=new TQFrame(this));
- 	m_btnTabSep->setFixedHeight(4);
-diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
-index 72fa884..2932cc2 100644
---- a/kaffeine/src/kmultitabbar.h
-+++ b/kaffeine/src/kmultitabbar.h
-@@ -55,16 +55,16 @@
- 	Q_OBJECT
-   TQ_OBJECT
- public:
--	enum KMultiTabBarMode{Horizontal,Vertical};
-+	enum KMultiTabBarMode{Horizontal, Vertical};
- 	enum KMultiTabBarPosition{Left, Right, Top, Bottom};
- 
- 	/**
- 	 * VSNET == Visual Studio .Net like (only show the text of active tabs
- 	 * KDEV3 == Kdevelop 3 like (always show the text)
--	 * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled
-+	 * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled
- 	 * 	at the moment, but will be renabled soon too
- 	 */
--	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
-+	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
- 
- 	KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
- 	virtual ~KMultiTabBar();
-diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-index ccb56f3..b7e88c7 100644
---- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-@@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
- 	label = new TQLabel(i18n("Prefered audio driver"), frame);
- 	layout->addWidget(label, 1, 0);
- 	layout->addWidget(m_audioDriverBox, 1, 1);
--	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
- 
- 	//Video Page
- 	frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
-@@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
- 	label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
- 	layout->addWidget(label, 1, 0);
- 	layout->addWidget(m_videoDriverBox, 1, 1);
--	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
- 	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
- 
- 	//Media page
-@@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
- 	label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
- 	layout->addWidget(label, 1, 0);
- 	layout->addWidget(m_driveEdit, 1, 1);
--	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
- }
- 
- GStreamerConfig::~GStreamerConfig()
-diff --git a/kaffeine/src/player-parts/xine-part/positionslider.cpp b/kaffeine/src/player-parts/xine-part/positionslider.cpp
-index 16b3978..9d64e26 100644
---- a/kaffeine/src/player-parts/xine-part/positionslider.cpp
-+++ b/kaffeine/src/player-parts/xine-part/positionslider.cpp
-@@ -97,8 +97,8 @@ bool PositionSlider::eventFilter(TQObject *obj, TQEvent *ev)
- 			return false;
- 
- 		int range = maxValue() - minValue();
--		int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y();
--		int maxpos = (orientation() ==Qt::Horizontal) ? width() : height();
-+		int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y();
-+		int maxpos = (orientation() == Horizontal) ? width() : height();
- 		int value = pos * range / maxpos + minValue();
- 
- 		if (TQApplication::reverseLayout())
-diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp
-index 8a691b8..4ed3eb6 100644
---- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
-+++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
-@@ -153,7 +153,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
-         m_xinePostParameter++;
-       }
-     }
--    KSeparator* sep = new KSeparator(Qt::Horizontal, m_groupBox);
-+    KSeparator* sep = new KSeparator(KSeparator::Horizontal, m_groupBox);
-     grid->addMultiCellWidget(sep, row, row, 0, 1);
-     row++;
-     KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
-diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-index 98ff969..9fc18e6 100644
---- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-@@ -1373,10 +1373,10 @@ void XinePart::initActions()
- 	KStdAction::zoomIn(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
- 	KStdAction::zoomOut(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
- 	KStdAction::fitToPage(TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOff()), actionCollection(), "zoom_off");
--	new KAction(i18n("Zoom InQt::Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
--	new KAction(i18n("Zoom OutQt::Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
--	new KAction(i18n("Zoom InQt::Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
--	new KAction(i18n("Zoom OutQt::Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
-+	new KAction(i18n("Zoom In Horizontal"), NULL, CTRL|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInX()), actionCollection(), "zoom_in_x");
-+	new KAction(i18n("Zoom Out Horizontal"), NULL, CTRL|SHIFT|Key_H, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutX()), actionCollection(), "zoom_out_x");
-+	new KAction(i18n("Zoom In Vertical"), NULL, CTRL|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomInY()), actionCollection(), "zoom_in_y");
-+	new KAction(i18n("Zoom Out Vertical"), NULL, CTRL|SHIFT|Key_V, TQT_TQOBJECT(m_xine), TQT_SLOT(slotZoomOutY()), actionCollection(), "zoom_out_y");
- 	new KAction(i18n("Deinterlace &Quality"), "blend", CTRL|Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotDeinterlaceQuality()), actionCollection(), "video_deinterlace_quality");
- 	new KAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotPictureSettings()), actionCollection(), "video_picture");
- 	new KAction(i18n("&Equalizer"), NULL, Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotEqualizer()), actionCollection(), "equalizer");
-@@ -1423,7 +1423,7 @@ void XinePart::initActions()
- 	connect(m_xine, TQT_SIGNAL(signalSyncVolume()), TQT_TQOBJECT(this), TQT_SLOT(slotSyncVolume()));
- 	new KWidgetAction(m_volume, i18n("Volume"), 0, 0, 0, actionCollection(), "audio_volume");
- 
--	m_position = new PositionSlider(Qt::Horizontal);
-+	m_position = new PositionSlider(Horizontal);
- 	TQToolTip::add
- 		(m_position, i18n("Position"));
- 	m_position->setRange(0, 65535);
-@@ -2061,7 +2061,7 @@ void XinePart::zoomOff()
- /********** volume slider ****************/
- 
- 
--VolumeSlider::VolumeSlider() : TQSlider(Qt::Horizontal, 0)
-+VolumeSlider::VolumeSlider() : TQSlider(Horizontal, 0)
- {
- 	installEventFilter(this);
- }
-@@ -2092,8 +2092,8 @@ void VolumeSlider::wheelEvent(TQWheelEvent* e)
- 			return FALSE;
- 
- 		int range = maxValue() - minValue();
--		int pos = (orientation() ==Qt::Horizontal) ? e->pos().x() : e->pos().y();
--		int maxpos = (orientation() ==Qt::Horizontal) ? width() : height();
-+		int pos = (orientation() == Horizontal) ? e->pos().x() : e->pos().y();
-+		int maxpos = (orientation() == Horizontal) ? width() : height();
- 		int value = pos * range / maxpos + minValue();
- 
- 		if (TQApplication::reverseLayout())
-diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-index 6d6a2d4..1281911 100644
---- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-@@ -135,7 +135,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
- 	description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
- 	grid->addWidget(description, row, 1);
- 
--	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
-+	KSeparator* separator = new KSeparator(KSeparator::Horizontal, parent);
- 	grid->addMultiCellWidget(separator, row+1, row+1, 0, 1);
- }
- 
-diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
-index 745360f..e781ba0 100644
---- a/kaffeine/src/systemtray.cpp
-+++ b/kaffeine/src/systemtray.cpp
-@@ -100,7 +100,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *e)
- 	default:
- 		KSystemTray::mousePressEvent(e);
- 		break;
--	case Qt::MidButton:
-+	case MidButton:
- 		if(!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
- 			return;
- 		actionCollection()->action("trayplay")->activate();
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_win32_codec_url.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_win32_codec_url.patch
deleted file mode 100644
index 571f60e39..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_win32_codec_url.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 5086f3584a9548aa92dd880139107187b9fc8509
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1342026813 -0500
-
-    Fixed online hyperlink to win32 codecs download location.
-    Thanks to Kristopher Gamrat.
-
-diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
-index 279d78b..21336c2 100644
---- a/kaffeine/src/instwizard.cpp
-+++ b/kaffeine/src/instwizard.cpp
-@@ -113,7 +113,7 @@ void InstWizard::internalWizard()
- 		info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
- 	else
- 		info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
--		<< " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
-+		<< " <a href=\"http://www1.mplayerhq.hu/design7/dload.html#binary_codecs\">http://www1.mplayerhq.hu/design7/dload.html#binary_codecs</a>.</font>";
- 
- 	//LIBDVDCSS
- 	info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
-@@ -190,7 +190,7 @@ void InstWizard::internalWizard()
- 
- 	if (infoString.contains("DarkRed"))
- 	{
--		info << i18n("Found some problems, but nevertheless Kaffeine may work.");
-+		info << i18n("Found some problems, but nevertheless Kaffeine might work.");
- 	}
- 	else
- 	{
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-missing_ldflags.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-missing_ldflags.patch
deleted file mode 100644
index a2396a3a9..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am.ORI	2012-08-03 12:13:32.063876101 +0200
-+++ kaffeine/kaffeine/src/player-parts/kaffeine-part/Makefile.am	2012-08-03 12:13:38.423736088 +0200
-@@ -8,5 +8,5 @@
- METASOURCES = AUTO
- 
- libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp
--libkaffeinepart_la_LIBADD  = $(LIB_KPARTS) $(all_libraries)
-+libkaffeinepart_la_LIBADD  = $(LIB_KPARTS) $(all_libraries) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
- libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version
---- kaffeine/kaffeine/src/input/disc/plugins/Makefile.am.ORI	2012-08-03 12:17:08.799687224 +0200
-+++ kaffeine/kaffeine/src/input/disc/plugins/Makefile.am	2012-08-03 12:17:35.613454250 +0200
-@@ -18,7 +18,7 @@
- kaffeineinclude_HEADERS = kaffeineaudioencoder.h
- 
- libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp
--libkaffeineaudioencoder_la_LIBADD  = $(LIB_KPARTS)
-+libkaffeineaudioencoder_la_LIBADD  = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT) $(LIB_OGGVORBIS)
- libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
- 
- kde_servicetypes_DATA = kaffeineaudioencoder.desktop
---- kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am.ORI	2012-08-03 12:19:42.699882457 +0200
-+++ kaffeine/kaffeine/src/input/dvb/plugins/epg/Makefile.am	2012-08-03 12:19:47.451553785 +0200
-@@ -10,7 +10,7 @@
- kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h
- 
- libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp
--libkaffeineepgplugin_la_LIBADD  = $(LIB_KPARTS)
-+libkaffeineepgplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
- libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
- 
- kde_servicetypes_DATA = kaffeineepgplugin.desktop
---- kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am.ORI	2012-08-03 12:20:56.687973949 +0200
-+++ kaffeine/kaffeine/src/input/dvb/plugins/stream/Makefile.am	2012-08-03 12:21:01.669658770 +0200
-@@ -10,7 +10,7 @@
- kaffeineinclude_HEADERS = kaffeinedvbplugin.h
- 
- libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp
--libkaffeinedvbplugin_la_LIBADD  = $(LIB_KPARTS)
-+libkaffeinedvbplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT)
- libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined
- 
- kde_servicetypes_DATA = kaffeinedvbplugin.desktop
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch
deleted file mode 100644
index ace85881f..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch
+++ /dev/null
@@ -1,1403 +0,0 @@
-commit 701a124908ec0072b12cd3884589a86431f36080
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316159 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
-index c74317d..0e76b88 100644
---- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
-+++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
-@@ -108,7 +108,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
- 
-     kdDebug() << "Performing Google Search: " << url << endl;
- 
--    search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) );
-+    search.load(url.url()+TQString("&start=%1&sa=N").arg(galleryPage*20) );
- 
-     TQString text = search.toString().string();
- 
-diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
-index 5bb169e..ccfea35 100644
---- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
-+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
-@@ -87,9 +87,9 @@ GoogleFetcherDialog::~GoogleFetcherDialog()
- void GoogleFetcherDialog::setLayout()
- {
-     setCaption(TQString("%1 - %2 (%3)")
--              .tqarg(m_artist)
--              .tqarg(m_album)
--              .tqarg(m_imageList.size()));
-+              .arg(m_artist)
-+              .arg(m_album)
-+              .arg(m_imageList.size()));
- 
-     m_iconWidget->clear();
-     for(uint i = 0; i < m_imageList.size(); i++)
-@@ -237,7 +237,7 @@ CoverIconViewItem::~CoverIconViewItem()
- void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
- {
-     int currentSize = m_buffer.size();
--    m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
-+    m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
-     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
- }
- 
-diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
-index 3735b61..e67603e 100644
---- a/kaffeine/src/input/audiobrowser/playlist.cpp
-+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
-@@ -1774,14 +1774,14 @@ void PlayList::updateStatus()
- 		TQValueList<MRL>::ConstIterator end(m_queue.end());
- 		for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it)
- 			total = total.addSecs(TQTime().secsTo((*it).length()));
--		status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss"));
-+		status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss"));
- 	}
- 	else
- 	{
--		//status = i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)).tqarg(TQString::number(m_list->childCount())).tqarg(msToTimeString(m_playTime));
-+		//status = i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(TQString::number(m_list->childCount())).arg(msToTimeString(m_playTime));
- 
- 
--		status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible));
-+		status = i18n("Entries: %1, Playtime: %2").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible));
- 	}
- 	emit statusBarMessage(status);
- }
-@@ -1886,7 +1886,7 @@ void PlayList::saveCurrentPlaylist()
- 
- void PlayList::removeCurrentPlaylist()
- {
--	int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
-+	int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
- 	if (code == KMessageBox::Continue)
- 	{
- 		TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
-diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp
-index 9581651..231e008 100644
---- a/kaffeine/src/input/disc/cddb.cpp
-+++ b/kaffeine/src/input/disc/cddb.cpp
-@@ -302,7 +302,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
-   for (int i = 0; i < m_tracks; i++)
-     {
-       if (m_names[i].isEmpty())
--        m_names[i] += i18n("Track %1").tqarg(i);
-+        m_names[i] += i18n("Track %1").arg(i);
-       m_names[i].replace(TQRegExp("/"), "%2f");
-       kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i]
-         << "'" << endl;
-@@ -328,7 +328,7 @@ bool CDDB::searchLocal(unsigned int id, TQFile *ret_file)
- {
-   TQDir dir;
-   TQString filename;
--  filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0');
-+  filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0');
-   TQStringList::ConstIterator it;
-   for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it)
-     {
-diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
-index e392dca..31bba0c 100644
---- a/kaffeine/src/input/disc/disc.cpp
-+++ b/kaffeine/src/input/disc/disc.cpp
-@@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it )
- 	if ( !it )
- 		return;
- 
--	MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+	MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 	mrl.setTitle( it->text(1) );
- 	mrl.setArtist( artistLab->text() );
- 	mrl.setAlbum( albumLab->text() );
-@@ -465,7 +465,7 @@ void Disc::startCD( const TQString &device, bool rip )
- 			for ( i=0; i<para->getTracks(); i++ ) {
- 				it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
- 				if ( i==0 ) {
--					mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
-+					mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
- 					mrl.setTitle( cddb->track(i) );
- 					mrl.setArtist( artistLab->text() );
- 					mrl.setAlbum( albumLab->text() );
-@@ -481,7 +481,7 @@ void Disc::startCD( const TQString &device, bool rip )
- 				for ( i=0; i<para->getTracks(); i++ ) {
- 					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
- 					if ( i==0 ) {
--						mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
-+						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
- 						mrl.setTitle( cddb->track(i) );
- 						mrl.setArtist( artistLab->text() );
- 						mrl.setAlbum( albumLab->text() );
-@@ -495,7 +495,7 @@ void Disc::startCD( const TQString &device, bool rip )
- 				for ( i=0; i<para->getTracks(); i++ ) {
- 					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) );
- 					if ( i==0 ) {
--						mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
-+						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
- 						mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) );
- 						mrl.setArtist( artistLab->text() );
- 						mrl.setAlbum( albumLab->text() );
-@@ -531,7 +531,7 @@ void Disc::startDVD( const TQString &device )
- 	bool ok=false;
- 
- 	if ( !device.isEmpty() )
--		mrl.setURL( TQString("dvd://%1").tqarg(device) );
-+		mrl.setURL( TQString("dvd://%1").arg(device) );
- 	else {
- 		DCOPRef mediamanager("kded","mediamanager");
- 		DCOPReply reply = mediamanager.call("fullList()");
-@@ -555,12 +555,12 @@ void Disc::startDVD( const TQString &device )
- 				TQString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"),
- 					devList, 0, false, &ok );
- 				if ( ok )
--					mrl.setURL( TQString("dvd://%1").tqarg(choice) );
-+					mrl.setURL( TQString("dvd://%1").arg(choice) );
- 				else
- 					return;
- 			}
- 			else if ( devList.count()==1 )
--				mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) );
-+				mrl.setURL( TQString("dvd://%1").arg(devList[0]) );
- 			else {
- 				//KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") );
- 				//return;
-@@ -591,7 +591,7 @@ void Disc::startVCD( const TQString &device )
- 	bool ok=false;
- 
- 	if ( !device.isEmpty() )
--		mrl.setURL( TQString("vcd://%1").tqarg(device) );
-+		mrl.setURL( TQString("vcd://%1").arg(device) );
- 	else {
- 		DCOPRef mediamanager("kded","mediamanager");
- 		DCOPReply reply = mediamanager.call("fullList()");
-@@ -609,12 +609,12 @@ void Disc::startVCD( const TQString &device )
- 				TQString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"),
- 					devList, 0, false, &ok );
- 				if ( ok )
--					mrl.setURL( TQString("vcd://%1").tqarg(choice) );
-+					mrl.setURL( TQString("vcd://%1").arg(choice) );
- 				else
- 					return;
- 			}
- 			else if ( devList.count()==1 )
--				mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) );
-+				mrl.setURL( TQString("vcd://%1").arg(devList[0]) );
- 			else {
- 				//KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") );
- 				//return;
-@@ -649,7 +649,7 @@ bool Disc::currentTrack( MRL &mrl )
- 		return false;
- 	while ( it!=0 ) {
- 		if ( it->text(0).toInt()==trackCurrent ) {
--			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 			mrl.setTitle( it->text(1) );
- 			mrl.setArtist( artistLab->text() );
- 			mrl.setAlbum( albumLab->text() );
-@@ -681,7 +681,7 @@ bool Disc::nextTrack( MRL &mrl )
- 		return false;
- 	while ( it!=0 ) {
- 		if ( it->text(0).toInt()==trackCurrent+1 ) {
--			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 			mrl.setTitle( it->text(1) );
- 			mrl.setArtist( artistLab->text() );
- 			mrl.setAlbum( albumLab->text() );
-@@ -695,7 +695,7 @@ bool Disc::nextTrack( MRL &mrl )
- 	}
- 
- 	it = list->firstChild();
--	mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+	mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 	mrl.setTitle( it->text(1) );
- 	mrl.setArtist( artistLab->text() );
- 	mrl.setAlbum( albumLab->text() );
-@@ -718,7 +718,7 @@ bool Disc::previousTrack( MRL &mrl )
- 		return false;
- 	while ( it!=0 ) {
- 		if ( it->text(0).toInt()==trackCurrent-1 ) {
--			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 			mrl.setTitle( it->text(1) );
- 			mrl.setArtist( artistLab->text() );
- 			mrl.setAlbum( albumLab->text() );
-@@ -746,7 +746,7 @@ bool Disc::trackNumber( int number, MRL &mrl )
- 		return false;
- 	while ( it!=0 ) {
- 		if ( it->text(0).toInt()==number ) {
--			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
-+			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
- 			mrl.setTitle( it->text(1) );
- 			mrl.setArtist( artistLab->text() );
- 			mrl.setAlbum( albumLab->text() );
-diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
-index 03f39fa..36b052a 100644
---- a/kaffeine/src/input/disc/paranoia.cpp
-+++ b/kaffeine/src/input/disc/paranoia.cpp
-@@ -288,14 +288,14 @@ bool Paranoia::loadEncoder( TQWidget *parent )
- 
- 	KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
- 	if (!service) {
--		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
-+		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
- 		return false;
- 	}
- 
- 	if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
- 		currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
- 		if (error > 0) {
--			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
-+			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
- 			return false;
- 		}
- 		else
-diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp
-index b430b38..41e9895 100644
---- a/kaffeine/src/input/dvb/dvbcam.cpp
-+++ b/kaffeine/src/input/dvb/dvbcam.cpp
-@@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device )
- 	int fdCa;
- 	ca_caps_t cap;
- 	ca_slot_info_t info;
--	TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device );
-+	TQString s = TQString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device );
- 
- 	if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) {
- 		fprintf(stderr, "DvbCam::probe(): %s:", s.ascii());
-@@ -413,11 +413,11 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint
- 	(void)session_number;
- 
- 	fprintf(stderr, "CAM Application type: %02x\n", application_type);
--	std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) );
-+	std->dvbcam->setAppType( TQString("0x%1").arg(application_type, 0, 16 ) );
- 	fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer);
--	std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) );
-+	std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) );
- 	fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code);
--	std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) );
-+	std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) );
- 	fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string);
- 	TQString s = (const char*)menu_string;
- 	s.truncate( menu_string_length );
-@@ -531,7 +531,7 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe
- 		fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text);
- 		s = (const char*)items[i].text;
- 		s.truncate( items[i].text_length );
--		std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) );
-+		std->menuList.append( TQString("%1. %2").arg(i+1).arg(s) );
- 
- 	}
- 
-diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
-index c920090..5f9e228 100644
---- a/kaffeine/src/input/dvb/dvbconfig.cpp
-+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
-@@ -187,10 +187,10 @@ bool DVBconfig::haveDvbDevice()
- 		d.setPath( "/dev/dvb/"+list[i]+"/" );
- 		flist = d.entryList( "frontend*", TQDir::System, TQDir::Name );
- 		for ( j=0; j<(int)flist.count(); j++ ) {
--			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR);
-+			fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR);
- 			if ( fdFrontend>0 ) {
- 				if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) )
--					perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() );
-+					perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() );
- 				else {
- 					close( fdFrontend );
- 					return true;
-@@ -229,7 +229,7 @@ void DVBconfig::startup()
- 			if ( !probeMfe && t!="frontend0" )
- 				continue;
- 			t1 = TQTime::currentTime();
--			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR);
-+			fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR);
- 			if ( fdFrontend>0 ) {
- 				if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) {
- 					if ( (info.type==FE_OFDM)
-@@ -247,7 +247,7 @@ void DVBconfig::startup()
- 				close( fdFrontend );
- 			}
- 			else {
--				perror( TQString("/dev/dvb/%1/%2  %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() );
-+				perror( TQString("/dev/dvb/%1/%2  %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() );
- 			}
- 		}
- 	}
-@@ -450,30 +450,30 @@ void DVBconfig::readConfig()
- 		shiftDir+= "/";
- 	filenameFormat = config->readEntry( "filenameFormat", "%name" );
- 	for ( i=0; i<(int)devList.count(); i++ ) {
--		devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" );
--		devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 );
--		devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 );
--		devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 );
-+		devList.at(i)->source = config->readEntry( TQString("DVB%1").arg(i), "" );
-+		devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").arg(i), 1500 );
-+		devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").arg(i), 1 );
-+		devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").arg(i), 10 );
- 		if ( devList.at(i)->type!=FE_QPSK )
- 			continue;
--		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 );
-+		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 );
- 		for ( j=0; j<devList.at(i)->numLnb; j++ ) {
--			devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 );
--			devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), 9750 );
--			devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), 10600 );
--			devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), 0 );
--			devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j) );
--			devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) );
--			devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), 2.5 );
--			devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), 1.5 );
-+			devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), 11700 );
-+			devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), 9750 );
-+			devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), 10600 );
-+			devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), 0 );
-+			devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j) );
-+			devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j) );
-+			devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), 2.5 );
-+			devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 );
- 		}
--		devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 );
--		devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 );
--		devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 );
-+		devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").arg(i), 0 );
-+		devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").arg(i), 0 );
-+		devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").arg(i), 0 );
- 	}
- 	j = config->readNumEntry( "NumCategories", 0 );
- 	for ( i=0; i<j; i++ )
--		categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) );
-+		categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) );
- 	allIcon = config->readEntry( "AllIcon", "kaffeine" );
- 	tvIcon = config->readEntry( "TvIcon", "kdvbtv" );
- 	radioIcon = config->readEntry( "RadioIcon", "kdvbra" );
-@@ -512,31 +512,31 @@ void DVBconfig::saveConfig()
- 	config->writeEntry( "SenderPort", senderPort );
- 	config->writeEntry( "ProbeMFE", probeMfe );
- 	for ( i=0; i<(int)devList.count(); i++ ) {
--		config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source );
--		config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout );
--		config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority );
--		config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService );
-+		config->writeEntry( TQString("DVB%1").arg(i), devList.at(i)->source );
-+		config->writeEntry( TQString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout );
-+		config->writeEntry( TQString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority );
-+		config->writeEntry( TQString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService );
- 		if ( devList.at(i)->type!=FE_QPSK )
- 			continue;
--		config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb );
-+		config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb );
- 		for ( j=0; j<devList.at(i)->numLnb; j++ ) {
--			config->writeEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), devList.at(i)->lnb[j].switchFreq );
--			config->writeEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), devList.at(i)->lnb[j].loFreq );
--			config->writeEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), devList.at(i)->lnb[j].hiFreq );
--			config->writeEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), devList.at(i)->lnb[j].rotorType );
--			config->writeEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j), devList.at(i)->lnb[j].source );
--			config->writeEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j), devList.at(i)->lnb[j].position );
--			config->writeEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed13v );
--			config->writeEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed18v );
-+			config->writeEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), devList.at(i)->lnb[j].switchFreq );
-+			config->writeEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), devList.at(i)->lnb[j].loFreq );
-+			config->writeEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), devList.at(i)->lnb[j].hiFreq );
-+			config->writeEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), devList.at(i)->lnb[j].rotorType );
-+			config->writeEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j), devList.at(i)->lnb[j].source );
-+			config->writeEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j), devList.at(i)->lnb[j].position );
-+			config->writeEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), devList.at(i)->lnb[j].speed13v );
-+			config->writeEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v );
- 		}
--		config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini );
--		config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice );
--		config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 );
-+		config->writeEntry( TQString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini );
-+		config->writeEntry( TQString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice );
-+		config->writeEntry( TQString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 );
- 	}
- 	config->writeEntry( "NumCategories", categories.count() );
- 	for ( i=0; i<(int)categories.count(); i++ ) {
--		config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name );
--		config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon );
-+		config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name );
-+		config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon );
- 	}
- 	config->writeEntry( "AllIcon", allIcon );
- 	config->writeEntry( "TvIcon", tvIcon );
-@@ -589,7 +589,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
- 	timeoutSpin.setAutoDelete( true );
- 
- 	for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
--		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
-+		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
- 			KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
- 		vb = new TQVBoxLayout( page, 6, 6 );
- 		gb = new TQGroupBox( "", page );
-diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
-index 1b54229..365b7ac 100644
---- a/kaffeine/src/input/dvb/dvbpanel.cpp
-+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
-@@ -307,7 +307,7 @@ void DvbPanel::diskStatus()
- 
- 	freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0));
- 	if ( freemb<300 )
--		emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 );
-+		emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 );
- }
- 
- 
-@@ -649,15 +649,15 @@ void DvbPanel::dumpEvents()
- 		for( i=0; i<events.getNSource(); i++ ) {
- 			if ( !(esrc=events.getNEventSource( i )) )
- 				continue;
--			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() );
-+			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() );
- 			for ( m=0; m<esrc->getNTsid(); m++ ) {
- 				if ( !(et=esrc->getNEventTsid( m )) )
- 					continue;
--				tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() );
-+				tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() );
- 				for ( n=0; n<et->getNSid(); n++ ) {
- 					if ( !(es=et->getNEventSid( n )) )
- 						continue;
--					tt << TQString("     SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() );
-+					tt << TQString("     SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() );
- 					k+= es->getNDesc();
- 				}
- 			}
-@@ -681,10 +681,10 @@ void DvbPanel::dumpEvents()
- 						if ( !(desc=esEvents->at( j )) )
- 							continue;
- 						tt << "Source: "+desc->source+"\n";
--						tt << TQString("Network ID: %1\n").tqarg(desc->nid);
--						tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid);
--						tt << TQString("Service ID: %1\n").tqarg(desc->sid);
--						tt << TQString("Event ID: %1\n").tqarg(desc->eid);
-+						tt << TQString("Network ID: %1\n").arg(desc->nid);
-+						tt << TQString("Transport Stream ID: %1\n").arg(desc->tsid);
-+						tt << TQString("Service ID: %1\n").arg(desc->sid);
-+						tt << TQString("Event ID: %1\n").arg(desc->eid);
- 						tt << "Title: "+desc->title+"\n";
- 						tt << "Subtitle: "+desc->subtitle+"\n";
- 						tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
-diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
-index cce9d0c..7fd8669 100644
---- a/kaffeine/src/input/dvb/dvbsi.cpp
-+++ b/kaffeine/src/input/dvb/dvbsi.cpp
-@@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf )
- 			desc->tp.tsid = tsid;
- 			desc->sid = sid;
- 			desc->pmtpid = pmt;
--			desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid);
-+			desc->name = TQString("TSID:%1-SID:%2").arg(tsid).arg(sid);
- 		}
- 	}
- 
-@@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid )
- 
- 		ChannelDesc *desc = new ChannelDesc();
- 		desc->tp.tsid = channel_tsid;
--		desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name);
-+		desc->name = TQString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name);
- 		desc->sid = program_number;
- 		if (access_controlled == 1)
- 			desc->fta = 1;
-diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
-index 4ef290b..be8ae7d 100644
---- a/kaffeine/src/input/dvb/dvbstream.cpp
-+++ b/kaffeine/src/input/dvb/dvbstream.cpp
-@@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
- 	fdFrontend = fdDvr = 0;
- 	ndmx = 0;
- 	currentTransponder = Transponder();
--	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
--	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
--	demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
-+	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
-+	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
-+	demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
- 
- 	out.setAutoDelete( true );
- 
-diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
-index 7898f84..07030e4 100644
---- a/kaffeine/src/input/dvb/kgradprogress.cpp
-+++ b/kaffeine/src/input/dvb/kgradprogress.cpp
-@@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress )
- {
- 	current = progress;
- 	draw();
--	tqrepaint(false);
-+	repaint(false);
- }
- 
- 
-diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
-index 44619b7..3c49848 100644
---- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
-+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
-@@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection()
- bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc )
- {
- 	struct dmx_sct_filter_params sctfilter;
--	TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner );
-+	TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner );
- 
- 	if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) {
- 		perror ("open failed");
-diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
-index 7f760e6..9b68d93 100644
---- a/kaffeine/src/input/dvb/scandialog.cpp
-+++ b/kaffeine/src/input/dvb/scandialog.cpp
-@@ -71,7 +71,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
- 		tmp = dvb->at(i)->getSources( true );
- 		for ( j=0; j<(int)tmp.count(); j++ ) {
- 			if ( tmp[j].startsWith( "AUTO" ) )
--				list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) );
-+				list.append( TQString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) );
- 			else
- 				list.append( tmp[j] );
- 		}
-@@ -614,25 +614,25 @@ bool ScanDialog::getTransData()
- 		int i;
- 		for ( i=177; i<227; i+=7 ) {
- 			if ( offset07->isChecked() ) {
--				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 );
-+				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 );
- 				parseTp( s, ds->getType(), "" );
- 			}
- 			if ( offset125p->isChecked() ) {
--				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 );
-+				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 );
- 				parseTp( s, ds->getType(), "" );
- 			}
- 		}
- 		for ( i=474; i<859; i+=8 ) {
- 			if ( offset167m->isChecked() ) {
--				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 );
-+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 );
- 				parseTp( s, ds->getType(), "" );
- 			}
- 			if ( offset0->isChecked() ) {
--				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 );
-+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 );
- 				parseTp( s, ds->getType(), "" );
- 			}
- 			if ( offset167p->isChecked() ) {
--				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 );
-+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 );
- 				parseTp( s, ds->getType(), "" );
- 			}
- 		}
-@@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
- 	int i;
- 	DListViewItem *it;
- 
--	it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name );
-+	it = new DListViewItem( foundList, chan, TQString( "%1").arg( chan->tp.snr ), chan->name );
- 
- 	if ( chan->type==1 ) {
- 		if ( scan )
-@@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
- 	}
- 
- 	if ( scan )
--		progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) );
-+		progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) );
- 	if ( chan->provider.isEmpty() )
- 		return;
- 	for ( i=0; i<providerComb->count(); i++ ) {
-diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
-index 8e2f412..0bc4a31 100644
---- a/kaffeine/src/instwizard.cpp
-+++ b/kaffeine/src/instwizard.cpp
-@@ -49,7 +49,7 @@
- 
- void InstWizard::internalWizard()
- {
--	setCaption(i18n("Kaffeine %1 Installation Wizard").tqarg(KAFFEINE_VERSION));
-+	setCaption(i18n("Kaffeine %1 Installation Wizard").arg(KAFFEINE_VERSION));
- 	resize(400,400);
- 
- 	/************** installation check ************************/
-@@ -79,7 +79,7 @@ void InstWizard::internalWizard()
- 	if (KDE::version() >= KDE_MAKE_VERSION(3,2,0))
- 		info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
- 	else
--		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").tqarg("3.2") << "</font>";
-+		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").arg("3.2") << "</font>";
- 
- 	//XINE-LIB
- 	//Should engine depending stuff be here?
-@@ -96,13 +96,13 @@ void InstWizard::internalWizard()
- 
- 		if ((major == 1) && (minor == 0) && (sub == 0) && (xineVersion.contains("rc", false)))
- 		{
--			info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
-+			info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
- 		}
- 		else
- 			info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
- 	}
- 	else
--		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0")
-+		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0")
- 		<< " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
- 	*/
- 	//WIN32-CODECS
-diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
-index 5b188da..9efebc9 100644
---- a/kaffeine/src/kaffeine.cpp
-+++ b/kaffeine/src/kaffeine.cpp
-@@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
- 	//createStandardStatusBarAction();
- 	createGUI("kaffeineui.rc");
- 
--	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").tqarg("0").tqarg("00:00:00").tqarg("0").tqarg("00:00:00"), 9, 0, true);
--	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").tqarg("0").tqarg("0:00:00"), 9, 0, true);
-+	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").arg("0").arg("00:00:00").arg("0").arg("00:00:00"), 9, 0, true);
-+	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
- 	//statusBar()->insertItem(i18n("No player"), 10, 0, true);
- 
- 	TQString stamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
-@@ -367,7 +367,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
- 	KService::Ptr service = KService::serviceByDesktopName(desktopName);
- 	if (!service)
- 	{
--		KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(TQString(desktopName)+ ".desktop"));
-+		KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop"));
- 		return;
- 	}
- 
-@@ -387,7 +387,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
- 		int error = 0;
- 		m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error);
- 		if (error > 0) {
--			KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(service->name()), KLibLoader::self()->lastErrorMessage());
-+			KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
- 		}
- 		else {
- 			connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&)));
-@@ -455,7 +455,7 @@ void Kaffeine::slotLoadingCanceled(const TQString& message)
- 		delete m_mediaPart;
- 		m_mediaPart = NULL;
- 	}
--	KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message);
-+	KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(name), message);
- }
- 
- void Kaffeine::slotPlaybackFailed()
-@@ -1439,7 +1439,7 @@ TQString Kaffeine::askForOtherDevice(const TQString& type)
- 	TQVBox* page = dialog->makeVBoxMainWidget();
- 	page->setSpacing(5);
- 	page->setMargin(5);
--	new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page);
-+	new TQLabel(i18n("No %1 in drive, or wrong path to device.").arg(type), page);
- 	new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page);
- 	DrivesCombo* drives = new DrivesCombo(page);
- 
-diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
-index 308bfa5..ecfa2c5 100644
---- a/kaffeine/src/kmultitabbar.cpp
-+++ b/kaffeine/src/kmultitabbar.cpp
-@@ -111,7 +111,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
- 		mainLayout->setAutoAdd(true);
- 
- 	}
--        viewport()->tqrepaint();
-+        viewport()->repaint();
- }
- 
- void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
-@@ -189,8 +189,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
- 
- void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
- /*	kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
--	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
--	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
-+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
-+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
- 	if (ev) TQScrollView::resizeEvent(ev);
- 
- 	if ( (m_style==KMultiTabBar::KDEV3) ||
-@@ -379,7 +379,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
- 	m_position=pos;
- 	for (uint i=0;i<m_tabs.count();i++)
- 		m_tabs.at(i)->setTabsPosition(m_position);
--	viewport()->tqrepaint();
-+	viewport()->repaint();
- }
- 
- 
-@@ -436,13 +436,13 @@ void KMultiTabBarButton::slotClicked()
- void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
- {
- 	m_position=pos;
--	tqrepaint();
-+	repaint();
- }
- 
- void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
- {
- 	m_style=style;
--	tqrepaint();
-+	repaint();
- }
- 
- void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
-@@ -528,7 +528,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
- 	}
- 
- 	setPosition(pos);
--//	tqrepaint();
-+//	repaint();
- }
- 
- void KMultiTabBarTab::setIcon(const TQString& icon)
-@@ -992,7 +992,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
- {
- 	for (uint i=0;i<tabs()->count();i++)
- 		tabs()->at(i)->resize();
--	tqrepaint();
-+	repaint();
- }
- 
- TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
-diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
-index 2255e67..fb6e7a3 100644
---- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
-@@ -737,7 +737,7 @@ void GStreamerPart::setAudioSink( TQString sinkName )
- {
- 	GstElement* sink = gst_element_factory_make(sinkName.ascii(), "audiosink");
- 	if ( !sink ) {
--		KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(sinkName).tqarg(m_audioSinkName));
-+		KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(sinkName).arg(m_audioSinkName));
- 		return;
- 	}
- 
-@@ -785,7 +785,7 @@ bool GStreamerPart::initGStreamer()
- 	 */
- 	m_audiosink = gst_element_factory_make( m_audioSinkName.ascii(), "audiosink" );
- 	if ( !m_audiosink ) {
--		KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").tqarg(m_audioSinkName));
-+		KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").arg(m_audioSinkName));
- 		if ( (m_audiosink = gst_element_factory_make("alsasink", "audiosink")) != NULL )
- 			kdDebug() << "GStreamerPart: Using audio-driver: alsasink" << endl;
- 		else {
-@@ -809,7 +809,7 @@ bool GStreamerPart::initGStreamer()
- 	 */
- 	m_videosink = gst_element_factory_make( m_videoSinkName.ascii(), "videosink" );
- 	if ( !m_videosink ) {
--		KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").tqarg(m_videoSinkName));
-+		KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").arg(m_videoSinkName));
- 		if ((m_videosink = gst_element_factory_make("xvimagesink", "videosink")) != NULL)
- 			kdDebug() << "GStreamerPart: Using video-driver: xvimagesink" << endl;
- 		else {
-diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-index eb6203f..96752aa 100644
---- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-@@ -134,7 +134,7 @@ void VideoWindow::newCapsset( const GstCaps *caps )
- 	TQSize frame = getFrameSize();
- 	correctByAspectRatio( frame );
- 	emit signalNewFrameSize( frame );
--	//set correct tqgeometry
-+	//set correct geometry
- 	setGeometry();
- }
- 
-@@ -177,7 +177,7 @@ void VideoWindow::newState()
- 	TQSize frame = getFrameSize();
- 	correctByAspectRatio( frame );
- 	emit signalNewFrameSize( frame );
--	//set correct tqgeometry
-+	//set correct geometry
- 	setGeometry();
- }
- 
-diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-index 58a9818..acc9937 100644
---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -153,14 +153,14 @@ KXineWidget::~KXineWidget()
- 	{
- 		debugOut("Unwire audio filters");
- 		unwireAudioFilters();
--		debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName ));
-+		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName ));
- 		delete m_visualPlugin;
- 		m_visualPlugin = NULL;
- 	}
- #else
- 	if (m_xinePost)
- 	{
--		debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
-+		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
- 		m_postAudioSource = xine_get_audio_source(m_xineStream);
- 		xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
- 		xine_post_dispose(m_xineEngine, m_xinePost);
-@@ -279,7 +279,7 @@ void KXineWidget::saveXineConfig()
- 		xine_config_update_entry (m_xineEngine, &config);
- 	}
- 
--	debugOut(TQString("Save xine config to: %1").tqarg(m_configFilePath));
-+	debugOut(TQString("Save xine config to: %1").arg(m_configFilePath));
- 	xine_config_save(m_xineEngine, m_configFilePath.ascii());
- }
- 
-@@ -331,7 +331,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
- 	/* frame size changed */
- 	if ( (video_width != vw->m_videoFrameWidth) || (video_height != vw->m_videoFrameHeight) )
- 	{
--		debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").tqarg(video_width).tqarg(video_height).tqarg(video_aspect));
-+		debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").arg(video_width).arg(video_height).arg(video_aspect));
- 		vw->m_videoFrameWidth = video_width;
- 		vw->m_videoFrameHeight = video_height;
- 		vw->m_videoAspect = video_aspect;
-@@ -343,7 +343,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
- 		{
- 			vw->m_newParentSize = vw->parentWidget()->size() - TQSize((vw->width() - video_width), vw->height() - video_height);
- 
--			debugOut(TQString("Resize video window to: %1x%2").tqarg(vw->m_newParentSize.width()).tqarg(vw->m_newParentSize.height()));
-+			debugOut(TQString("Resize video window to: %1x%2").arg(vw->m_newParentSize.width()).arg(vw->m_newParentSize.height()));
- 
- 			/* we should not do a resize() inside a xine thread,
- 			   but post an event to the main thread */
-@@ -391,7 +391,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
- 			channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
- 			for(i = 0; i < channels; i++)
- 			{
--				slang = TQString("%1.").tqarg(i+1);
-+				slang = TQString("%1.").arg(i+1);
- 				if (xine_get_audio_lang(vw->m_xineStream, i, lang))
- 					slang += lang;
- 				tmp << slang;
-@@ -415,7 +415,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
- 			channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_SPU_CHANNEL);
- 			for(i = 0; i<channels; i++)
- 			{
--				slang = TQString("%1.").tqarg(i+1);
-+				slang = TQString("%1.").arg(i+1);
- 				if (xine_get_spu_lang(vw->m_xineStream, i, lang))
- 					slang += lang;
- 				tmp << slang;
-@@ -472,7 +472,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
- 			debugOut("xine event: dropped frames");
- 			xine_dropped_frames_t* dropped = (xine_dropped_frames_t*)xineEvent->data;
- 
--			warningOut(TQString("Skipped frames: %1 - discarded frames: %2").tqarg(dropped->skipped_frames/10).tqarg(dropped->discarded_frames/10));
-+			warningOut(TQString("Skipped frames: %1 - discarded frames: %2").arg(dropped->skipped_frames/10).arg(dropped->discarded_frames/10));
- 
- 			break;
- 		}
-@@ -752,7 +752,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
- 			else
- 			{
- 				//restart
--				warningOut(TQString("Message: '%1' was blocked!").tqarg(m_xineMessage));
-+				warningOut(TQString("Message: '%1' was blocked!").arg(m_xineMessage));
- 				m_recentMessagesTimer.start(1500);
- 			}
- 			break;
-@@ -795,7 +795,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 
- 	int pos, time, length;
- 
--	debugOut(TQString("New video driver: %1").tqarg(entry->enum_values[entry->num_value]));
-+	debugOut(TQString("New video driver: %1").arg(entry->enum_values[entry->num_value]));
- 
- 	if (vw->m_osd)
- 	{
-@@ -835,7 +835,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 	vw->unwireAudioFilters();
- 	if (vw->m_visualPlugin)
- 	{
--		debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName));
-+		debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
- 		delete vw->m_visualPlugin;
- 		vw->m_visualPlugin = NULL;
- 	}
-@@ -855,7 +855,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 
- 	if (!vw->m_videoDriver)
- 	{
--		vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_videoDriverName);
-+		vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_videoDriverName);
- 		TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
- 		playing = false;
- 		vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine,
-@@ -869,7 +869,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 	else
- 	{
- 		vw->m_videoDriverName = entry->enum_values[entry->num_value];
--		vw->m_statusString = i18n("Using Video Driver: %1").tqarg(vw->m_videoDriverName);
-+		vw->m_statusString = i18n("Using Video Driver: %1").arg(vw->m_videoDriverName);
- 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
- 	}
- 
-@@ -902,7 +902,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 
- 	int pos, time, length;
- 
--	debugOut(TQString("New audio driver: %1").tqarg(entry->enum_values[entry->num_value]));
-+	debugOut(TQString("New audio driver: %1").arg(entry->enum_values[entry->num_value]));
- 
- 	if (vw->m_osd)
- 	{
-@@ -931,7 +931,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 	vw->unwireAudioFilters();
- 	if (vw->m_visualPlugin)
- 	{
--		debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName));
-+		debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
- 		delete vw->m_visualPlugin;
- 		vw->m_visualPlugin = NULL;
- 	}
-@@ -945,7 +945,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 
- 	if (!vw->m_audioDriver)
- 	{
--		vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_audioDriverName);
-+		vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_audioDriverName);
- 		TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
- 		playing = false;
- 		vw->m_audioDriver = xine_open_audio_driver(vw->m_xineEngine, vw->m_audioDriverName.ascii(), NULL);
-@@ -953,7 +953,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
- 	else
- 	{
- 		vw->m_audioDriverName = entry->enum_values[entry->num_value];
--		vw->m_statusString = i18n("Using Audio Driver: %1").tqarg(vw->m_audioDriverName);
-+		vw->m_statusString = i18n("Using Audio Driver: %1").arg(vw->m_audioDriverName);
- 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
- 	}
- 
-@@ -1148,18 +1148,18 @@ bool KXineWidget::initXine()
- 		int count = 1;
- 		debugOut("Xinerama extension present");
- 		XineramaQueryScreens(x11Display(), &count);
--		debugOut(TQString("%1 screens detected").tqarg(count));
-+		debugOut(TQString("%1 screens detected").arg(count));
- 		if (count > 1)
- 			// multihead -> assuming square pixels
- 			m_displayRatio = 1.0;
- 	}
- #endif
- 
--	debugOut(TQString("Display aspect ratio (v/h): %1").tqarg(m_displayRatio));*/
-+	debugOut(TQString("Display aspect ratio (v/h): %1").arg(m_displayRatio));*/
- 
- 	/**** INIT XINE ENGINE ****/
- 
--	debugOut(TQString("Using xine version %1").tqarg(xine_get_version_string()));
-+	debugOut(TQString("Using xine version %1").arg(xine_get_version_string()));
- 
- 	m_xineEngine = xine_new();
- 	if (!m_xineEngine)
-@@ -1209,7 +1209,7 @@ bool KXineWidget::initXine()
- 	else
- 		m_audioDriverName = m_audioChoices[i];
- 
--	debugOut(TQString("Use audio driver %1").tqarg(m_audioDriverName));
-+	debugOut(TQString("Use audio driver %1").arg(m_audioDriverName));
- 
- 	drivers = xine_list_video_output_plugins(m_xineEngine);
- 	i = 0;
-@@ -1235,7 +1235,7 @@ bool KXineWidget::initXine()
- 	else
- 		m_videoDriverName = m_videoChoices[i];
- 
--	debugOut(TQString("Use video driver %1").tqarg(m_videoDriverName));
-+	debugOut(TQString("Use video driver %1").arg(m_videoDriverName));
- 
- 	m_mixerInfo = strdup(i18n("Use software audio mixer").local8Bit());
- 	m_softwareMixer = (bool)xine_config_register_bool(m_xineEngine, "audio.mixer_software", 1, m_mixerInfo,
-@@ -1307,7 +1307,7 @@ bool KXineWidget::initXine()
- 
- 	if (!m_videoDriver && m_videoDriverName != "auto")
- 	{
--		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").tqarg(m_videoDriverName));
-+		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").arg(m_videoDriverName));
- 		m_videoDriverName = "auto";
- 		m_videoDriver = xine_open_video_driver(m_xineEngine,
- #ifndef HAVE_XCB
-@@ -1331,7 +1331,7 @@ bool KXineWidget::initXine()
- 
- 	if (!m_audioDriver && m_audioDriverName != "auto")
- 	{
--		emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").tqarg(m_audioDriverName));
-+		emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").arg(m_audioDriverName));
- 		m_audioDriverName = "auto";
- 		m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL);
- 	}
-@@ -1395,12 +1395,12 @@ void KXineWidget::initOSD()
- 	{
- 		if (!xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]))
- 		{
--			debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").tqarg(m_osdFont));
-+			debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").arg(m_osdFont));
- 			free(m_osdFont);
- 			m_osdFont = strdup("sans");
- 			xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]);
- 		}
--		debugOut(TQString("Font for OSD: %1").tqarg(m_osdFont));
-+		debugOut(TQString("Font for OSD: %1").arg(m_osdFont));
- 		xine_osd_set_text_palette(m_osd, XINE_TEXTPALETTE_WHITE_BLACK_TRANSPARENT, XINE_OSD_TEXT1);
- 		m_osdUnscaled = (xine_osd_get_capabilities(m_osd) & XINE_OSD_CAP_UNSCALED);
- 		if (m_osdUnscaled)
-@@ -1428,7 +1428,7 @@ bool KXineWidget::playDvb()
- 	{
- 		if (!m_visualPlugin)
- 		{
--			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
- 			m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
- 		}
- 
-@@ -1438,7 +1438,7 @@ bool KXineWidget::playDvb()
- 	{
- 		if (m_visualPlugin)
- 		{
--			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
- 			delete m_visualPlugin;
- 			m_visualPlugin = NULL;
- 		}
-@@ -1978,7 +1978,7 @@ void KXineWidget::slotPlay()
- 	if ( turl.startsWith("/") )
- 		turl.prepend("file://");
- 
--	debugOut(TQString("Playing: %1").tqarg(turl.local8Bit().data()));
-+	debugOut(TQString("Playing: %1").arg(turl.local8Bit().data()));
- 
- 	xine_set_param( m_xineStream, XINE_PARAM_METRONOM_PREBUFFER, 12000 );
- 	if (!xine_open(m_xineStream, TQFile::encodeName(turl))) {
-@@ -2002,7 +2002,7 @@ void KXineWidget::slotPlay()
- 	{
- 		if (m_visualPluginName && (!m_xinePost))
- 		{
--			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
- 			m_xinePost = xine_post_init(m_xineEngine, m_visualPluginName, 0,
- 			                            &m_audioDriver,
- 			                            &m_videoDriver);
-@@ -2016,7 +2016,7 @@ void KXineWidget::slotPlay()
- 	{
- 		if (m_xinePost)
- 		{
--			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
- 			m_postAudioSource = xine_get_audio_source(m_xineStream);
- 			xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
- 			xine_post_dispose(m_xineEngine, m_xinePost);
-@@ -2248,7 +2248,7 @@ void KXineWidget::sendXineError()
- 	else
- 	{
- 		errorOut(error);
--		errorOut(TQString("Can't play: %1 - trying next").tqarg(m_trackURL));
-+		errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL));
- 		TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
- 	}
- }
-@@ -2290,7 +2290,7 @@ void KXineWidget::showOSDMessage(const TQString& message, uint duration, int pri
- 		return;
- 	prevOsdPriority = priority;
- 
--	//debugOut(TQString("OSD: draw text: %1").tqarg(message));
-+	//debugOut(TQString("OSD: draw text: %1").arg(message));
- 	xine_osd_clear(m_osd);
- 	xine_osd_draw_text(m_osd, 0, 0, message.local8Bit(), XINE_OSD_TEXT1);
- 
-@@ -2348,7 +2348,7 @@ void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent)
- 	wireVideoFilters();
- #else
- 	parent = parent;
--	warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name));
-+	warningOut(TQString("Not implemented [CreateVideoFilter %1]").arg(name));
- #endif
- }
- 
-@@ -2364,7 +2364,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
- 	wireAudioFilters();
- #else
- 	parent = parent;
--	warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name));
-+	warningOut(TQString("Not implemented [CreateAudioFilter %1]").arg(name));
- #endif
- }
- 
-@@ -2478,7 +2478,7 @@ void KXineWidget::wireAudioFilters()
- 	{
- 		if (!m_visualPlugin)
- 		{
--			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
- 			m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
- 		}
- 
-@@ -2488,7 +2488,7 @@ void KXineWidget::wireAudioFilters()
- 	{
- 		if (m_visualPlugin)
- 		{
--			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
-+			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
- 			delete m_visualPlugin;
- 			m_visualPlugin = NULL;
- 		}
-@@ -2571,7 +2571,7 @@ TQStringList KXineWidget::getVisualPlugins() const
- void KXineWidget::slotSetVisualPlugin(const TQString& visual)
- {
- 	if (m_visualPluginName == visual) return;
--	debugOut(TQString("New visualization plugin: %1").tqarg(visual));
-+	debugOut(TQString("New visualization plugin: %1").arg(visual));
- 
- #ifndef USE_TQT_ONLY
- 	unwireAudioFilters();
-@@ -2660,7 +2660,7 @@ void KXineWidget::slotSetVolume(int vol)
- 	if (!isXineReady()) return;
- 	if (m_softwareMixer)
- 	{
--		//debugOut(TQString("Set software amplification level: %1").tqarg(vol));
-+		//debugOut(TQString("Set software amplification level: %1").arg(vol));
- 		if (m_volumeGain)
- 			xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2);
- 		else
-@@ -2668,7 +2668,7 @@ void KXineWidget::slotSetVolume(int vol)
- 	}
- 	else
- 	{
--		//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol));
-+		//debugOut(TQString("Set audio mixer volume: %1").arg(vol));
- 		xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
- 	}
- 	emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
-@@ -2872,7 +2872,7 @@ void KXineWidget::slotStop()
- 
- void KXineWidget::slotSetAudiocdDevice(const TQString& device)
- {
--	debugOut(TQString("Set AudioCD device to %1").tqarg(device));
-+	debugOut(TQString("Set AudioCD device to %1").arg(device));
- 
- 	xine_cfg_entry_t config;
- 	xine_config_lookup_entry(m_xineEngine, "input.cdda_device", &config);
-@@ -2884,7 +2884,7 @@ void KXineWidget::slotSetAudiocdDevice(const TQString& device)
- 
- void KXineWidget::slotSetVcdDevice(const TQString& device)
- {
--	debugOut(TQString("Set VCD device to %1").tqarg(device));
-+	debugOut(TQString("Set VCD device to %1").arg(device));
- 
- 	xine_cfg_entry_t config;
- 	xine_config_lookup_entry(m_xineEngine, "input.vcd_device", &config);
-@@ -2896,7 +2896,7 @@ void KXineWidget::slotSetVcdDevice(const TQString& device)
- 
- void KXineWidget::slotSetDvdDevice(const TQString& device)
- {
--	debugOut(TQString("Set DVD device to %1").tqarg(device));
-+	debugOut(TQString("Set DVD device to %1").arg(device));
- 
- 	xine_cfg_entry_t config;
- 	xine_config_lookup_entry(m_xineEngine, "input.dvd_device", &config);
-@@ -2966,7 +2966,7 @@ void KXineWidget::setStreamSaveDir(const TQString& dir)
- 
- 	if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */
- 
--	debugOut(TQString("Set misc.save_dir to: %1").tqarg(dir));
-+	debugOut(TQString("Set misc.save_dir to: %1").arg(dir));
- 	config.str_value = TQFile::encodeName(dir).data();
- 	xine_config_update_entry (m_xineEngine, &config);
- }
-@@ -2982,7 +2982,7 @@ const TQString KXineWidget::getStreamSaveDir()
- 
- void KXineWidget::setBroadcasterPort(const uint port)
- {
--	debugOut(TQString("Set broadcaster port to %1").tqarg(port));
-+	debugOut(TQString("Set broadcaster port to %1").arg(port));
- 	xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port);
- }
- 
-@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4);
- 			m_currentSpeed = Fast2;
--			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2"));
-+			emit signalXineStatus(i18n("Fast Forward %1").arg("x2"));
- 			break;
- 		}
- 		case Fast2:
-@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
- 			m_currentSpeed = Slow1;
--			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
- 			break;
- 		}
- 		default:
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
- 			m_currentSpeed = Fast1;
--			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
- 			break;
- 		}
- 	}
-@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
- 			m_currentSpeed = Slow2;
--			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2"));
-+			emit signalXineStatus(i18n("Slow Motion %1").arg("x2"));
- 			break;
- 		}
- 		case Slow2:
-@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
- 			m_currentSpeed = Fast1;
--			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
- 			break;
- 		}
- 		default:
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
- 			m_currentSpeed = Slow1;
--			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
- 			break;
- 		}
- 	}
-@@ -3093,14 +3093,14 @@ TQString KXineWidget::getSupportedExtensions() const
- 
- void KXineWidget::slotSetAudioChannel(int ch)
- {
--	debugOut(TQString("Switch to audio channel %1").tqarg(ch-1));
-+	debugOut(TQString("Switch to audio channel %1").arg(ch-1));
- 	xine_set_param(m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, ch-1);
- }
- 
- 
- void KXineWidget::slotSetSubtitleChannel(int ch)
- {
--	debugOut(TQString("Switch to subtitle channel %1").tqarg(ch-1));
-+	debugOut(TQString("Switch to subtitle channel %1").arg(ch-1));
- 	xine_set_param(m_xineStream, XINE_PARAM_SPU_CHANNEL, ch-1);
- }
- 
-@@ -3306,7 +3306,7 @@ void KXineWidget::slotSetDeinterlaceConfig(const TQString& config)
- 	if (m_deinterlaceFilter)
- 		m_deinterlaceFilter->setConfig(config);
- #else
--	warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").tqarg(config));
-+	warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").arg(config));
- #endif
- }
- 
-@@ -3318,7 +3318,7 @@ void KXineWidget::slotToggleDeinterlace()
- 	if (m_deinterlaceFilter)
- 	{
- 		m_deinterlaceEnabled = !m_deinterlaceEnabled;
--		debugOut(TQString("Deinterlace enabled: %1").tqarg(m_deinterlaceEnabled));
-+		debugOut(TQString("Deinterlace enabled: %1").arg(m_deinterlaceEnabled));
- 		if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on");
- 		else s = i18n("Deinterlace: off");
- 		showOSDMessage( s, 2000 );
-@@ -3786,7 +3786,7 @@ TQImage KXineWidget::getScreenshot() const
- 	else
- 		height = (int)((double) height / scaleFactor + 0.5);
- 
--	debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").tqarg(screenShot.width()).tqarg(screenShot.height()).tqarg(width).tqarg(height));
-+	debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").arg(screenShot.width()).arg(screenShot.height()).arg(width).arg(height));
- 	screenShot = screenShot.smoothScale(width, height);
- 
- 	delete []rgbPile;
-@@ -3849,7 +3849,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
- 		break;
- 		default:
- 		{
--			warningOut(TQString("Screenshot: Format %1 not supportet!").tqarg((char*)&format));
-+			warningOut(TQString("Screenshot: Format %1 not supportet!").arg((char*)&format));
- 			delete [] yuv;
- 			return;
- 		}
-@@ -3880,7 +3880,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
- 	      desired_ratio = 4.0 / 3.0;
- 	      break;
- 	    default:
--	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").tqarg(ratio));
-+	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio));
- 	    case XINE_VO_ASPECT_STQUARE:
- 	      debugOut("Screenshot: got video aspect: 1:1");
- 	      desired_ratio = image_ratio;
-@@ -3888,7 +3888,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
- 	  }
- 	*/
- 
--	debugOut(TQString("Screenshot: using scale factor: %1").tqarg(m_videoAspect));
-+	debugOut(TQString("Screenshot: using scale factor: %1").arg(m_videoAspect));
- 	scaleFactor = m_videoAspect;
- 
- 	delete [] yuv;
-diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-index f9b3fb1..1b9c123 100644
---- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-@@ -304,7 +304,7 @@ void XinePart::slotPlay(bool forcePlay)
- 	{
- 		TQString sub;
- 		if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1))
--			sub = TQString("#subtitle:%1").tqarg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
-+			sub = TQString("#subtitle:%1").arg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
- 
- 		m_xine->clearQueue();
- 		m_xine->appendToQueue(mrl.url() + sub );
-@@ -786,7 +786,7 @@ void XinePart::slotNewPosition(int pos, const TQTime& playtime)
- 		}
- 		else
- 		{
--			timeMessage = i18n("%1 of %2").tqarg(calcLength.toString("h:mm:ss")).tqarg(length.toString("h:mm:ss"));
-+			timeMessage = i18n("%1 of %2").arg(calcLength.toString("h:mm:ss")).arg(length.toString("h:mm:ss"));
- 			m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY);
- 		}
- 	}
-@@ -1623,7 +1623,7 @@ void XinePart::audiocdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQS
- 	for (uint i = 0; i < list.count(); i++)
- 	{
- 		mrl = MRL(list[i]);
--		mrl.setTitle(i18n("AudioCD Track %1").tqarg(i+1));
-+		mrl.setTitle(i18n("AudioCD Track %1").arg(i+1));
- 		mrl.setTrack(TQString::number(i+1));
- 		if (xine_open(xineStreamForMeta, TQFile::encodeName(mrl.url())))
- 		{
-@@ -1698,7 +1698,7 @@ void XinePart::vcdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQStrin
- 		mrl = MRL(list[i]);
- 		mrl.setMime("video/vcd");
- 		mrl.setTrack(TQString::number(i+1));
--		mrl.setTitle(i18n("VCD Track %1").tqarg(i+1));
-+		mrl.setTitle(i18n("VCD Track %1").arg(i+1));
- 		mrls.append(mrl);
- 	}
- 	if (mrls.count())
-diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-index 74076e4..6d6a2d4 100644
---- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-@@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) :
- 		else
- 			icon = "edit";
- 
--		xineFrame = addPage(*it, i18n("%1 Options").tqarg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
-+		xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
- 		                    KIcon::SizeMedium));
- 		xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint());
- 		tabWidget = new TQTabWidget(xineFrame);
-diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
-index a86696e..67948a9 100644
---- a/kaffeine/src/startwindow.cpp
-+++ b/kaffeine/src/startwindow.cpp
-@@ -113,7 +113,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
- 	//f.setPointSize( f.pointSize()+2 );
- 	//f.setBold(true);
- 	//btn->setFont( f );
--	btn->setTextLabel( TQString("&%1 %2").tqarg(buttons.count() + 1).tqarg(uiName));
-+	btn->setTextLabel( TQString("&%1 %2").arg(buttons.count() + 1).arg(uiName));
- 	TQToolTip::add(btn, uiName);
- 	btn->setTextPosition( TQToolButton::Under );
- 	btn->setUsesTextLabel( true );
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch
deleted file mode 100644
index a60af902e..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch
+++ /dev/null
@@ -1,643 +0,0 @@
-commit 66805bafb9e1db535090dd74f6bdc56c2ac431c0
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497848 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
-index e67603e..c48cf28 100644
---- a/kaffeine/src/input/audiobrowser/playlist.cpp
-+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
-@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget
-     CoverPopup(const TQPixmap &image, const TQPoint &p) :
-         TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
-     {
--        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-+        TQHBoxLayout *layout = new TQHBoxLayout(this);
-         TQLabel *label = new TQLabel(this);
- 
--        tqlayout->addWidget(label);
-+        layout->addWidget(label);
-         label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-         label->setLineWidth(1);
-         label->setPixmap(image);
-@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
- 	kdDebug() << "PLAYLIST" << endl;
- 
--	TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 );
-+	TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
- 
- 	m_list = new UrlListView(playlist);
- 	mainWidget->setAcceptDrops(true);
-@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	m_list->setRenameable(TRACK_COLUMN);
- 	m_list->setAllColumnsShowFocus(true);
- 	m_list->setShowSortIndicator(true);
--	tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1);
-+	layout->addMultiCellWidget(m_list, 3, 3, 0, 1);
- 
- 	coverFrame = new CoverFrame( playlist );
- 	coverFrame->setFixedWidth( 80 );
- 	coverFrame->setFixedHeight( 80 );
--	tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
-+	layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
- 
- 	TQHBoxLayout *h1 = new TQHBoxLayout();
- 	searchBtn = new TQToolButton( playlist );
-@@ -397,7 +397,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	m_playlistFilter = new KLineEdit(playlist);
- 	m_playlistFilter->setFocusPolicy(TQ_ClickFocus);
- 	h1->addWidget(m_playlistFilter);
--	tqlayout->addLayout( h1, 2, 1 );
-+	layout->addLayout( h1, 2, 1 );
- 
- 	TQHBoxLayout *h2 = new TQHBoxLayout();
- 	TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist);
-@@ -410,10 +410,10 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
- 	TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'."));
- 	h2->addWidget(m_playlistSelector);
--	tqlayout->addLayout( h2, 1, 1 );
-+	layout->addLayout( h2, 1, 1 );
- 
- 	roller = new RollTitle( playlist );
--	tqlayout->addWidget( roller, 0, 1 );
-+	layout->addWidget( roller, 0, 1 );
- 
- 	KAccel* accel = new KAccel(mainWidget);
- 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
-@@ -2145,7 +2145,7 @@ void PlayList::slotPaste()
- 
- 	TQStrList list;
- 
--	if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list))
-+	if (TQUriDrag::decode(TQApplication::clipboard()->data(), list))
- 	{
- 		TQStringList urls;
- 		for (TQStrListIterator it(list); *it; ++it)
-@@ -2155,7 +2155,7 @@ void PlayList::slotPaste()
- 	}
- 	/** try to decode as text **/
- 	TQString text;
--	if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text))
-+	if (TQTextDrag::decode(TQApplication::clipboard()->data(), text))
- 	{
- 		add(text, lastSelected);
- 	}
-@@ -2173,7 +2173,7 @@ void PlayList::slotCopy()
- 		urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
- 	}
- 
--	TQApplication::tqclipboard()->setData(new TQUriDrag(urlList));
-+	TQApplication::clipboard()->setData(new TQUriDrag(urlList));
- }
- 
- void PlayList::slotSelectAll()
-diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
-index 1d163d3..30bbe54 100644
---- a/kaffeine/src/input/disc/paranoiasettings.ui
-+++ b/kaffeine/src/input/disc/paranoiasettings.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -174,7 +174,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-index d956e5b..03485cf 100644
---- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout5</cstring>
-+                <cstring>layout5</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -51,7 +51,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget" row="0" column="0">
-                             <property name="name">
--                                <cstring>tqlayout7</cstring>
-+                                <cstring>layout7</cstring>
-                             </property>
-                             <hbox>
-                                 <property name="name">
-@@ -117,7 +117,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-index b243300..f414545 100644
---- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout9</cstring>
-+                <cstring>layout9</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -107,7 +107,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui
-index 1131eec..ab94806 100644
---- a/kaffeine/src/input/dvb/audioeditorui.ui
-+++ b/kaffeine/src/input/dvb/audioeditorui.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout24</cstring>
-+                <cstring>layout24</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout23</cstring>
-+                        <cstring>layout23</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -60,7 +60,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout21</cstring>
-+                                <cstring>layout21</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -68,7 +68,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout16</cstring>
-+                                        <cstring>layout16</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -76,7 +76,7 @@
-                                         </property>
-                                         <widget class="TQLayoutWidget">
-                                             <property name="name">
--                                                <cstring>tqlayout15</cstring>
-+                                                <cstring>layout15</cstring>
-                                             </property>
-                                             <vbox>
-                                                 <property name="name">
-@@ -146,7 +146,7 @@
-                                 </spacer>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout14</cstring>
-+                                        <cstring>layout14</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -154,7 +154,7 @@
-                                         </property>
-                                         <widget class="TQLayoutWidget">
-                                             <property name="name">
--                                                <cstring>tqlayout13</cstring>
-+                                                <cstring>layout13</cstring>
-                                             </property>
-                                             <vbox>
-                                                 <property name="name">
-@@ -258,7 +258,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout19</cstring>
-+                        <cstring>layout19</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui
-index 9463cee..c255575 100644
---- a/kaffeine/src/input/dvb/camdialog.ui
-+++ b/kaffeine/src/input/dvb/camdialog.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout5</cstring>
-+                <cstring>layout5</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui
-index f6b5a00..022993a 100644
---- a/kaffeine/src/input/dvb/cammenudialog.ui
-+++ b/kaffeine/src/input/dvb/cammenudialog.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -34,7 +34,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout6</cstring>
-+                        <cstring>layout6</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui
-index ceb3d62..add07e2 100644
---- a/kaffeine/src/input/dvb/channeleditorui.ui
-+++ b/kaffeine/src/input/dvb/channeleditorui.ui
-@@ -35,7 +35,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -43,7 +43,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -83,7 +83,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -138,7 +138,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout6</cstring>
-+                        <cstring>layout6</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -261,7 +261,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout7</cstring>
-+                                        <cstring>layout7</cstring>
-                                     </property>
-                                     <grid>
-                                         <property name="name">
-@@ -642,7 +642,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout14</cstring>
-+                        <cstring>layout14</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui
-index 87baff7..5441bee 100644
---- a/kaffeine/src/input/dvb/crontimerui.ui
-+++ b/kaffeine/src/input/dvb/crontimerui.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout13</cstring>
-+                <cstring>layout13</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout12</cstring>
-+                        <cstring>layout12</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -54,7 +54,7 @@
-                         </spacer>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout11</cstring>
-+                                <cstring>layout11</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -271,7 +271,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout9</cstring>
-+                        <cstring>layout9</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui
-index dbcff8b..654e762 100644
---- a/kaffeine/src/input/dvb/scandialogui.ui
-+++ b/kaffeine/src/input/dvb/scandialogui.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout9</cstring>
-+                <cstring>layout9</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -129,7 +129,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout7</cstring>
-+                                <cstring>layout7</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -487,7 +487,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout9</cstring>
-+                        <cstring>layout9</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui
-index fb8d391..857cdc5 100644
---- a/kaffeine/src/input/dvb/subeditorui.ui
-+++ b/kaffeine/src/input/dvb/subeditorui.ui
-@@ -35,7 +35,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="2" column="0">
-             <property name="name">
--                <cstring>tqlayout19</cstring>
-+                <cstring>layout19</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -70,7 +70,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout13</cstring>
-+                <cstring>layout13</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -101,7 +101,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout12</cstring>
-+                        <cstring>layout12</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -109,7 +109,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout16</cstring>
-+                                <cstring>layout16</cstring>
-                             </property>
-                             <hbox>
-                                 <property name="name">
-@@ -117,7 +117,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout15</cstring>
-+                                        <cstring>layout15</cstring>
-                                     </property>
-                                     <vbox>
-                                         <property name="name">
-@@ -187,7 +187,7 @@
-                         </spacer>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout11</cstring>
-+                                <cstring>layout11</cstring>
-                             </property>
-                             <hbox>
-                                 <property name="name">
-@@ -195,7 +195,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout13</cstring>
-+                                        <cstring>layout13</cstring>
-                                     </property>
-                                     <vbox>
-                                         <property name="name">
-@@ -232,7 +232,7 @@
-                                         </property>
-                                         <widget class="TQLayoutWidget">
-                                             <property name="name">
--                                                <cstring>tqlayout10</cstring>
-+                                                <cstring>layout10</cstring>
-                                             </property>
-                                             <vbox>
-                                                 <property name="name">
-@@ -274,7 +274,7 @@
-                                         </widget>
-                                         <widget class="TQLayoutWidget">
-                                             <property name="name">
--                                                <cstring>tqlayout9</cstring>
-+                                                <cstring>layout9</cstring>
-                                             </property>
-                                             <vbox>
-                                                 <property name="name">
-diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
-index 9efebc9..10bd4be 100644
---- a/kaffeine/src/kaffeine.cpp
-+++ b/kaffeine/src/kaffeine.cpp
-@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent()
- 		}
- }
- 
--/** slots for meta to tqunicode encoding **/
-+/** slots for meta to unicode encoding **/
- 
- void Kaffeine::slotUseAlternateEncoding(bool useEncoding)
- {
-diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
-index ecfa2c5..4ff1154 100644
---- a/kaffeine/src/kmultitabbar.cpp
-+++ b/kaffeine/src/kmultitabbar.cpp
-@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const
-     }
- #endif
-     if ( isMenuButton() )
--        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-+        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
- 
-     if ( pixmap() ) {
-         TQPixmap *pm = (TQPixmap *)pixmap();
-@@ -493,7 +493,7 @@ TQSize KMultiTabBarButton::sizeHint() const
-             h = TQMAX(h, sz.height());
-     }
- 
--    return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
-+    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
-             expandedTo(TQApplication::globalStrut()));
- }
- 
-diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-index dd843f5..ccb56f3 100644
---- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
-@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
- 	setInitialSize(TQSize(400,300), true);
- 
- 	TQFrame* frame = NULL;
--	TQGridLayout* tqlayout = NULL;
-+	TQGridLayout* layout = NULL;
- 	TQLabel* label = NULL;
- 
- 	//Audio Page
- 	frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel,
- 	                KIcon::SizeMedium));
--	tqlayout = new TQGridLayout(frame, 10, 2);
--	tqlayout->setMargin(10);
--	tqlayout->setSpacing(10);
-+	layout = new TQGridLayout(frame, 10, 2);
-+	layout->setMargin(10);
-+	layout->setSpacing(10);
- 	m_audioDriverBox = new KComboBox(frame);
- 	m_audioDriverBox->insertStringList(audioDrivers);
- 	label = new TQLabel(i18n("Prefered audio driver"), frame);
--	tqlayout->addWidget(label, 1, 0);
--	tqlayout->addWidget(m_audioDriverBox, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addWidget(label, 1, 0);
-+	layout->addWidget(m_audioDriverBox, 1, 1);
-+	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
- 
- 	//Video Page
- 	frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
- 	                KIcon::SizeMedium));
--	tqlayout = new TQGridLayout(frame, 10, 2);
--	tqlayout->setMargin(10);
--	tqlayout->setSpacing(10);
-+	layout = new TQGridLayout(frame, 10, 2);
-+	layout->setMargin(10);
-+	layout->setSpacing(10);
- 	m_videoDriverBox = new KComboBox(frame);
- 	m_videoDriverBox->insertStringList(videoDrivers);
- 	label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
--	tqlayout->addWidget(label, 1, 0);
--	tqlayout->addWidget(m_videoDriverBox, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
--	tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
-+	layout->addWidget(label, 1, 0);
-+	layout->addWidget(m_videoDriverBox, 1, 1);
-+	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
- 
- 	//Media page
- 	frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel,
- 	                KIcon::SizeMedium));
--	tqlayout = new TQGridLayout(frame, 10, 2);
--	tqlayout->setMargin(10);
--	tqlayout->setSpacing(10);
-+	layout = new TQGridLayout(frame, 10, 2);
-+	layout->setMargin(10);
-+	layout->setSpacing(10);
- 	m_driveEdit = new KLineEdit(frame);
- 	label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
--	tqlayout->addWidget(label, 1, 0);
--	tqlayout->addWidget(m_driveEdit, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	layout->addWidget(label, 1, 0);
-+	layout->addWidget(m_driveEdit, 1, 1);
-+	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
- }
- 
- GStreamerConfig::~GStreamerConfig()
-diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-index 1b9c123..98ff969 100644
---- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl)
- 			if (firstLine.contains("smil", false))
- 			{
- 				kdDebug() << "XinePart: Try loading smil playlist\n";
--				if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
-+				if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
- 				{
- 					if (!PlaylistImport::smil(localFile, m_mrl, m_playlist))
- 					{
-@@ -1240,7 +1240,7 @@ void XinePart::slotInfo()
- 	if (m_xine->hasSaveURL())
- 		ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>";
- 
--	ts << "<tr><td></td><td></td></tr>"; // added for better tqlayout
-+	ts << "<tr><td></td><td></td></tr>"; // added for better layout
- 	ts << "</table></qt>";
- 	KMessageBox::information(0, info, i18n("Track info") );
- }
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch
deleted file mode 100644
index 84d5945b8..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch
+++ /dev/null
@@ -1,2103 +0,0 @@
-commit 60ed202f8065829574473fdfc20f53281d274ceb
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253348 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
-index 9c418a1..3735b61 100644
---- a/kaffeine/src/input/audiobrowser/playlist.cpp
-+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
-@@ -75,14 +75,14 @@
- 
- RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
- {
--	TQColorGroup cg = parentWidget()->tqcolorGroup();
-+	TQColorGroup cg = parentWidget()->colorGroup();
- 	TQColor base = cg.base();
- 	TQColor selection = cg.highlight();
- 	int r = (base.red() + selection.red()) / 2;
- 	int b = (base.blue() + selection.blue()) / 2;
- 	int g = (base.green() + selection.green()) / 2;
- 	back = TQColor(r, g, b);
--	fore = parentWidget()->tqcolorGroup().text();
-+	fore = parentWidget()->colorGroup().text();
- 	setPaletteBackgroundColor( back );
- 	setPaletteForegroundColor( fore );
- 	setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-@@ -115,7 +115,7 @@ void RollTitle::setTitle( TQString t )
- {
- 	TQLabel *lab = new TQLabel( t, this );
- 	lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
--	lab->resize( lab->tqsizeHint() );
-+	lab->resize( lab->sizeHint() );
- 	int x = 2*lab->frameWidth();
- 	titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim );
- 	delete lab;
-@@ -149,7 +149,7 @@ void RollTitle::rollTitle()
- void RollTitle::paintEvent( TQPaintEvent *pe )
- {
- 	TQLabel::paintEvent( pe );
--	TQColorGroup cg = parentWidget()->tqcolorGroup();
-+	TQColorGroup cg = parentWidget()->colorGroup();
- 	TQColor base = cg.base();
- 	TQColor selection = cg.highlight();
- 	int r = (base.red() + selection.red()) / 2;
-@@ -157,7 +157,7 @@ void RollTitle::paintEvent( TQPaintEvent *pe )
- 	int g = (base.green() + selection.green()) / 2;
- 	back=TQColor(r,g,b);
- 	setPaletteBackgroundColor( back );
--	fore = parentWidget()->tqcolorGroup().text();
-+	fore = parentWidget()->colorGroup().text();
- 	setPaletteForegroundColor( fore );
- 	setTitle( title );
- }
-@@ -283,7 +283,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	google = NULL;
- 
- 	mainWidget = new TQVBox( parent );
--	//mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
-+	//mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
- 	hSplit = new TQSplitter( mainWidget );
- 	hSplit->setOpaqueResize( true );
- 	panel = new TQVBox( hSplit );
-@@ -404,7 +404,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
- 	h2->addWidget(playlistLabel);
- 	m_playlistSelector = new KComboBox( playlist );
- 	m_playlistSelector->setMinimumWidth(10);
--	m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
-+	m_playlistSelector->setSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
- 	m_playlistSelector->setEditable(true);
- 	m_playlistSelector->setDuplicatesEnabled(false);
- 	m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
-@@ -706,7 +706,7 @@ MRL PlayList::getCurrent()
- 	if (isQueueMode())
- 	{
- 		m_queue.clear();
--		updatetqStatus();
-+		updateStatus();
- 	}
- 
- 	if (m_random)
-@@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl )
- 	{
- 		mrl = m_queue.first();
- 		m_queue.remove(m_queue.begin());
--		updatetqStatus();
-+		updateStatus();
- 		return true;
- 	}
- 
-@@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl )
- 	if (isQueueMode())
- 	{
- 		m_queue.clear();
--		updatetqStatus();
-+		updateStatus();
- 	}
- 
- 	if (!m_currentEntry) {
-@@ -1349,7 +1349,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
- 
- 	delete progress;
- 	if (m_random) createRandomList();
--	updatetqStatus();
-+	updateStatus();
- }
- 
- void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
-@@ -1357,7 +1357,7 @@ void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
- 	TQValueList<MRL>::ConstIterator end(mrlList.end());
- 	for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it)
- 		after = insertItem(after, *it);
--	updatetqStatus();
-+	updateStatus();
- 	if (m_random) createRandomList();
- }
- 
-@@ -1419,7 +1419,7 @@ void PlayList::clearList()
- 		m_playlistFilter->clear();
- 		m_searchSelection = false;
- 	}
--	updatetqStatus();
-+	updateStatus();
- 	m_currentEntry = NULL;
- 	m_currentRandomListEntry = -1;
- }
-@@ -1435,7 +1435,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
- 		{
- 			for (uint i=0; i < urls.count() ;i++)
- 			{
--				//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i]));
-+				//KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
- 				//newurls << url.path(-1);
- 				//kdDebug() << "PlayList: Dropped " << url.path() << endl;
- 				newurls << urls[i];
-@@ -1453,7 +1453,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
- 	else
- 		if (strcmp(dev->format(), "text/x-moz-url") == 0)    /* for mozilla drops */
- 		{
--			TQByteArray data = dev->tqencodedData("text/plain");
-+			TQByteArray data = dev->encodedData("text/plain");
- 			TQString md(data);
- 			add(md, after);
- 		}
-@@ -1602,7 +1602,7 @@ void PlayList::mergeMeta(const MRL& mrl)
- 			if (tmp->isVisible())
- 				m_playTimeVisible += timeStringToMs(tmp->length());
- 
--			updatetqStatus();
-+			updateStatus();
- 		}
- 	}
- 
-@@ -1762,10 +1762,10 @@ void PlayList::slotRemoveSelected()
- 	}
- 
- 	if (m_random) createRandomList();
--	updatetqStatus();
-+	updateStatus();
- }
- 
--void PlayList::updatetqStatus()
-+void PlayList::updateStatus()
- {
- 	TQString status;
- 	if (isQueueMode())
-@@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const TQString& text)
- 		m_searchSelection = true;
- 
- 	if (m_random) createRandomList();
--	updatetqStatus();
-+	updateStatus();
- }
- 
- 
-@@ -2170,7 +2170,7 @@ void PlayList::slotCopy()
- 
- 	for (uint i=0; i<selected.count(); i++)
- 	{
--		urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
-+		urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
- 	}
- 
- 	TQApplication::tqclipboard()->setData(new TQUriDrag(urlList));
-@@ -2209,7 +2209,7 @@ void PlayList::slotPlaylistFromSelected()
- void PlayList::slotAddToQueue(MRL mrl)
- {
- 	m_queue.append(mrl);
--	updatetqStatus();
-+	updateStatus();
- }
- 
- /**** helper ****/
-diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
-index 7f0a89a..7be7a6d 100644
---- a/kaffeine/src/input/audiobrowser/playlist.h
-+++ b/kaffeine/src/input/audiobrowser/playlist.h
-@@ -239,7 +239,7 @@ private slots:
- 
- private:
- 	TQListViewItem* insertItem(TQListViewItem* after, const MRL&);
--	void updatetqStatus();
-+	void updateStatus();
- 	void createRandomList();
- 	void getMetaInfo(MRL& mrl, const TQString& mimeName);
- 	void setupActions();
-diff --git a/kaffeine/src/input/audiobrowser/playlistitem.cpp b/kaffeine/src/input/audiobrowser/playlistitem.cpp
-index 813f5c2..fe5a494 100644
---- a/kaffeine/src/input/audiobrowser/playlistitem.cpp
-+++ b/kaffeine/src/input/audiobrowser/playlistitem.cpp
-@@ -249,10 +249,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
- {
- 	if (isCurrent)
- 	{
--		TQColorGroup tqcolorGroup = cg;
-+		TQColorGroup colorGroup = cg;
- 
--		TQColor base = tqcolorGroup.base();
--		TQColor selection = tqcolorGroup.highlight();
-+		TQColor base = colorGroup.base();
-+		TQColor selection = colorGroup.highlight();
- 
- 		int r = (base.red() + selection.red()) / 2;
- 		int b = (base.blue() + selection.blue()) / 2;
-@@ -260,8 +260,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
- 
- 		TQColor c(r, g, b);
- 
--		tqcolorGroup.setColor(TQColorGroup::Base, c);
--		TQListViewItem::paintCell(p, tqcolorGroup, column, width, align);
-+		colorGroup.setColor(TQColorGroup::Base, c);
-+		TQListViewItem::paintCell(p, colorGroup, column, width, align);
- 	}
- 	else
- 		return KListViewItem::paintCell(p, cg, column, width, align);
-diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
-index 62dc3a5..e392dca 100644
---- a/kaffeine/src/input/disc/disc.cpp
-+++ b/kaffeine/src/input/disc/disc.cpp
-@@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
- void MLabel::paintEvent( TQPaintEvent *pe )
- {
- 	TQLabel::paintEvent( pe );
--	TQColorGroup cg = parentWidget()->tqcolorGroup();
-+	TQColorGroup cg = parentWidget()->colorGroup();
- 	TQColor base = cg.base();
- 	TQColor selection = cg.highlight();
- 	int r = (base.red() + selection.red()) / 2;
-@@ -76,22 +76,22 @@ void MListView::resizeEvent( TQResizeEvent *rev )
- Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
- {
- 	mainWidget = new TQVBox( parent );
--	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
-+	mainWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
- 	split = new TQSplitter( mainWidget );
- 	split->setOpaqueResize( true );
- 	widg = new TQWidget( split );
- 	widg->setMinimumWidth( 200 );
--	widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
-+	widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
- 	TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 );
- 	discLab = new MLabel( widg );
- 	wb->addWidget( discLab );
- 	playerBox = new TQVBox( widg );
- 	wb->addWidget( playerBox );
- 	playerBox->setMinimumWidth( 200 );
--	playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
-+	playerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
- 	panel = new TQFrame( split );
- 	split->moveToFirst( panel );
--	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
-+	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
- 	split->setResizeMode( panel, TQSplitter::KeepSize );
- 
- 	TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 );
-@@ -99,13 +99,13 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
- 	cdBtn->setTextLabel( i18n("Play CD") );
- 	cdBtn->setTextPosition( TQToolButton::Under );
- 	cdBtn->setUsesTextLabel( true );
--	cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
-+	cdBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
- 	TQToolTip::add( cdBtn, i18n("Play CD"));
- 	ripBtn = new TQToolButton( panel );
- 	ripBtn->setTextLabel( i18n("Rip CD") );
- 	ripBtn->setTextPosition( TQToolButton::Under );
- 	ripBtn->setUsesTextLabel( true );
--	ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
-+	ripBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
- 	TQToolTip::add( ripBtn, i18n("Rip CD"));
- 
- 	TQHBoxLayout *h1 = new TQHBoxLayout();
-@@ -124,7 +124,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
- 	artistLab = new TQLabel( "", panel );
- 	artistLab->setLineWidth(1);
- 	artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
--	artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
-+	artistLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
- 	h1->addWidget( artistLab );
- 	vb->addLayout( h1 );
- 	h1 = new TQHBoxLayout();
-@@ -132,7 +132,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
- 	albumLab = new TQLabel( "", panel );
- 	albumLab->setLineWidth(1);
- 	albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
--	albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
-+	albumLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
- 	h1->addWidget( albumLab );
- 	vb->addLayout( h1 );
- 
-@@ -161,7 +161,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
- 	enc->setTextPosition( TQToolButton::Under );
- 	enc->setUsesTextLabel( true );
- 	enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
--	enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-+	enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
- 	vb->addWidget( encodeWidget );
- 	encodeWidget->hide();
-diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
-index e20c98f..1d163d3 100644
---- a/kaffeine/src/input/disc/paranoiasettings.ui
-+++ b/kaffeine/src/input/disc/paranoiasettings.ui
-@@ -165,7 +165,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>60</height>
-@@ -190,7 +190,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>152</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-index 09a2a87..d956e5b 100644
---- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
-@@ -108,7 +108,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>16</height>
-@@ -133,7 +133,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>107</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-index b07342a..b243300 100644
---- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
-@@ -98,7 +98,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>81</height>
-@@ -123,7 +123,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>157</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui
-index 2324983..1131eec 100644
---- a/kaffeine/src/input/dvb/audioeditorui.ui
-+++ b/kaffeine/src/input/dvb/audioeditorui.ui
-@@ -118,7 +118,7 @@
-                                             <property name="sizeType">
-                                                 <enum>Expanding</enum>
-                                             </property>
--                                            <property name="tqsizeHint">
-+                                            <property name="sizeHint">
-                                                 <size>
-                                                     <width>40</width>
-                                                     <height>20</height>
-@@ -137,7 +137,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>20</width>
-                                             <height>40</height>
-@@ -274,7 +274,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui
-index 86da4cf..a0939a2 100644
---- a/kaffeine/src/input/dvb/broadcasteditorui.ui
-+++ b/kaffeine/src/input/dvb/broadcasteditorui.ui
-@@ -117,7 +117,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>20</width>
-                                             <height>20</height>
-@@ -150,7 +150,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>20</width>
-                                             <height>20</height>
-@@ -244,7 +244,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui
-index 24abfbb..ceb3d62 100644
---- a/kaffeine/src/input/dvb/channeleditorui.ui
-+++ b/kaffeine/src/input/dvb/channeleditorui.ui
-@@ -72,7 +72,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-@@ -633,7 +633,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>166</height>
-@@ -666,7 +666,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>150</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui
-index 5b7a3bd..87baff7 100644
---- a/kaffeine/src/input/dvb/crontimerui.ui
-+++ b/kaffeine/src/input/dvb/crontimerui.ui
-@@ -45,7 +45,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>32</width>
-                                     <height>20</height>
-@@ -138,7 +138,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>20</width>
-                                             <height>67</height>
-@@ -157,7 +157,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>39</width>
-                                     <height>20</height>
-@@ -243,7 +243,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>32</width>
-                                     <height>20</height>
-@@ -262,7 +262,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>95</height>
-@@ -295,7 +295,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>177</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp
-index b842018..a777f79 100644
---- a/kaffeine/src/input/dvb/dvbevents.cpp
-+++ b/kaffeine/src/input/dvb/dvbevents.cpp
-@@ -170,7 +170,7 @@ bool DVBevents::tableEIT( unsigned char* buffer )
- 	TQPtrList<EventDesc> *currentEvents;
- 	bool nodesc, parse;
- 	TQDateTime start, cur, dt;
--	unsigned int cdt = TQDateTime::tqcurrentDateTime().toTime_t();
-+	unsigned int cdt = TQDateTime::currentDateTime().toTime_t();
- 
- 	tid = getBits(buf,0,8);
- 	length = getBits(buf,12,12);
-@@ -298,7 +298,7 @@ ifend:
- 		if ( parse )
- 			++(desc->sn);
- 		if ( nodesc ) {
--			cur = TQDateTime::tqcurrentDateTime();
-+			cur = TQDateTime::currentDateTime();
- 			dt = desc->startDateTime;
- 			sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second();
- 			if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) {
-diff --git a/kaffeine/src/input/dvb/dvbout.cpp b/kaffeine/src/input/dvb/dvbout.cpp
-index bd94126..1f392a8 100644
---- a/kaffeine/src/input/dvb/dvbout.cpp
-+++ b/kaffeine/src/input/dvb/dvbout.cpp
-@@ -402,7 +402,7 @@ bool DVBout::goRec( const TQString &name, int maxsize, RecTimer *t )
- 
- 	haveRec = true;
- 	if ( recTimer ) {
--		TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().secsTo(recTimer->begin) );
-+		TQTime t = recTimer->duration.addSecs( TQDateTime::currentDateTime().secsTo(recTimer->begin) );
- 		stopRecTimer.start( TQTime().msecsTo( t ), true );
- 	}
- 	else
-diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
-index 3623d7f..1b54229 100644
---- a/kaffeine/src/input/dvb/dvbpanel.cpp
-+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
-@@ -114,7 +114,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	dvb.setAutoDelete( true );
- 
- 	mainWidget = new TQVBox( parent );
--	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
-+	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
- 	split = new TQSplitter( mainWidget );
- 	split->setOpaqueResize( true );
- 	pbox = new TQVBox( split );
-@@ -129,7 +129,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	iconView->setSpacing(0);
- 	iconView->setItemsMovable(false);
- 	iconView->setResizeMode(TQIconView::Adjust);
--	iconView->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
-+	iconView->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- 	playerBox = new TQVBox( pbox );
- 	playerBox->setMinimumWidth( 200 );
- 	panel = new TQFrame( split );
-@@ -192,7 +192,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	channelsCb->addColumn( i18n("Name") );
- 	channelsCb->addColumn( i18n("Source") );
- 	channelsCb->setAllColumnsShowFocus( true );
--	channelsCb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
-+	channelsCb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
- 	//channelsCb->setEnabled( false );
- 	vb->addWidget( channelsCb );
- 
-@@ -209,14 +209,14 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	h1 = new TQHBoxLayout();
- 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- 	shiftLed = new KLed( panel );
--	shiftLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-+	shiftLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- 	shiftLed->setDarkFactor( 500 );
- 	shiftLed->off();
- 	TQToolTip::add( shiftLed, i18n("Time shifting") );
- 	h1->addWidget( shiftLed );
- 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- 	recordLed = new KLed( panel );
--	recordLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-+	recordLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- 	recordLed->setColor( TQColor( 255,0,0 ) );
- 	recordLed->setDarkFactor( 500 );
- 	recordLed->off();
-@@ -224,7 +224,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	h1->addWidget( recordLed );
- 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- 	broadcastLed = new KLed( panel );
--	broadcastLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-+	broadcastLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
- 	broadcastLed->setColor( TQColor( 255,128,0 ) );
- 	broadcastLed->setDarkFactor( 500 );
- 	broadcastLed->off();
-@@ -272,7 +272,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
- 	connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) );
- 	connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) );
- 	connect( &stopTuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) );
--	connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disktqStatus()) );
-+	connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(diskStatus()) );
- 
- 	setConfig();
- 
-@@ -295,7 +295,7 @@ void DvbPanel::togglePanel()
- 
- 
- 
--void DvbPanel::disktqStatus()
-+void DvbPanel::diskStatus()
- {
- 	double freemb;
- 	struct statvfs buf;
-@@ -644,7 +644,7 @@ void DvbPanel::dumpEvents()
- 	if ( f.open(IO_WriteOnly|IO_Truncate) ) {
- 		fprintf( stderr, "Creating events file.\n");
- 		TQTextStream tt( &f );
--		tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
-+		tt << "Saved: "+TQDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
- 		k= 0;
- 		for( i=0; i<events.getNSource(); i++ ) {
- 			if ( !(esrc=events.getNEventSource( i )) )
-@@ -956,7 +956,7 @@ void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* =
- 			s = s+" - ";
- 			s = s+desc->title;
- 			if ( !osdMode && !first && !myshift ) {
--				TQDateTime dt = TQDateTime::tqcurrentDateTime();
-+				TQDateTime dt = TQDateTime::currentDateTime();
- 				int secs = desc->startDateTime.secsTo( dt );
- 				i = TQTime().secsTo( desc->duration );
- 				if ( i!=0 )
-@@ -1131,7 +1131,7 @@ void DvbPanel::camClicked( int devNum )
- 
- 
- 
--TQPtrList<Transponder> DvbPanel::getSourcestqStatus()
-+TQPtrList<Transponder> DvbPanel::getSourcesStatus()
- {
- 	int i, j;
- 	TQStringList list;
-@@ -1163,7 +1163,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch )
- 	ChannelDesc *chan;
- 	KListViewItem *it, *visible=0;
- 	bool cont=false;
--	TQPtrList<Transponder> trans = getSourcestqStatus();
-+	TQPtrList<Transponder> trans = getSourcesStatus();
- 	trans.setAutoDelete( true );
- 
- 	searchLE->clear();
-@@ -1320,7 +1320,7 @@ void DvbPanel::checkTimers()
- 	bool live=false;
- 	RecTimer *t;
- 	ChannelDesc *chan;
--	TQDateTime cur=TQDateTime::tqcurrentDateTime();
-+	TQDateTime cur=TQDateTime::currentDateTime();
- 	DvbStream *d;
- 
- 	for ( i=0; i<(int)timers.count(); i++ ) {
-@@ -1409,13 +1409,13 @@ void DvbPanel::setRecord()
- 		if ( !dvbConfig->filenameFormat.contains("%chan") )
- 			s = curchan.name;
- 		if ( !dvbConfig->filenameFormat.contains("%date") )
--			s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" );
-+			s+="_"+TQDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" );
- 	}
- 
- 	rt = new RecTimer();
- 	rt->name = s;
- 	rt->channel = curchan.name;
--	rt->begin = TQDateTime::tqcurrentDateTime();
-+	rt->begin = TQDateTime::currentDateTime();
- 	rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ;
- 	rt->running = 1;
- 	rt->mode = 0;
-@@ -2074,7 +2074,7 @@ void DvbPanel::pauseLiveTV()
- 	if ( !d )
- 		return;
- 
--	timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().toString("yyyyMMddThhmmss")+".m2t";
-+	timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::currentDateTime().toString("yyyyMMddThhmmss")+".m2t";
- 	if ( d->doPause( timeShiftFileName ) )
- 		emit setTimeShiftFilename( timeShiftFileName );
- }
-diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
-index d126bb6..4dbf554 100644
---- a/kaffeine/src/input/dvb/dvbpanel.h
-+++ b/kaffeine/src/input/dvb/dvbpanel.h
-@@ -154,7 +154,7 @@ public slots:
- 
- 	void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration );
- 	int getSNR( int device );
--	void disktqStatus();
-+	void diskStatus();
- 	void camClicked( int devNum );
- 
- private:
-@@ -163,7 +163,7 @@ private:
- 	bool getTimerList();
- 	bool saveTimerList();
- 	void fillChannelList( ChannelDesc *ch=0 );
--	TQPtrList<Transponder> getSourcestqStatus();
-+	TQPtrList<Transponder> getSourcesStatus();
- 	void updateModeTimer( RecTimer *t );
- 	DvbStream* getWorkingDvb( int mode, ChannelDesc *chan );
- 
-diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
-index b3ca31d..4ef290b 100644
---- a/kaffeine/src/input/dvb/dvbstream.cpp
-+++ b/kaffeine/src/input/dvb/dvbstream.cpp
-@@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
- 	cam = NULL;
- 	plug = NULL;
- 
--	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) );
-+	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) );
- }
- 
- 
-@@ -221,7 +221,7 @@ bool DvbStream::closeFe()
- 
- 
- 
--void DvbStream::connecttqStatus( bool con )
-+void DvbStream::connectStatus( bool con )
- {
- 	if ( con )
- 		statusTimer.start( 1000 );
-@@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o )
- 
- 
- 
--bool DvbStream::checktqStatus()
-+bool DvbStream::checkStatus()
- {
- 	int32_t strength;
- 	fe_status_t festatus;
-@@ -887,19 +887,19 @@ bool DvbStream::checktqStatus()
- 
-        strength=0;
- 	ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength);
--	emit signaltqStatus(strength*100/65535);
-+	emit signalStatus(strength*100/65535);
- 
- 	strength=0;
- 	ioctl(fdFrontend,FE_READ_SNR,&strength);
--	emit snrtqStatus(strength*100/65535);
-+	emit snrStatus(strength*100/65535);
- 
- 	memset( &festatus, 0, sizeof(festatus) );
- 	ioctl(fdFrontend,FE_READ_STATUS,&festatus);
- 
- 	if (festatus & FE_HAS_LOCK)
--		emit locktqStatus( true );
-+		emit lockStatus( true );
- 	else {
--		emit locktqStatus( false );
-+		emit lockStatus( false );
- 		ret = false;
- 	}
- 
-@@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend()
- 
- void DvbStream::setScanning( bool b )
- {
--	connecttqStatus( b );
-+	connectStatus( b );
- }
- 
- 
-diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h
-index f793aa0..1d2d780 100644
---- a/kaffeine/src/input/dvb/dvbstream.h
-+++ b/kaffeine/src/input/dvb/dvbstream.h
-@@ -99,7 +99,7 @@ public :
- 
- public slots:
- 
--	bool checktqStatus();
-+	bool checkStatus();
- 	void receivePlayDvb();
- 	void recordEnded( DVBout *o, RecTimer *t, bool kill );
- 	void receiveShifting( bool b );
-@@ -125,7 +125,7 @@ private :
- 	void startReading();
- 	bool openFe();
- 	bool closeFe();
--	void connecttqStatus( bool con );
-+	void connectStatus( bool con );
- 
- 	TQFile liveFile;
- 	bool timeShifting;
-@@ -157,9 +157,9 @@ signals:
- 	void timerEnded(RecTimer*);
- 
- 	void errorMsg( TQString );
--	void snrtqStatus( int );
--	void signaltqStatus( int );
--	void locktqStatus( bool );
-+	void snrStatus( int );
-+	void signalStatus( int );
-+	void lockStatus( bool );
- 	void shifting( bool );
- 
- };
-diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
-index d81f671..7898f84 100644
---- a/kaffeine/src/input/dvb/kgradprogress.cpp
-+++ b/kaffeine/src/input/dvb/kgradprogress.cpp
-@@ -34,7 +34,7 @@ KGradProgress::KGradProgress( TQWidget *parent ) : TQLabel( parent )
- 	setFrameStyle( TQFrame::Box | TQFrame::Plain );
- 	setLineWidth(1);
- 	setMidLineWidth(0);
--	tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
-+	setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
- }
- 
- 
-@@ -113,7 +113,7 @@ void KGradProgress::paintEvent(TQPaintEvent *event)
- 
- 
- 
--TQSize KGradProgress::tqsizeHint()
-+TQSize KGradProgress::sizeHint()
- {
- 	TQLabel lab( "This is a progress bar.", 0 );
- 	return TQSize( lab.width(), int(font().pointSize()*1.2) );
-diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h
-index 887019d..84aeee0 100644
---- a/kaffeine/src/input/dvb/kgradprogress.h
-+++ b/kaffeine/src/input/dvb/kgradprogress.h
-@@ -37,7 +37,7 @@ public:
- 	KGradProgress( TQWidget *parent );
- 	~KGradProgress();
- 	virtual void paintEvent(TQPaintEvent *event);
--	virtual TQSize tqsizeHint();
-+	virtual TQSize sizeHint();
- 	virtual TQSizePolicy sizePolicy();
- 
- public slots:
-diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp
-index c66c5d1..be5c5af 100644
---- a/kaffeine/src/input/dvb/ktimereditor.cpp
-+++ b/kaffeine/src/input/dvb/ktimereditor.cpp
-@@ -85,7 +85,7 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
- 	channelComb->insertStringList( chanList );
- 
- 	if ( newone ) {
--		begin->setDateTime( TQDateTime::tqcurrentDateTime() );
-+		begin->setDateTime( TQDateTime::currentDateTime() );
- 		duration->setTime( TQTime(2,0,0) );
- 	}
- 	else {
-diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
-index f05ff3a..ea00f76 100644
---- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
-+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
-@@ -297,7 +297,7 @@ void EventTable::loadEpg()
- 	char buf[EPGBUFSIZE];
- 	int num=0;
- 	unsigned char sync;
--	TQDateTime cur=TQDateTime::tqcurrentDateTime();
-+	TQDateTime cur=TQDateTime::currentDateTime();
- 	TQTime t1=TQTime::currentTime();
- 
- 	if ( epgLoaded )
-@@ -416,7 +416,7 @@ void EventTable::run()
- 
- 	setpriority(PRIO_PROCESS, 0, 19);
- 
--	cur = TQDateTime::tqcurrentDateTime();
-+	cur = TQDateTime::currentDateTime();
- 	for( k=0; k<getNSource(); k++ ) {
- 		if ( !(esrc=getNEventSource( k )) )
- 			continue;
-diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
-index f433054..7f760e6 100644
---- a/kaffeine/src/input/dvb/scandialog.cpp
-+++ b/kaffeine/src/input/dvb/scandialog.cpp
-@@ -148,9 +148,9 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
- 		offsetGroup->hide();
- 	bool ok=false;
- 	dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
--	connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
--	connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
--	connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
-+	connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
-+	connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
-+	connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
- 	connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
- 
- 	connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) );
-@@ -209,9 +209,9 @@ void ScanDialog::setDvb( int index )
- 				checkTimer.stop();
- 			if ( progressTimer.isActive() )
- 				progressTimer.stop();
--			disconnect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
--			disconnect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
--			disconnect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
-+			disconnect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
-+			disconnect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
-+			disconnect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
- 			disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
- 			ds->setScanning( false );
- 			dvbsi->stop();
-@@ -219,9 +219,9 @@ void ScanDialog::setDvb( int index )
- 			ds = dvb->at(i);
- 			ds->setScanning( true );
- 			dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
--			connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
--			connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
--			connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
-+			connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
-+			connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
-+			connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
- 			connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
- 			break;
- 		}
-diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui
-index d85d58f..dbcff8b 100644
---- a/kaffeine/src/input/dvb/scandialogui.ui
-+++ b/kaffeine/src/input/dvb/scandialogui.ui
-@@ -118,7 +118,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>40</width>
-                                             <height>20</height>
-@@ -257,7 +257,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>20</width>
-                                             <height>18</height>
-@@ -282,7 +282,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>21</width>
-                                             <height>19</height>
-@@ -503,7 +503,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui
-index 3935e78..fb8d391 100644
---- a/kaffeine/src/input/dvb/subeditorui.ui
-+++ b/kaffeine/src/input/dvb/subeditorui.ui
-@@ -51,7 +51,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -159,7 +159,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>40</width>
-                                             <height>20</height>
-@@ -178,7 +178,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>180</height>
-diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
-index 19e82ed..ede428f 100644
---- a/kaffeine/src/input/dvbclient/cdwidget.cpp
-+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
-@@ -33,14 +33,14 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
- 	: KaffeineInput( objParent, name )
- {
- 	mainWidget = new TQVBox( parent );
--	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
-+	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
- 	split = new TQSplitter( mainWidget );
- 	split->setOpaqueResize( true );
- 	playerBox = new TQVBox( split );
- 	playerBox->setMinimumWidth( 200 );
- 	channelsLb = new TQListBox( split );
- 	split->moveToFirst( channelsLb );
--	channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
-+	channelsLb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
- 	split->setResizeMode( channelsLb, TQSplitter::KeepSize );
- 
- 	cdAddress = ad;
-@@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV()
- 	if ( !dump )
- 		return;
- 	if ( dump->running() ) {
--		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts";
-+		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::currentDateTime().toString( Qt::ISODate )+".ts";
- 		if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName );
- 	}
- }
-diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp
-index 0e9dcdf..a110a0a 100644
---- a/kaffeine/src/inputmanager.cpp
-+++ b/kaffeine/src/inputmanager.cpp
-@@ -323,7 +323,7 @@ bool InputManager::playbackFinished( MRL &mrl )
- 
- void InputManager::statusBarMessage( const TQString &msg )
- {
--	kaffeine->slotChangePlaylisttqStatus( msg );
-+	kaffeine->slotChangePlaylistStatus( msg );
- }
- 
- 
-@@ -530,13 +530,13 @@ void InputManager::fullscreen( bool b )
- 	int id=0;
- 
- 	if ( b ) {
--		stack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
-+		stack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
- 		oldMainWidget = currentMainWidget;
- 		show( 2 );
- 		mtBar->hide();
- 	}
- 	else {
--		stack->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
-+		stack->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
- 		mtBar->show();
- 		if ( oldMainWidget==startWindow )
- 			id = 1;
-@@ -578,7 +578,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
- 		{
- 			for (uint i=0; i < urls.count() ;i++)
- 			{
--				//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i]));
-+				//KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
- 				//newurls << url.path(-1);
- 				//kdDebug() << "Kaffeine: Dropped " << url.path() << endl;
- 				newurls << urls[i];
-@@ -596,7 +596,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
- 	else
- 		if (strcmp(dev->format(), "text/x-moz-url") == 0)    // for mozilla drops
- 		{
--			TQByteArray data = dev->tqencodedData("text/plain");
-+			TQByteArray data = dev->encodedData("text/plain");
- 			TQString md(data);
- 			emit signalURLDropEvent(md);
- 		}
-diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
-index c8cca22..8e2f412 100644
---- a/kaffeine/src/instwizard.cpp
-+++ b/kaffeine/src/instwizard.cpp
-@@ -272,7 +272,7 @@ void InstWizard::internalWizard()
- 
- void InstWizard::slotStdout(KProcess *, char *buffer, int buflen)
- {
--	TQString output = TQString::tqfromLatin1(buffer, buflen);
-+	TQString output = TQString::fromLatin1(buffer, buflen);
- 	kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
- 	stdout.append(output);
- }
-diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
-index 9a83567..5b188da 100644
---- a/kaffeine/src/kaffeine.cpp
-+++ b/kaffeine/src/kaffeine.cpp
-@@ -653,7 +653,7 @@ void Kaffeine::dropEvent(TQDropEvent* dev)
-   else
-   if (strcmp(dev->format(), "text/x-moz-url") == 0)    // for mozilla drops
-   {
--    TQByteArray data = dev->tqencodedData("text/plain");
-+    TQByteArray data = dev->encodedData("text/plain");
-     TQString md(data);
-     load(md);
-   }
-@@ -1087,7 +1087,7 @@ void Kaffeine::slotOpenFile()
- 	KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)"));
- 
- 	for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it)
--		if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false))
-+		if ((*it).isLocalFile() && (*it).path().endsWith(".iso", false))
- 			(*it).setProtocol("dvd");
- 
- 	TQStringList urlList = kurlList.toStringList();
-@@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& )
- }
- 
- 
--void Kaffeine::slotChangePlaylisttqStatus(const TQString& )
-+void Kaffeine::slotChangePlaylistStatus(const TQString& )
- {
- 	//statusBar()->changeItem(text, 9);
- }
-diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h
-index 79ad0cc..4496d93 100644
---- a/kaffeine/src/kaffeine.h
-+++ b/kaffeine/src/kaffeine.h
-@@ -128,7 +128,7 @@ public slots:
- 	void slotLoadURLS(const TQStringList&);
- 	void slotSwitchToPlayerWindow();
- 	void slotChangeStatusbar(const TQString&);
--	void slotChangePlaylisttqStatus(const TQString&);
-+	void slotChangePlaylistStatus(const TQString&);
- 	void slotStop();
- 	void slotPlayUnPause();
- 
-diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
-index 1c32cae..308bfa5 100644
---- a/kaffeine/src/kmultitabbar.cpp
-+++ b/kaffeine/src/kmultitabbar.cpp
-@@ -121,9 +121,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
- 	if (m_position==KMultiTabBar::Right)
- 	{
- 
--                paint->setPen(tqcolorGroup().shadow());
-+                paint->setPen(colorGroup().shadow());
-                 paint->drawLine(0,0,0,viewport()->height());
--                paint->setPen(tqcolorGroup().background().dark(120));
-+                paint->setPen(colorGroup().background().dark(120));
-                 paint->drawLine(1,0,1,viewport()->height());
- 
- 
-@@ -131,28 +131,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
- 	else
- 	if (m_position==KMultiTabBar::Left)
- 	{
--                paint->setPen(tqcolorGroup().light());
-+                paint->setPen(colorGroup().light());
- 		paint->drawLine(23,0,23,viewport()->height());
-                 paint->drawLine(22,0,22,viewport()->height());
- 
--                paint->setPen(tqcolorGroup().shadow());
-+                paint->setPen(colorGroup().shadow());
-                 paint->drawLine(0,0,0,viewport()->height());
- 	}
- 	else
- 	if (m_position==KMultiTabBar::Bottom)
- 	{
--		paint->setPen(tqcolorGroup().shadow());
-+		paint->setPen(colorGroup().shadow());
- 		paint->drawLine(0,0,viewport()->width(),0);
--                paint->setPen(tqcolorGroup().background().dark(120));
-+                paint->setPen(colorGroup().background().dark(120));
-                 paint->drawLine(0,1,viewport()->width(),1);
- 	}
- 	else
- 	{
--	        paint->setPen(tqcolorGroup().light());
-+	        paint->setPen(colorGroup().light());
- 		paint->drawLine(0,23,viewport()->width(),23);
-                 paint->drawLine(0,22,viewport()->width(),22);
- 
--/*                paint->setPen(tqcolorGroup().shadow());
-+/*                paint->setPen(colorGroup().shadow());
-                 paint->drawLine(0,0,0,viewport()->height());*/
- 
- 	}
-@@ -458,7 +458,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
- }
- 
- 
--TQSize KMultiTabBarButton::tqsizeHint() const
-+TQSize KMultiTabBarButton::sizeHint() const
- {
-     constPolish();
- 
-@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
-     }
- #endif
-     if ( isMenuButton() )
--        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
- 
-     if ( pixmap() ) {
-         TQPixmap *pm = (TQPixmap *)pixmap();
-@@ -484,7 +484,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
-         TQString s( text() );
-         bool empty = s.isEmpty();
-         if ( empty )
--            s = TQString::tqfromLatin1("XXXX");
-+            s = TQString::fromLatin1("XXXX");
-         TQFontMetrics fm = fontMetrics();
-         TQSize sz = fm.size( ShowPrefix, s );
-         if(!empty || !w)
-@@ -581,12 +581,12 @@ void KMultiTabBarTab::updateState()
- 		if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
- 			setFixedWidth(24);
- 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
--				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
-+				setFixedHeight(KMultiTabBarButton::sizeHint().width());
- 			} else setFixedHeight(36);
- 		} else {
- 			setFixedHeight(24);
- 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
--				setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
-+				setFixedWidth(KMultiTabBarButton::sizeHint().width());
- 			} else setFixedWidth(36);
- 		}
- 	} else {
-@@ -637,7 +637,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
- 	const int height = 24;
- 	if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
- 		 if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
--			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
-+			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
- 			else sh=TQSize(this->width(),this->height());
- 	}
- 	else
-@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
- 
- 	if (down) st|=TQStyle::Style_On;
- 
--	tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
--	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
-+	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-+	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
- 
- 	switch (m_position) {
- 		case KMultiTabBar::Left:
-@@ -671,8 +671,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
- 			paint->drawPixmap(0,0,pixmap);
- 			break;
- 	}
--//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
--//		tqcolorGroup(),TQStyle::Style_Enabled);
-+//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-+//		colorGroup(),TQStyle::Style_Enabled);
- 
- 
- }
-@@ -682,58 +682,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
-         TQPixmap pixmap;
- 	if ( iconSet())
-         	pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
--	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
-+	paint->fillRect(0, 0, 24, 24, colorGroup().background());
- 
- 	if (!down)
- 	{
- 
- 		if (m_position==KMultiTabBar::Right)
- 		{
--			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
-+			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
- 
--			paint->setPen(tqcolorGroup().background().dark(150));
-+			paint->setPen(colorGroup().background().dark(150));
- 			paint->drawLine(0,22,23,22);
- 
- 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- 
--			paint->setPen(tqcolorGroup().shadow());
-+			paint->setPen(colorGroup().shadow());
- 			paint->drawLine(0,0,0,23);
--			paint->setPen(tqcolorGroup().background().dark(120));
-+			paint->setPen(colorGroup().background().dark(120));
- 			paint->drawLine(1,0,1,23);
- 
- 		}
- 		else
- 		if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
- 		{
--                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
-+                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
- 
-                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- 
--                        paint->setPen(tqcolorGroup().background().dark(120));
-+                        paint->setPen(colorGroup().background().dark(120));
-                         paint->drawLine(23,0,23,23);
- 
- 
--                        paint->setPen(tqcolorGroup().light());
-+                        paint->setPen(colorGroup().light());
-                         paint->drawLine(0,22,23,22);
-                         paint->drawLine(0,23,23,23);
--                	paint->setPen(tqcolorGroup().shadow());
-+                	paint->setPen(colorGroup().shadow());
-                 	paint->drawLine(0,0,23,0);
--                        paint->setPen(tqcolorGroup().background().dark(120));
-+                        paint->setPen(colorGroup().background().dark(120));
-                         paint->drawLine(0,1,23,1);
- 
- 		}
- 		else
- 		{
--			paint->setPen(tqcolorGroup().background().dark(120));
-+			paint->setPen(colorGroup().background().dark(120));
- 			paint->drawLine(0,23,23,23);
--			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
-+			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
- 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- 
--			paint->setPen(tqcolorGroup().light());
-+			paint->setPen(colorGroup().light());
- 			paint->drawLine(23,0,23,23);
- 			paint->drawLine(22,0,22,23);
- 
--			paint->setPen(tqcolorGroup().shadow());
-+			paint->setPen(colorGroup().shadow());
- 			paint->drawLine(0,0,0,23);
- 
- 		}
-@@ -744,12 +744,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
- 	{
- 		if (m_position==KMultiTabBar::Right)
- 		{
--			paint->setPen(tqcolorGroup().shadow());
-+			paint->setPen(colorGroup().shadow());
- 			paint->drawLine(0,height()-1,23,height()-1);
- 			paint->drawLine(0,height()-2,23,height()-2);
- 			paint->drawLine(23,0,23,height()-1);
- 			paint->drawLine(22,0,22,height()-1);
--			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
-+			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
- 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
- 
- 			if (m_showActiveTabText)
-@@ -759,9 +759,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
- 				TQPixmap tpixmap(height()-25-3, width()-2);
- 				TQPainter painter(&tpixmap);
- 
--				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
-+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- 
--				painter.setPen(tqcolorGroup().text());
-+				painter.setPen(colorGroup().text());
- 				painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
- 
- 				paint->rotate(90);
-@@ -773,25 +773,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
- 		else
- 		if (m_position==KMultiTabBar::Top)
- 		{
--			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
-+			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
- 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
- 			if (m_showActiveTabText)
- 			{
--				paint->setPen(tqcolorGroup().text());
-+				paint->setPen(colorGroup().text());
- 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
- 			}
- 		}
- 		else
- 		if (m_position==KMultiTabBar::Bottom)
- 		{
--			paint->setPen(tqcolorGroup().shadow());
-+			paint->setPen(colorGroup().shadow());
- 			paint->drawLine(0,23,width()-1,23);
- 			paint->drawLine(0,22,width()-1,22);
--			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
-+			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
- 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
- 			if (m_showActiveTabText)
- 			{
--				paint->setPen(tqcolorGroup().text());
-+				paint->setPen(colorGroup().text());
- 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
- 			}
- 
-@@ -800,10 +800,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
- 		{
- 
- 
--			paint->setPen(tqcolorGroup().shadow());
-+			paint->setPen(colorGroup().shadow());
- 			paint->drawLine(0,height()-1,23,height()-1);
- 			paint->drawLine(0,height()-2,23,height()-2);
--			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
-+			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
- 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
- 			if (m_showActiveTabText)
- 			{
-@@ -813,9 +813,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
-                                 TQPixmap tpixmap(height()-25-3, width()-2);
-                                 TQPainter painter(&tpixmap);
- 
--                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
-+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- 
--                                painter.setPen(tqcolorGroup().text());
-+                                painter.setPen(colorGroup().text());
-                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
- 
-                                 paint->rotate(-90);
-@@ -842,13 +842,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
- 	if (bm==Vertical)
- 	{
- 		m_l=new TQVBoxLayout(this);
--		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
-+		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
- //		setFixedWidth(24);
- 	}
- 	else
- 	{
- 		m_l=new TQHBoxLayout(this);
--		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
-+		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
- //		setFixedHeight(24);
- 	}
- 	m_l->setMargin(0);
-diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
-index 25aa255..bc9a615 100644
---- a/kaffeine/src/kmultitabbar.h
-+++ b/kaffeine/src/kmultitabbar.h
-@@ -182,7 +182,7 @@ public slots:
-          */
- 	void setText(const TQString &);
- 
--	TQSize tqsizeHint() const;
-+	TQSize sizeHint() const;
- 
- protected:
- 	KMultiTabBar::KMultiTabBarPosition m_position;
-diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
-index 29d8587..2d0244a 100644
---- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
-@@ -39,7 +39,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
-   grid->setSpacing(5);
- 
-   TQLabel* hueText = new TQLabel(i18n("Hue"), page);
--  hueText->tqsetAlignment(AlignRight);
-+  hueText->setAlignment(AlignRight);
-   m_hueSlider = new TQSlider(Qt::Horizontal, page);
-   m_hueSlider->setRange(-1000, 1000);
-   m_hueSlider->setSteps(10, 100);
-@@ -49,7 +49,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
-   grid->addWidget(m_hueSlider, 0, 1);
- 
-   TQLabel* satText = new TQLabel(i18n("Saturation"), page);
--  satText->tqsetAlignment(AlignRight);
-+  satText->setAlignment(AlignRight);
-   m_satSlider = new TQSlider(Qt::Horizontal, page);
-   m_satSlider->setRange(-1000, 1000);
-   m_satSlider->setSteps(10, 100);
-@@ -59,7 +59,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
-   grid->addWidget(m_satSlider, 1, 1);
- 
-   TQLabel* contrastText = new TQLabel(i18n("Contrast"), page);
--  contrastText->tqsetAlignment(AlignRight);
-+  contrastText->setAlignment(AlignRight);
-   m_contrastSlider = new TQSlider(Qt::Horizontal, page);
-   m_contrastSlider->setRange(-1000, 1000);
-   m_contrastSlider->setSteps(10, 100);
-@@ -69,7 +69,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
-   grid->addWidget(m_contrastSlider, 2, 1);
- 
-   TQLabel* brightText = new TQLabel(i18n("Brightness"), page);
--  brightText->tqsetAlignment(AlignRight);
-+  brightText->setAlignment(AlignRight);
-   m_brightSlider = new TQSlider(Qt::Horizontal, page);
-   m_brightSlider->setRange(-1000, 1000);
-   m_brightSlider->setSteps(10, 100);
-diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
-index 9abb266..c8d253c 100644
---- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
-+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
-@@ -78,12 +78,12 @@ DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent,
-   connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool)));
- 
-   m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget);
--  m_customConfigButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-+  m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-   grid->addWidget(m_customConfigButton, 7, 1);
-   connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show()));
- 
-   TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget);
--  note->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
-+  note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
-   grid->addMultiCellWidget(note, 9, 9, 0, 1);
- }
- 
-diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-index 9385759..58a9818 100644
---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -721,7 +721,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
- 		}
- 		case TIMER_EVENT_NEW_STATUS:
- 		{
--			emit signalXinetqStatus(m_statusString);
-+			emit signalXineStatus(m_statusString);
- 			break;
- 		}
- 		case TIMER_EVENT_CHANGE_CURSOR:
-@@ -1109,7 +1109,7 @@ bool KXineWidget::initXine()
- 	if (isXineReady())
- 		return true;
- 
--	emit signalXinetqStatus(i18n("Init xine..."));
-+	emit signalXineStatus(i18n("Init xine..."));
- 	globalPosChanged(); /* get global pos of the window */
- 
- 	/**** INIT XINE DISPLAY  ****/
-@@ -1377,7 +1377,7 @@ bool KXineWidget::initXine()
- 
- 	debugOut("xine init successful");
- 
--	emit signalXinetqStatus(i18n("Ready"));
-+	emit signalXineStatus(i18n("Ready"));
- 	emit signalXineReady();
- 
- 	/** something to play? **/
-@@ -1508,7 +1508,7 @@ bool KXineWidget::playDvb()
- 	m_posTimer.start(1000);
- 
- 	emit signalXinePlaying();
--	emit signalXinetqStatus(i18n("Playing"));
-+	emit signalXineStatus(i18n("Playing"));
- 
- 	return true;
- }
-@@ -1882,7 +1882,7 @@ bool KXineWidget::openDvb()
- 	}
- 	else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii());
- 	m_trackURL = "DVB";
--	emit signalXinetqStatus(i18n("DVB: opening..."));
-+	emit signalXineStatus(i18n("DVB: opening..."));
- 	TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) );
- 
- 	return true;
-@@ -1936,7 +1936,7 @@ void KXineWidget::slotPlay()
- 	m_queue.remove(m_queue.find(m_trackURL));
- 
- 	if (m_trackURL != m_logoFile)
--		emit signalXinetqStatus(i18n("Opening..."));
-+		emit signalXineStatus(i18n("Opening..."));
- 
- 	/* check for external subtitle file or save url */
- 	m_trackSubtitleURL = TQString();
-@@ -2053,7 +2053,7 @@ void KXineWidget::slotPlay()
- 	CodecUtf8 = TQTextCodec::codecForName("UTF-8");
- 
- 	TQString infotag;
--	infotag = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
-+	infotag = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
- 
- 	if (currentUtf8Locale)
- 		m_trackTitle = infotag;
-@@ -2068,9 +2068,9 @@ void KXineWidget::slotPlay()
- 		TQString trackArtist=NULL;
- 		TQString trackAlbum=NULL;
- 		TQString trackComment=NULL;
--		trackArtist = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST));
--		trackAlbum = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM));
--		trackComment = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT));
-+		trackArtist = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST));
-+		trackAlbum = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM));
-+		trackComment = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT));
- 		if (currentUtf8Locale)
- 		{
- 			m_trackArtist = trackArtist;
-@@ -2157,9 +2157,9 @@ void KXineWidget::slotPlay()
- 	{
- 		emit signalXinePlaying();
- 		if (hasSaveURL())
--			emit signalXinetqStatus(i18n("Recording"));
-+			emit signalXineStatus(i18n("Recording"));
- 		else
--			emit signalXinetqStatus(i18n("Playing"));
-+			emit signalXineStatus(i18n("Playing"));
- 	}
- }
- 
-@@ -2239,7 +2239,7 @@ void KXineWidget::sendXineError()
- 	{
- 		if (m_trackURL != m_logoFile)
- 		{
--			emit signalXinetqStatus(i18n("Error"));
-+			emit signalXineStatus(i18n("Error"));
- 			emit signalXineError(error);
- 		}
- 		else
-@@ -2671,7 +2671,7 @@ void KXineWidget::slotSetVolume(int vol)
- 		//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol));
- 		xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
- 	}
--	emit signalXinetqStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
-+	emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
- }
- 
- uint KXineWidget::getVolume() const
-@@ -2707,12 +2707,12 @@ void KXineWidget::slotToggleMute()
- 	if (xine_get_param(m_xineStream, muteParam))
- 	{
- 		xine_set_param(m_xineStream, muteParam, 0); /* mute off */
--		emit signalXinetqStatus(i18n("Mute Off"));
-+		emit signalXineStatus(i18n("Mute Off"));
- 	}
- 	else
- 	{
- 		xine_set_param(m_xineStream, muteParam, 1); /* mute on */
--		emit signalXinetqStatus(i18n("Mute On"));
-+		emit signalXineStatus(i18n("Mute On"));
- 	}
- }
- 
-@@ -2867,7 +2867,7 @@ void KXineWidget::slotStop()
- 		TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
- 	}
- 
--	emit signalXinetqStatus(i18n("Stop"));
-+	emit signalXineStatus(i18n("Stop"));
- }
- 
- void KXineWidget::slotSetAudiocdDevice(const TQString& device)
-@@ -2997,7 +2997,7 @@ void KXineWidget::slotSpeedPause()
- 		xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
- 		m_posTimer.stop();
- 		if (m_currentSpeed != Undefined)
--			emit signalXinetqStatus(i18n("Pause"));
-+			emit signalXineStatus(i18n("Pause"));
- 		m_currentSpeed = Pause;
- 	}
- }
-@@ -3007,7 +3007,7 @@ void KXineWidget::slotSpeedNormal()
- 	xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
- 	m_posTimer.start(200);
- 	m_currentSpeed = Normal;
--	emit signalXinetqStatus(i18n("Playing") + " ");
-+	emit signalXineStatus(i18n("Playing") + " ");
- }
- 
- void KXineWidget::slotSpeedFaster()
-@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4);
- 			m_currentSpeed = Fast2;
--			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x2"));
-+			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2"));
- 			break;
- 		}
- 		case Fast2:
-@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
- 			m_currentSpeed = Slow1;
--			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
- 			break;
- 		}
- 		default:
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
- 			m_currentSpeed = Fast1;
--			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
- 			break;
- 		}
- 	}
-@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
- 			m_currentSpeed = Slow2;
--			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x2"));
-+			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2"));
- 			break;
- 		}
- 		case Slow2:
-@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower()
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
- 			m_currentSpeed = Fast1;
--			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
- 			break;
- 		}
- 		default:
- 		{
- 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
- 			m_currentSpeed = Slow1;
--			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
-+			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
- 			break;
- 		}
- 	}
-@@ -3343,31 +3343,31 @@ void KXineWidget::slotToggleDeinterlace()
- void KXineWidget::slotAspectRatioAuto()
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_AUTO);
--	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
-+	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
- }
- 
- void KXineWidget::slotAspectRatio4_3()
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_4_3);
--	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
-+	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
- }
- 
- void KXineWidget::slotAspectRatioAnamorphic()
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC);
--	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
-+	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
- }
- 
- void KXineWidget::slotAspectRatioSquare()
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE);
--	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
-+	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
- }
- 
- void KXineWidget::slotAspectRatioDVB()
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB);
--	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
-+	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
- }
- 
- void KXineWidget::slotZoomOutX()
-@@ -3376,7 +3376,7 @@ void KXineWidget::slotZoomOutX()
- 	{
- 		m_currentZoomX -= 5;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
--		emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
-+		emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
- 	}
- }
- 
-@@ -3386,7 +3386,7 @@ void KXineWidget::slotZoomInX()
- 	{
- 		m_currentZoomX += 5;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
--		emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
-+		emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
- 	}
- }
- 
-@@ -3396,7 +3396,7 @@ void KXineWidget::slotZoomOutY()
- 	{
- 		m_currentZoomY -= 5;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
--		emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
-+		emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
- 	}
- }
- 
-@@ -3406,7 +3406,7 @@ void KXineWidget::slotZoomInY()
- 	{
- 		m_currentZoomY += 5;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
--		emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
-+		emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
- 	}
- }
- 
-@@ -3418,7 +3418,7 @@ void KXineWidget::slotZoomOut()
- 		m_currentZoomX = m_currentZoomY = m_currentZoom;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
--		emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
-+		emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
- 	}
- }
- 
-@@ -3430,7 +3430,7 @@ void KXineWidget::slotZoomIn()
- 		m_currentZoomX = m_currentZoomY = m_currentZoom;
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
- 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
--		emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
-+		emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
- 	}
- }
- 
-@@ -3440,7 +3440,7 @@ void KXineWidget::slotZoomOff()
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, 100);
- 	m_currentZoom = 100;
- 	m_currentZoomX = m_currentZoomY = m_currentZoom;
--	emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
-+	emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
- }
- 
- TQTime KXineWidget::getLengthInfo()
-@@ -3513,37 +3513,37 @@ void KXineWidget::getspuOffset(int& spuOffset) const
- void KXineWidget::slotSetHue(int hue)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_HUE, hue);
--	emit signalXinetqStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
-+	emit signalXineStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
- }
- 
- void KXineWidget::slotSetSaturation(int sat)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat);
--	emit signalXinetqStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
-+	emit signalXineStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
- }
- 
- void KXineWidget::slotSetContrast(int contrast)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast);
--	emit signalXinetqStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
-+	emit signalXineStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
- }
- 
- void KXineWidget::slotSetBrightness(int bright)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright);
--	emit signalXinetqStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
-+	emit signalXineStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
- }
- 
- void KXineWidget::slotSetAVOffset(int av)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av);
--	emit signalXinetqStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
-+	emit signalXineStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
- }
- 
- void KXineWidget::slotSetSpuOffset(int spu)
- {
- 	xine_set_param(m_xineStream, XINE_PARAM_SPU_OFFSET, spu);
--	emit signalXinetqStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
-+	emit signalXineStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
- }
- 
- 
-diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
-index 1ec989a..62fef7c 100644
---- a/kaffeine/src/player-parts/xine-part/kxinewidget.h
-+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h
-@@ -192,7 +192,7 @@ signals:
- 	void signalXineFatal(const TQString& message);   /** initXine() not successfull! **/
- 	void signalXineError(const TQString& message);
- 	void signalXineMessage(const TQString& message);
--	void signalXinetqStatus(const TQString& status);
-+	void signalXineStatus(const TQString& status);
- 	void signalXineReady();
- 	void signalXinePlaying();
- 
-diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp
-index a54cdd5..8a691b8 100644
---- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
-+++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
-@@ -50,7 +50,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
-     xine_post_in_t* inputAPI = NULL;
- 
-     m_groupBox = new TQGroupBox(name, parent);
--    m_groupBox->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-+    m_groupBox->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-     TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2);
-     grid->setMargin( 20 );
-     grid->setSpacing( 5 );
-@@ -147,7 +147,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
-         }
- 
-         descr = new TQLabel(TQString::fromUtf8(m_xinePostParameter->description ), m_groupBox);
--        descr->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
-+        descr->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
-         grid->addWidget(descr, row, 1);
-         row++;
-         m_xinePostParameter++;
-@@ -157,14 +157,14 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
-     grid->addMultiCellWidget(sep, row, row, 0, 1);
-     row++;
-     KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
--    deleteButton->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-+    deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-     connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed()));
-     grid->addWidget(deleteButton, row, 0);
- 
-     if(inputAPI)
-     {
-       KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox);
--      helpButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-+      helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-       connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed()));
-       grid->addWidget(helpButton, row, 1);
-     }
-diff --git a/kaffeine/src/player-parts/xine-part/videosettings.cpp b/kaffeine/src/player-parts/xine-part/videosettings.cpp
-index 955efcf..c64f627 100644
---- a/kaffeine/src/player-parts/xine-part/videosettings.cpp
-+++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp
-@@ -48,7 +48,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->setMargin(10);
- 
-   TQLabel* hueText = new TQLabel(i18n("Hue"), videoGroup);
--  hueText->tqsetAlignment(AlignRight);
-+  hueText->setAlignment(AlignRight);
-   m_hueSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_hueSlider->setRange(0, 65535);
-   m_hueSlider->setSteps(10, 1000);
-@@ -58,7 +58,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->addWidget(m_hueSlider, 0, 1);
- 
-   TQLabel* satText = new TQLabel(i18n("Saturation"), videoGroup);
--  satText->tqsetAlignment(AlignRight);
-+  satText->setAlignment(AlignRight);
-   m_satSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_satSlider->setRange(0, 65535);
-   m_satSlider->setSteps(10, 1000);
-@@ -68,7 +68,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->addWidget(m_satSlider, 1, 1);
- 
-   TQLabel* contrastText = new TQLabel(i18n("Contrast"), videoGroup);
--  contrastText->tqsetAlignment(AlignRight);
-+  contrastText->setAlignment(AlignRight);
-   m_contrastSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_contrastSlider->setRange(0, 65535);
-   m_contrastSlider->setSteps(10, 1000);
-@@ -78,7 +78,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->addWidget(m_contrastSlider, 2, 1);
- 
-   TQLabel* brightText = new TQLabel(i18n("Brightness"), videoGroup);
--  brightText->tqsetAlignment(AlignRight);
-+  brightText->setAlignment(AlignRight);
-   m_brightSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_brightSlider->setRange(0, 65535);
-   m_brightSlider->setSteps(10, 1000);
-@@ -88,7 +88,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->addWidget(m_brightSlider, 3, 1);
- 
-   TQLabel* avOffsetText = new TQLabel(i18n("Audio/Video Offset"), videoGroup);
--  avOffsetText->tqsetAlignment(AlignRight);
-+  avOffsetText->setAlignment(AlignRight);
-   m_avOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
-   m_avOffsetSlider->setSteps(100, 10000);
-@@ -98,7 +98,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-   videoGrid->addWidget(m_avOffsetSlider, 4, 1);
- 
-   TQLabel* spuOffsetText = new TQLabel(i18n("Subtitle Offset"), videoGroup);
--  spuOffsetText->tqsetAlignment(AlignRight);
-+  spuOffsetText->setAlignment(AlignRight);
-   m_spuOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
-   m_spuOffsetSlider->setRange(-90000, 90000);  // +/- 1 sec
-   m_spuOffsetSlider->setSteps(100, 10000);
-diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-index 9991f1c..f9b3fb1 100644
---- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
-@@ -1058,7 +1058,7 @@ void XinePart::slotMessage(const TQString& message)
- 	KMessageBox::information(0, msg, i18n("xine Message"));
- }
- 
--void XinePart::slottqStatus(const TQString& status)
-+void XinePart::slotStatus(const TQString& status)
- {
- 	emit setStatusBarText(status);
- 	if ((status != i18n("Ready")) && (status != i18n("Playing")))
-@@ -1442,7 +1442,7 @@ void XinePart::initActions()
- 		(m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD"));
- 	TQFontMetrics met(KGlobalSettings::generalFont());
- 	m_playTime->setFixedWidth(met.width("-55:55:55") + 6);
--	m_playTime->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-+	m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- 	m_playTime->setFocusPolicy(TQ_NoFocus);
- 	new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
- 	connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed()));
-@@ -1473,7 +1473,7 @@ void XinePart::initConnections()
- 	        this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int )));
- 	connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying()));
- 	connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&)));
--	connect(m_xine, TQT_SIGNAL(signalXinetqStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slottqStatus(const TQString&)));
-+	connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&)));
- 	connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&)));
- 	connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&)));
- 	connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished()));
-diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
-index 78c809e..07bf027 100644
---- a/kaffeine/src/player-parts/xine-part/xine_part.h
-+++ b/kaffeine/src/player-parts/xine-part/xine_part.h
-@@ -169,7 +169,7 @@ private slots:
- 	void slotConfigXine();
- 	void slotError(const TQString&);
- 	void slotMessage(const TQString&);
--	void slottqStatus(const TQString&);
-+	void slotStatus(const TQString&);
- 	void slotNewTitle();
- 	void slotNewLength();
- 	void slotNewFrameSize();
-@@ -206,7 +206,7 @@ private:
- 	TQPoint m_oldPosition;
- 	TQTimer m_posCheckTimer;
- 	TQTimer m_osdTimerEnabler;  /* Provide Long click on timer button */
--	bool m_isOsdTimer;  /* tqStatus of Osd Timer (on/off) */
-+	bool m_isOsdTimer;  /* Status of Osd Timer (on/off) */
- 	int m_timerDirection;  /* Counting Up or Down */
- 	int m_brightness, m_hue, m_contrast, m_saturation;
- 
-diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-index 277a850..74076e4 100644
---- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
-@@ -132,7 +132,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
- 	m_keyName.remove( 0, m_keyName.find(".") + 1 );
- 
- 	TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent);
--	description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
-+	description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
- 	grid->addWidget(description, row, 1);
- 
- 	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
-diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
-index 0544d35..4359f15 100644
---- a/kaffeine/src/pref.cpp
-+++ b/kaffeine/src/pref.cpp
-@@ -141,7 +141,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
- 	gb = new TQGroupBox( "", misc );
- 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
- 	KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb);
--	clearRecent->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
-+	clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
- 	connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent()));
- 	grid->addWidget(clearRecent, 0, 0);
- 	TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb);
-diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
-index 20a5941..a86696e 100644
---- a/kaffeine/src/startwindow.cpp
-+++ b/kaffeine/src/startwindow.cpp
-@@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *parent ) : TQLabel( parent )
- void SLabel::paintEvent( TQPaintEvent *pe )
- {
- 	TQLabel::paintEvent( pe );
--	TQColorGroup cg = parentWidget()->tqcolorGroup();
-+	TQColorGroup cg = parentWidget()->colorGroup();
- 	TQColor base = cg.base();
- 	TQColor selection = cg.highlight();
- 	int r = (base.red() + selection.red()) / 2;
-@@ -92,7 +92,7 @@ StartWindow::StartWindow(TQWidget* parent, const char* name) : TQWidget(parent,
- 
- 	panel = new TQWidget( this );
- 	panel->setPaletteBackgroundColor(TQColor("White"));
--	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
-+	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
- 
- 	buttons.setAutoDelete( true );
- }
-@@ -118,7 +118,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
- 	btn->setTextPosition( TQToolButton::Under );
- 	btn->setUsesTextLabel( true );
- 	btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) );
--	TQSize size = btn->tqsizeHint();
-+	TQSize size = btn->sizeHint();
- 	size.setHeight( size.height()+5 );
- 	btn->resize( size );
- 	connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) );
-diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
-index 79028aa..745360f 100644
---- a/kaffeine/src/systemtray.cpp
-+++ b/kaffeine/src/systemtray.cpp
-@@ -72,7 +72,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
- 	m_osd = new TitleLabel;
- 	m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain);
- 	m_osd->setLineWidth(1);
--	m_osd->tqsetAlignment(SingleLine);
-+	m_osd->setAlignment(SingleLine);
- 	connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD()));
- 
- 	setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22));
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch
deleted file mode 100644
index b3fcbc792..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 89b5fd35299d63e54cb2b36ec366d0071381458b
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324748015 -0600
-
-    Rename a few stragglers
-
-diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
-index 4ff1154..8d85e01 100644
---- a/kaffeine/src/kmultitabbar.cpp
-+++ b/kaffeine/src/kmultitabbar.cpp
-@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
- 
- 	if (down) st|=TQStyle::Style_On;
- 
--	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
--	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-+	style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-+	style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
- 
- 	switch (m_position) {
- 		case KMultiTabBar::Left:
-@@ -671,7 +671,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
- 			paint->drawPixmap(0,0,pixmap);
- 			break;
- 	}
--//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-+//	style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
- //		colorGroup(),TQStyle::Style_Enabled);
- 
- 
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.1-add_xine12_support.patch b/redhat/applications/kaffeine/kaffeine-3.5.13.1-add_xine12_support.patch
deleted file mode 100644
index 386488625..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.1-add_xine12_support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- kaffeine-3.5.13.1/kaffeine/src/player-parts/xine-part/kxinewidget.cpp.ORI	2012-10-03 21:39:27.711879801 +0200
-+++ kaffeine-3.5.13.1/kaffeine/src/player-parts/xine-part/kxinewidget.cpp	2012-10-03 21:40:35.174370892 +0200
-@@ -2642,7 +2642,11 @@
- 
- bool KXineWidget::getAutoplayPluginURLS(const TQString& plugin, TQStringList& list)
- {
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
-+	const char* const* urls = NULL;
-+#else
- 	char** urls = NULL;
-+#endif
- 	int num;
- 	int i = 0;
- 
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
deleted file mode 100644
index 4e87fd16a..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
+++ /dev/null
@@ -1,284 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-%{kdecomp}
-Summary:	Xine-based media player
-
-Version:	0.8.8
-Release:	4%{?dist}%{?_variant}
-
-License: GPLv2+
-Group:   Applications/Multimedia
-URL:     http://kaffeine.sourceforge.net/
-
-Source0:	kaffeine-3.5.13.1.tar.gz
-
-# [kaffeine] Add Xine 1.2 support
-Patch1:		kaffeine-3.5.13.1-add_xine12_support.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gettext
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: libvorbis-devel
-BuildRequires: libcdio-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-%if 0%{?pclinuxos} == 0
-BuildRequires:	kernel-headers
-%endif
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
-%else
-BuildRequires:	cdparanoia
-BuildRequires:	cdparanoia-devel
-%if 0%{?suse_version}
-BuildRequires:	libcdio-paranoia-devel
-%endif
-BuildRequires:	libXext-devel 
-BuildRequires:	libXtst-devel
-BuildRequires:	libXinerama-devel
-# dvb
-BuildRequires:	gstreamer-devel >= 0.10
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-%else
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10
-BuildRequires:	glibc-kernheaders 
-%endif
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
-%endif
-
-# xine-lib
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:  libxine-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:  xine-lib-devel
-%endif
-
-Requires: %{name}-libs = %{version}-%{release}
-
-%description
-Kaffeine is a xine-based media player for KDE.  It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats 
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kaffeine
-%{tde_libdir}/libkaffeinepart.so
-%{tde_tdelibdir}/lib*.*
-%{tde_datadir}/appl*/*/*.desktop
-%{tde_datadir}/apps/gstreamerpart/
-%{tde_datadir}/apps/kaffeine/
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/profiles/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/service*/*.desktop
-%{tde_tdedocdir}/HTML/en/kaffeine/
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group:   Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kaffeine/
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkaffeinepart.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so.*
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n kaffeine-3.5.13.1
-%patch1 -p1 -b .xine12
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --disable-rpath \
-  --with-xinerama \
-  --with-gstreamer \
-  --without-lame \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --with-extra-libs=%{_prefix}/%{_lib} \
-  --enable-closure \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
-- Add support for Mageia 2 and Mandriva 2011
-- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
-- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
-- Rebuilt for Fedora 17
-- Adds more patches from GIT.
-
-* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
-- Updates version to 0.8.8
-- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
-- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
-- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
-- Add man page
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
-- Disable 'libxcb-devel' for RHEL 5 compilation
-- Fix HTML directory location
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
-- Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
deleted file mode 100644
index e46e985cc..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ /dev/null
@@ -1,289 +0,0 @@
-# Default version for this component
-%define tde_pkg kaffeine
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:			trinity-%{tde_pkg}
-Summary:		Xine-based media player
-
-Version:		0.8.8
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-URL:			http://kaffeine.sourceforge.net/
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# VORBIS support
-BuildRequires:	libvorbis-devel
-
-# CDDA support
-BuildRequires:	libcdio-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia
-BuildRequires:	cdparanoia-devel
-%endif
-%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildRequires:	libcdio-paranoia-devel
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xext-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	%{_lib}xinerama-devel
-%else
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel 
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXext-devel 
-BuildRequires:	libXtst-devel
-BuildRequires:	libXinerama-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gstreamer 1
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?suse_version}
-BuildRequires:	libmp3lame-devel
-%else
-BuildRequires:	lame-devel
-%endif
-
-# WTF support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires:	kernel-headers
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	glibc-kernheaders 
-%endif
-
-Requires: %{name}-libs = %{version}-%{release}
-
-%description
-Kaffeine is a xine-based media player for TDE.  It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats 
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in TDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kaffeine
-%{tde_libdir}/libkaffeinepart.so
-%{tde_tdelibdir}/lib*.*
-%{tde_datadir}/appl*/*/*.desktop
-%if 0%{?with_gstreamer}
-%{tde_datadir}/apps/gstreamerpart/
-%endif
-%{tde_datadir}/apps/kaffeine/
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/profiles/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/service*/*.desktop
-%{tde_tdedocdir}/HTML/en/kaffeine/
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		trinity-tdelibs-devel
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kaffeine/
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkaffeinepart.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%package libs
-Summary:		%{name} runtime libraries
-Group:			System Environment/Libraries
-
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires:		%{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so.*
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-xinerama \
-  --with-gstreamer \
-  --with-lame \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{tde_pkg}
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.spec
deleted file mode 100644
index dbc3aefbc..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.spec
+++ /dev/null
@@ -1,305 +0,0 @@
-# Default version for this component
-%define kdecomp kaffeine
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-%{kdecomp}
-Summary:	Xine-based media player
-
-Version:	0.8.8
-Release:	3%{?dist}%{?_variant}
-
-License: GPLv2+
-Group:   Applications/Multimedia
-URL:     http://kaffeine.sourceforge.net/
-
-Source0:	kaffeine-3.5.13.tar.gz
-Source2:	kaffeine.1
-
-# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
-Source1:		508cb342-logo
-
-
-
-# [kaffeine] Rename old tq methods that no longer need a unique name[Commit #60ed202f]
-Patch1:			kaffeine-3.5.13-rename_old_tq_methods.patch
-# [kaffeine] Remove additional unneeded tq method conversions [Commit #701a1249]
-Patch2:			kaffeine-3.5.13-remove_additional_tq_conversions.patch
-# [kaffeine] Rename obsolete tq methods to standard names [Commit #66805baf]
-Patch3:			kaffeine-3.5.13-rename_obsolete_tq_methods.patch
-# [kaffeine] Rename a few stragglers [Commit #89b5fd35]
-Patch4:			kaffeine-3.5.13-renames_a_few_stragglers.patch
-# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439]
-Patch5:			kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
-# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] [Commit #fd68e4c4]
-Patch6:			kaffeine-3.5.13-fix_slow_dvb_start.patch
-# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME. [Commit #b480e3db]
-Patch7:			kaffeine-3.5.13-fix_temporary_location.patch
-# [kaffeine] Fix typos, branding, and inadvertent tqt changes. [Commit #0e3d0ed6]
-Patch8:			kaffeine-3.5.13-fix_typos_branding_tqt.patch
-# [kaffeine] Fix installation of localization files [Bug #858]
-Patch9:		kaffeine-3.5.13-fix_localization_files.patch
-# [kaffeine] Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
-Patch10:		kaffeine-3.5.13-fix_program_name.patch
-# [kaffeine] Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
-Patch11:		kaffeine-3.5.13-fix_win32_codec_url.patch
-# [kaffeine] Missing LDFLAGS cause FTBFS under MGA2/MDV2011
-Patch12:	kaffeine-3.5.13-missing_ldflags.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gettext
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libcdio-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-BuildRequires:	%{_lib}xine-devel
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-BuildRequires:	kernel-headers
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
-%else
-BuildRequires:	cdparanoia-devel cdparanoia
-BuildRequires:	xine-lib-devel
-BuildRequires:	libXext-devel 
-BuildRequires:	libXtst-devel
-BuildRequires:	libXinerama-devel
-# dvb
-BuildRequires:	glibc-kernheaders 
-BuildRequires:	gstreamer-devel >= 0.10
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: libxcb-devel
-%endif
-
-
-Requires: %{name}-libs = %{version}-%{release}
-
-%description
-Kaffeine is a xine-based media player for KDE.  It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats 
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in KDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kaffeine
-%{tde_libdir}/libkaffeinepart.so
-%{tde_tdelibdir}/lib*.*
-%{tde_datadir}/appl*/*/*.desktop
-%{tde_datadir}/apps/gstreamerpart/
-%{tde_datadir}/apps/kaffeine/
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/profiles/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/service*/*.desktop
-%{tde_tdedocdir}/HTML/en/kaffeine
-%{tde_mandir}/*/*
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group:   Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kaffeine/
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkaffeinepart.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so.*
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-
-%prep
-%setup -q -n applications/kaffeine
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1 -b .ftbfs
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --disable-rpath \
-  --with-xinerama \
-  --with-gstreamer \
-  --without-lame \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --with-extra-libs=%{_prefix}/%{_lib} \
-  --enable-closure \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/kaffeine/logo
-%__install -D -m 644 %{SOURCE2} %{?buildroot}%{tde_mandir}/man1/kaffeine.1
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-
-%changelog
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
-- Add support for Mageia 2 and Mandriva 2011
-- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
-- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
-- Rebuilt for Fedora 17
-- Adds more patches from GIT.
-
-* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
-- Updates version to 0.8.8
-- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
-- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
-- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
-- Add man page
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
-- Disable 'libxcb-devel' for RHEL 5 compilation
-- Fix HTML directory location
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
-- Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch b/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch
deleted file mode 100644
index e365bfa55..000000000
--- a/redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp.ORI	2014-02-19 22:52:20.875005485 +0100
-+++ trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp	2014-02-19 22:53:01.488995960 +0100
-@@ -1094,8 +1094,8 @@
- 
- bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable)
- {
--	int i, blocks, space, month_int = 1;
--	unsigned int loc, fileloc, datebegin, sizebegin = 0;
-+	int i, blocks, space, month_int = 1, loc;
-+	unsigned int fileloc, datebegin, sizebegin = 0;
- 	string buffer, filestring;
- 
- 	FILE* dirfile;
diff --git a/redhat/applications/katapult/katapult-3.5.12.spec b/redhat/applications/katapult/katapult-3.5.12.spec
deleted file mode 100644
index 1ae79b3cd..000000000
--- a/redhat/applications/katapult/katapult-3.5.12.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-# Default version for this component
-%define kdecomp katapult
-%define version 0.3.2.1
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Faster access to applications, bookmarks, and other items.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-Patch0:		katapult-0.3.2.1_to_0.3.2.2.patch
-
-# TQt4 port Katapult. This enables compilation under both Qt3 and Qt4.
-Patch1:		r1233929.diff
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Katapult is an application for KDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-#patch1 -p2
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-export CXXFLAGS="-DTQ_OBJECT=//"
-
-chmod +x ./configure
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/services/*.desktop
-%{_datadir}/servicetypes/*.desktop
-%{tde_libdir}/*.so
-%{_libdir}/*.so.*
-%{tde_docdir}/HTML/en/katapult
-
-
-%exclude %{tde_libdir}/*.la
-%exclude %{_libdir}/*.so
-%exclude %{_libdir}/*.la
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial release for RHEL 6.0
-- Import to GIT
-
diff --git a/redhat/applications/katapult/katapult-3.5.13.1.spec b/redhat/applications/katapult/katapult-3.5.13.1.spec
deleted file mode 100644
index bdff714ad..000000000
--- a/redhat/applications/katapult/katapult-3.5.13.1.spec
+++ /dev/null
@@ -1,196 +0,0 @@
-# Default version for this component
-%define kdecomp katapult
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Faster access to applications, bookmarks, and other items.
-Version:	0.3.2.1
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-5
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial release for RHEL 6.0
-- Import to GIT
-
diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
deleted file mode 100644
index c26f46fbd..000000000
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg katapult
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Faster access to applications, bookmarks, and other items.
-Version:		0.3.2.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-%changelog
diff --git a/redhat/applications/katapult/katapult-3.5.13.spec b/redhat/applications/katapult/katapult-3.5.13.spec
deleted file mode 100644
index dff27c6e6..000000000
--- a/redhat/applications/katapult/katapult-3.5.13.spec
+++ /dev/null
@@ -1,189 +0,0 @@
-# Default version for this component
-%define kdecomp katapult
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Faster access to applications, bookmarks, and other items.
-Version:	0.3.2.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial release for RHEL 6.0
-- Import to GIT
-
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch
deleted file mode 100644
index e779aa994..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_format_not_a_string_literal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 14ba7d8af6ef7248dcd3eb85ae977950d1758600
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336066403 -0500
-
-    Fix 'format not a string literal' error
-
-diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
-index 26e59da..6b07a7b 100644
---- a/kbarcode/csvimportdlg.cpp
-+++ b/kbarcode/csvimportdlg.cpp
-@@ -334,7 +334,6 @@ void CSVImportDlg::accept()
-     TQValueList<int> headers;
-     TQStringList list;
-     TQString name = getDatabaseName();
--    int i = 0;
- 
-     TQString q = "INSERT INTO " + name + " (";
-     for( int c = 0; c < table->horizontalHeader()->count(); c++ ) {
-@@ -375,7 +374,7 @@ void CSVImportDlg::accept()
- 
-         TQSqlQuery query;
-         if( !query.exec( line ) )
--            qDebug( i18n("Could not import the following line:") + line );
-+            qDebug( "%s", i18n("Could not import the following line:") + line );
-             //KMessageBox::error( this, i18n("Could not import the following line:") + line );
-     }
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch
deleted file mode 100644
index 87328eb06..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62777d2782c7fa738eb047eff175785fc2cd24ff
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336091409 -0500
-
-    Fix FTBFS
-
-diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
-index 6b07a7b..b5c6efa 100644
---- a/kbarcode/csvimportdlg.cpp
-+++ b/kbarcode/csvimportdlg.cpp
-@@ -374,7 +374,7 @@ void CSVImportDlg::accept()
- 
-         TQSqlQuery query;
-         if( !query.exec( line ) )
--            qDebug( "%s", i18n("Could not import the following line:") + line );
-+            qDebug( "%s", (i18n("Could not import the following line:") + line).ascii() );
-             //KMessageBox::error( this, i18n("Could not import the following line:") + line );
-     }
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch b/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch
deleted file mode 100644
index de445db7f..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13-fix_remaining_string_literal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit b8dc3f5795c618c3617302973fff7d7bbf0ead2d
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1336099921 -0500
-
-    Fix remaining string format errors
-
-diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp
-index 02cb19b..4768b3e 100644
---- a/kbarcode/pixmapbarcode.cpp
-+++ b/kbarcode/pixmapbarcode.cpp
-@@ -178,7 +178,7 @@ bool PixmapBarcode::createPixmap( TQPixmap* target, int resx, int resy )
-         cmd += input->name();
- 	cmd += " -sNOPAUSE -q - -c showpage quit";
- 	
--        qDebug("cmd: " + cmd );
-+        qDebug("cmd: %s", cmd.ascii() );
- 	gs_pipe = popen( cmd.latin1(), "w" );
-         if( !gs_pipe )
- 	{
-diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp
-index 8490f7c..95cc64f 100644
---- a/kbarcode/tbarcode2.cpp
-+++ b/kbarcode/tbarcode2.cpp
-@@ -122,7 +122,7 @@ bool TBarcode2::createPostscript( char** postscript, long* postscript_size )
-                        tbarcode->height(),
-                        tbarcode->checksum() );
- 
--    qDebug( "Cmd = " + cmd );
-+    qDebug( "Cmd = %s", cmd.ascii() );
-     if( !readFromPipe( cmd.latin1(), postscript, postscript_size ) )
-         return false;
- 
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
deleted file mode 100644
index eb1805d37..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-# Default version for this component
-%define kdecomp kbarcode
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	barcode and label printing application for Trinity
-Version:	2.0.6
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.kbarcode.net
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the KDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
deleted file mode 100644
index 1713feaab..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# Default version for this component
-%define tde_pkg kbarcode
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		barcode and label printing application for Trinity
-Version:		2.0.6
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.kbarcode.net
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the TDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=%{_includedir}/pcre
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%changelog
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.spec
deleted file mode 100644
index 287fea1b6..000000000
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.spec
+++ /dev/null
@@ -1,161 +0,0 @@
-# Default version for this component
-%define kdecomp kbarcode
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	barcode and label printing application for Trinity
-Version:	2.0.6
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.kbarcode.net
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kbarcode] Fix 'format not a string literal' error [Commit #14ba7d8a]
-Patch1:		kbarcode-3.5.13-fix_format_not_a_string_literal.patch
-# [kbarcode] Fix FTBFS [Commit #62777d27]
-Patch2:		kbarcode-3.5.13-fix_ftbfs.patch
-# [kbarcode] Fix remaining string format errors [Commit #b8dc3f57]
-Patch3:		kbarcode-3.5.13-fix_remaining_string_literal.patch
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the KDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdelibdir}/kfile_kbarcode.la
-%{tde_tdelibdir}/kfile_kbarcode.so
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-label.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_datadir}/services/kfile_kbarcode.desktop
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch b/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch
deleted file mode 100644
index 43ec3a0ed..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13-fix_install_directories.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- kbfx/doc/CMakeLists.txt.ORI	2012-08-04 18:33:25.916251160 +0200
-+++ kbfx/doc/CMakeLists.txt	2012-08-04 18:33:49.658779402 +0200
-@@ -14,4 +14,4 @@
- 	)
- 
- INSTALL(FILES ${DOCFILES}
--    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)
-+	DESTINATION ${DOC_INSTALL_DIR}/kbfx)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch b/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ac20238f7..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kbfx/plugins/applications/CMakeLists.txt.ORI	2012-08-04 18:24:43.221636976 +0200
-+++ kbfx/plugins/applications/CMakeLists.txt	2012-08-04 18:26:32.602463608 +0200
-@@ -21,6 +21,7 @@
- 	    ${KDE3_UI_LIBRARY}
- 	    ${KDE3_KHTML_LIBRARY}
- 	    ${M_LIBRARY}
-+	    ${KDE3_DCOP_LIBRARY}
- 	    )
- 
- 	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
---- kbfx/plugins/settings/CMakeLists.txt.ORI	2012-08-04 18:28:43.968853387 +0200
-+++ kbfx/plugins/settings/CMakeLists.txt	2012-08-04 18:29:10.408328041 +0200
-@@ -21,6 +21,7 @@
- 	    ${KDE3_UI_LIBRARY}
- 	    ${KDE3_KHTML_LIBRARY}
- 	    ${M_LIBRARY}
-+	    ${KDE3_DCOP_LIBRARY}
- 	    )
- 
- 	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch b/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch
deleted file mode 100644
index 93d0a406e..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.1-fix_install_directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kbfx-3.5.13.1/doc/CMakeLists.txt.dir	2012-07-05 19:59:27.000000000 +0200
-+++ kbfx-3.5.13.1/doc/CMakeLists.txt	2012-10-03 22:55:59.145960716 +0200
-@@ -13,5 +13,8 @@
- #	TODO
- 	)
- 
-+#add_subdirectory( common )
-+#add_subdirectory( en )
-+
- INSTALL(FILES ${DOCFILES}
--    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)
-+	DESTINATION ${DOC_INSTALL_DIR}/kbfx)
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.1.spec b/redhat/applications/kbfx/kbfx-3.5.13.1.spec
deleted file mode 100644
index c6eb49dab..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.1.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-# Default version for this component
-%define kdecomp kbfx
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	an alternative to K-Menu for KDE [Trinity]
-Version:	0.4.9.3.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kbfx] Some files are installed in wrong directories ...
-Patch2:		kbfx-3.5.13.1-fix_install_directories.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch2 -p1 -b .dir
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-  
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DBUILD_DOC=ON \
-  -DBUILD_ALL=OFF \
-  ..
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/kbfxspinx.la
-%{tde_tdelibdir}/kbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2
-- Initial release for TDE 3.5.13.1
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec
deleted file mode 100644
index f3e9f4694..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg kbfx
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		an alternative to K-Menu for TDE [Trinity]
-Version:		0.4.9.3.1
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-  
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DBUILD_DOC=ON \
-  -DBUILD_ALL=OFF \
-  ..
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/kbfxspinx.la
-%{tde_tdelibdir}/kbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%changelog
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.spec b/redhat/applications/kbfx/kbfx-3.5.13.spec
deleted file mode 100644
index 47b4831e0..000000000
--- a/redhat/applications/kbfx/kbfx-3.5.13.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define kdecomp kbfx
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	an alternative to K-Menu for KDE [Trinity]
-Version:	0.4.9.3.1
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kbfx] Missing LDFLAGS cause FTBFS on Mageia 2 and Mandriva 2011
-Patch1:		kbfx-3.5.13-missing_ldflags.patch
-# [kbfx] Some files are installed in wrong directories ...
-Patch2:		kbfx-3.5.13-fix_install_directories.patch
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .ldflags
-%patch2 -p1 -b .dir
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
-  
-# Prevents hardcoded TDE directories ...
-%__sed -i "cmakemodules/FindKdeLibs.cmake" \
-  -e "s|^\(set(HTML_INSTALL_DIR.*\)|#\1|" \
-  -e "s|^\(set(INCLUDE_INSTALL_DIR.*\)|#\1|"
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}:%{tde_includedir}/tqt"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DHTML_INSTALL_DIR=%{tde_tdedocdir}/HTML \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DUSE_KDE4=OFF \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/libkbfxspinx.la
-%{tde_tdelibdir}/libkbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/skins/*/*
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/kbfxconfigapp/index.docbook
-%{tde_tdedocdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%Changelog
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec
deleted file mode 100644
index 825244f38..000000000
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# Default version for this component
-%define kdecomp kbookreader
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	eBook reader for Trinity.
-Version:	0.2.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-kbookreader is an application which allows you to view eBooks
-within the Trinity Desktop Environment.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_datadir}/applnk/Utilities/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
deleted file mode 100644
index 61f8a726c..000000000
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
+++ /dev/null
@@ -1,118 +0,0 @@
-# Default version for this component
-%define tde_pkg kbookreader
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		eBook reader for Trinity.
-Version:		0.2.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-kbookreader is an application which allows you to view eBooks
-within the Trinity Desktop Environment.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_datadir}/applnk/Utilities/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
-%changelog
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.spec
deleted file mode 100644
index 5f4263f6f..000000000
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.spec
+++ /dev/null
@@ -1,147 +0,0 @@
-# Default version for this component
-%define kdecomp kbookreader
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	eBook reader for Trinity.
-Version:	0.2.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-kbookreader is an application which allows you to view eBooks
-within the Trinity Desktop Environment.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_datadir}/applnk/Utilities/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch b/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 05012b5ba..000000000
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kchmviewer/lib/kio-msits/Makefile.am.ORI	2011-11-21 00:43:10.415241950 +0100
-+++ kchmviewer/lib/kio-msits/Makefile.am	2011-11-21 00:43:22.929241583 +0100
-@@ -5,7 +5,7 @@
- 
- kio_msits_la_SOURCES = msits.cpp
- kio_msits_la_LIBADD = -lkio $(CHM_LIBS)
--kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN)
-+kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
- 
- protocol_DATA = msits.protocol
- protocoldir = $(kde_servicesdir)
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec
deleted file mode 100644
index 774a8ff7a..000000000
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	CHM viewer for Trinity
-Version:	3.1.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kchmviewer] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch0:		kchmviewer-3.5.13-missing_ldflags.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
-library, and does not depend on KDE or GNOME. However, it may be compiled
-with full Trinity support, including Trinity widgets and KIO/KHTML. 
-
-The main advantage of KchmViewer is non-English language support. Unlike
-others, KchmViewer in most cases correctly detects help file encoding,
-correctly shows tables of context of Russian, Korean, Chinese and Japanese
-help files, and correctly searches in non-English help files (search for
-MBCS languages - ja/ko/ch is still in progress).
-
-Completely safe and harmless. Does not support JavaScript in any way,
-optionally warns you before opening an external web page, or switching to
-another help file. Shows an appropriate image for every TOC entry. 
-
-KchmViewer Has complete chm index support, including multiple index entries,
-cross-links and parent/child entries in index as well as Persistent bookmarks
-support. Correctly detects and shows encoding of any valid chm file.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-x \
-  --with-kde \
-  --with-extra-includes=%{_includedir}/tqt \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
-%{tde_bindir}/kchmviewer
-%{tde_tdelibdir}/kio_msits.la
-%{tde_tdelibdir}/kio_msits.so
-%{tde_datadir}/applnk/kchmviewer.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{tde_datadir}/services/msits.protocol
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
deleted file mode 100644
index 36012a73f..000000000
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define tde_pkg kchmviewer
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		CHM viewer for Trinity
-Version:		3.1.2
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
-library, and does not depend on TDE or GNOME. However, it may be compiled
-with full Trinity support, including Trinity widgets and KIO/KHTML. 
-
-The main advantage of KchmViewer is non-English language support. Unlike
-others, KchmViewer in most cases correctly detects help file encoding,
-correctly shows tables of context of Russian, Korean, Chinese and Japanese
-help files, and correctly searches in non-English help files (search for
-MBCS languages - ja/ko/ch is still in progress).
-
-Completely safe and harmless. Does not support JavaScript in any way,
-optionally warns you before opening an external web page, or switching to
-another help file. Shows an appropriate image for every TOC entry. 
-
-KchmViewer Has complete chm index support, including multiple index entries,
-cross-links and parent/child entries in index as well as Persistent bookmarks
-support. Correctly detects and shows encoding of any valid chm file.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Warning: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-x \
-  --with-kde
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
-%{tde_bindir}/kchmviewer
-%{tde_tdelibdir}/kio_msits.la
-%{tde_tdelibdir}/kio_msits.so
-%{tde_datadir}/applnk/kchmviewer.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{tde_datadir}/services/msits.protocol
-
-
-%changelog
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec
deleted file mode 100644
index e2dba2a34..000000000
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec
+++ /dev/null
@@ -1,149 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	CHM viewer for Trinity
-Version:	3.1.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kchmviewer] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
-Patch0:		kchmviewer-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
-library, and does not depend on KDE or GNOME. However, it may be compiled
-with full Trinity support, including Trinity widgets and KIO/KHTML. 
-
-The main advantage of KchmViewer is non-English language support. Unlike
-others, KchmViewer in most cases correctly detects help file encoding,
-correctly shows tables of context of Russian, Korean, Chinese and Japanese
-help files, and correctly searches in non-English help files (search for
-MBCS languages - ja/ko/ch is still in progress).
-
-Completely safe and harmless. Does not support JavaScript in any way,
-optionally warns you before opening an external web page, or switching to
-another help file. Shows an appropriate image for every TOC entry. 
-
-KchmViewer Has complete chm index support, including multiple index entries,
-cross-links and parent/child entries in index as well as Persistent bookmarks
-support. Correctly detects and shows encoding of any valid chm file.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-x \
-  --with-kde \
-  --with-extra-includes=%{_includedir}/tqt \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
-%{tde_bindir}/kchmviewer
-%{tde_tdelibdir}/kio_msits.la
-%{tde_tdelibdir}/kio_msits.so
-%{tde_datadir}/applnk/kchmviewer.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{tde_datadir}/services/msits.protocol
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
deleted file mode 100644
index dcdb2ef48..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- kcmautostart/src/autostart.desktop.ORI	2012-05-10 11:47:47.743164035 +0200
-+++ kcmautostart/src/autostart.desktop	2012-05-10 11:49:15.127289325 +0200
-@@ -14,8 +14,10 @@
- Comment=A KControl tool for managing what programs start up with TDE.
- Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE.
- Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE.
-+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE.
- Keywords=autostart manager
- Name=Autostart Manager
- Name[ca]=Autoengega
- Name[es]=Arranque automático
-+Name[fr]=Démarrage automatique
- Categories=Qt;KDE;X-KDE-settings-components;
-diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po
---- kcmautostart/po.ori//fr.po	1970-01-01 01:00:00.000000000 +0100
-+++ kcmautostart/po/fr.po	2012-05-10 19:27:38.107215981 +0200
-@@ -0,0 +1,52 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-+"Project-Id-Version: autostart_ca\n"
-+"Language-Team:  <ca@li.org>\n"
-+"X-Generator: KBabel 1.11.4\n"
-+"MIME-Version: 1.0\n"
-+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-+"Last-Translator: Josep Febrer <josep@extens.info>\n"
-+
-+#: ../src/autostart.cpp:61
-+msgid "Startup"
-+msgstr "Démarrage"
-+
-+#: ../src/autostart.cpp:62
-+msgid "Shutdown"
-+msgstr "Arrêt"
-+
-+#: ../src/autostart.cpp:63
-+msgid "ENV"
-+msgstr "ENV"
-+
-+#: ../src/autostart.cpp:102
-+msgid "Name"
-+msgstr "Nom"
-+
-+#: ../src/autostart.cpp:103
-+msgid "Command"
-+msgstr "Commande"
-+
-+#: ../src/autostart.cpp:104
-+msgid "Run on"
-+msgstr "Executer"
-+
-+#: ../src/autostart.cpp:129
-+msgid "&Add"
-+msgstr "&Ajouter"
-+
-+#: ../src/autostart.cpp:131
-+msgid "&Remove"
-+msgstr "&Supprimer"
-+
-+#: ../src/autostart.cpp:133
-+msgid "&Properties"
-+msgstr "&Propiétés"
-+
-+#: ../src/autostart.cpp:317
-+msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-+
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch
deleted file mode 100644
index da0940d89..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcmautostart/src/autostart.cpp.crash_on_exit	2013-05-10 23:35:31.443410887 +0200
-+++ kcmautostart/src/autostart.cpp	2013-05-10 23:46:31.852926622 +0200
-@@ -102,7 +102,10 @@
-   if (bisDesktop) service = new KService( fileName.path() );
-   }
-   ~desktop() {
--    delete service;
-+    if(service) {
-+      service = NULL;
-+      delete service;
-+    }
-   }
- };
- 
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch
deleted file mode 100644
index d7b0217ee..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcmautostart/po/fr.po.ORI	2013-05-10 23:28:02.181493730 +0200
-+++ kcmautostart/po/fr.po	2013-05-10 23:28:09.944336813 +0200
-@@ -44,7 +44,7 @@
- 
- #: ../src/autostart.cpp:133
- msgid "&Properties"
--msgstr "&Propiétés"
-+msgstr "&Propriétés"
- 
- #: ../src/autostart.cpp:317
- msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
deleted file mode 100644
index 0807b3a9b..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- kcmautostart.ORI/src/autostart.cpp	2012-05-10 11:36:44.887288951 +0200
-+++ kcmautostart.P/src/autostart.cpp	2012-05-10 11:37:16.701639283 +0200
-@@ -88,10 +88,10 @@
-       path = kgs->autostartPath()+"/";
-       break;
-     case Shutdown:
--      path = ksd->localtdedir()+"shutdown/";
-+      path = ksd->localkdedir()+"shutdown/";
-       break;
-     case ENV:
--      path = ksd->localtdedir()+"env/";
-+      path = ksd->localkdedir()+"env/";
-       break;
-   }
-   KIO::file_move(fileName, KURL( path + fileName.fileName() ));
-@@ -190,9 +190,9 @@
-     if (x==0)
-       path = kgs->autostartPath();
-     else if (x==1)
--      path = ksd->localtdedir() + "/shutdown";
-+      path = ksd->localkdedir() + "/shutdown";
-     else if (x==2)
--      path = ksd->localtdedir() + "/env";
-+      path = ksd->localkdedir() + "/env";
- 
-     if (! KStandardDirs::exists(path))
-       KStandardDirs::makeDir(path);
---- kcmautostart/admin/cvs.sh.ftbfs	2012-05-10 11:30:01.000000000 +0200
-+++ kcmautostart/admin/cvs.sh	2013-06-04 21:27:13.097359615 +0200
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
-@@ -128,7 +128,7 @@
- echo "*** Creating configure"
- call_and_fix_autoconf
- 
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
-@@ -184,7 +184,7 @@
-   fi
- fi
- $ACLOCAL $ACLOCALFLAGS
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-   echo "*** Creating config.h template"
-   $AUTOHEADER || exit 1
-   touch config.h.in
---- kcmautostart/admin/configure.in.min.ORI	2013-06-04 21:28:06.399273569 +0200
-+++ kcmautostart/admin/configure.in.min	2013-06-04 21:28:12.584147551 +0200
-@@ -41,7 +41,7 @@
- KDE_SET_PREFIX
- 
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec
deleted file mode 100644
index 8212e91f3..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-kcmautostart
-Summary:	Manage applications automatic startup.
-Version:	1.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1:		kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2:		kcmautostart-3.5.13-add_french.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-
-Requires:		trinity-kdebase
-
-%description
-%{summary}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -a 0 -n applications/kcmautostart
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
deleted file mode 100644
index 0ccd9d6d5..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define tde_pkg kchmviewer
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-kcmautostart
-Summary:		Manage applications automatic startup.
-Version:		1.0
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1:		kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2:		kcmautostart-3.5.13-add_french.patch
-# [kcmautostart] kcmautostart crash on exit
-Patch3:		kcmautostart-3.5.13-fix_crash_on_exit.patch
-# [kcmautostart] Fix french translation
-Patch4:		kcmautostart-3.5.13-fix_fr_translation.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gcc-c++
-
-Requires:		trinity-tdebase >= %{tde_version}
-
-%description
-%{summary}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n applications/kcmautostart
-%patch1 -p1 -b .ftbfs
-%patch2 -p1
-%patch3 -p1 -b .crash_on_exit
-%patch4 -p1 -b .fr_translation
-
-%__sed -i admin/acinclude.m4.in \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%changelog
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec
deleted file mode 100644
index 522deb769..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define kdecomp kchmviewer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-kcmautostart
-Summary:	Manage applications automatic startup.
-Version:	1.0
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kcmautostart-3.5.13.tar.gz
-
-# [kcmautostart] Fix FTBFS with TDE 3.5.13
-Patch1:		kcmautostart-3.5.13-ftbfs.patch
-# [kcmautostart] Add French support
-Patch2:		kcmautostart-3.5.13-add_french.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gcc-c++
-
-Requires:		trinity-kdebase
-
-%description
-%{summary}
-
-%prep
-%setup -q -a 0 -n applications/kcmautostart
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang autostart
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%Changelog
-* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po
deleted file mode 100644
index 6d898bc97..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-"Project-Id-Version: autostart_ca\n"
-"Language-Team:  <ca@li.org>\n"
-"X-Generator: KBabel 1.11.4\n"
-"MIME-Version: 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Josep Febrer <josep@extens.info>\n"
-
-#: ../src/autostart.cpp:61
-msgid "Startup"
-msgstr "Démarrage"
-
-#: ../src/autostart.cpp:62
-msgid "Shutdown"
-msgstr "Arrêt"
-
-#: ../src/autostart.cpp:63
-msgid "ENV"
-msgstr "ENV"
-
-#: ../src/autostart.cpp:102
-msgid "Name"
-msgstr "Nom"
-
-#: ../src/autostart.cpp:103
-msgid "Command"
-msgstr "Comande"
-
-#: ../src/autostart.cpp:104
-msgid "Run on"
-msgstr "Executer"
-
-#: ../src/autostart.cpp:129
-msgid "&Add"
-msgstr "&Ajouter"
-
-#: ../src/autostart.cpp:131
-msgid "&Remove"
-msgstr "&Supprimer"
-
-#: ../src/autostart.cpp:133
-msgid "&Properties"
-msgstr "&Propiétés"
-
-#: ../src/autostart.cpp:317
-msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec
deleted file mode 100644
index 4632b6607..000000000
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define kdecomp kcpuload
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a CPU meter for Kicker [Trinity]
-Version:	2.00
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KCPULoad is a small program for Kicker (the TDE panel).  It shows a
-recent history of CPU usage in the form of one or two configurable
-diagrams in the system tray.  These diagrams have settings for colours
-and various different styles.
-
-KCPULoad has support for SMP and separate user/system loads.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kcpuload
-%{tde_datadir}/applnk/System/kcpuload.desktop
-%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
-%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
-%{tde_tdedocdir}/HTML/en/kcpuload/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
deleted file mode 100644
index df8ec2705..000000000
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define tde_pkg kcpuload
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		a CPU meter for Kicker [Trinity]
-Version:		2.00
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KCPULoad is a small program for Kicker (the TDE panel).  It shows a
-recent history of CPU usage in the form of one or two configurable
-diagrams in the system tray.  These diagrams have settings for colours
-and various different styles.
-
-KCPULoad has support for SMP and separate user/system loads.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kcpuload
-%{tde_datadir}/applnk/System/kcpuload.desktop
-%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
-%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
-%{tde_tdedocdir}/HTML/en/kcpuload/
-
-
-%changelog
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.spec
deleted file mode 100644
index 828d6ee84..000000000
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define kdecomp kcpuload
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a CPU meter for Kicker [Trinity]
-Version:	2.00
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KCPULoad is a small program for Kicker (the TDE panel).  It shows a
-recent history of CPU usage in the form of one or two configurable
-diagrams in the system tray.  These diagrams have settings for colours
-and various different styles.
-
-KCPULoad has support for SMP and separate user/system loads.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kcpuload
-%{tde_datadir}/applnk/System/kcpuload.desktop
-%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
-%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
-%{tde_tdedocdir}/HTML/en/kcpuload/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-missing_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-missing_ldlflags.patch
deleted file mode 100644
index 06e1d455e..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-missing_ldlflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdbusnotification/src/daemon/Makefile.am.ORI	2011-11-01 22:59:28.000000000 +0100
-+++ kdbusnotification/src/daemon/Makefile.am	2011-11-01 22:59:45.000000000 +0100
-@@ -35,6 +35,7 @@
- 	$(KDE_RPATH)							\
- 	$(KDE_LDFLAGS)							\
- 	$(LIB_QT)							\
-+	$(QT_LDFLAGS)							\
- 	-lDCOP								\
- 	$(LIB_KDECORE)							\
- 	$(LIB_KDEUI)							\
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec
deleted file mode 100644
index b44e41ab8..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec
+++ /dev/null
@@ -1,129 +0,0 @@
-# Default version for this component
-%define kdecomp kdbusnotification
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a DBUS notification service [Trinity]
-
-Version:	0.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-BuildRequires: gtk2-devel
-
-%if 0%{?suse_version}
-BuildRequires: dbus-1-glib-devel
-%else
-BuildRequires: dbus-glib-devel
-%endif
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
deleted file mode 100644
index 4ed8c1c52..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI	2013-07-20 11:16:18.010011618 +0200
-+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp	2013-07-20 11:27:19.135889426 +0200
-@@ -231,9 +231,10 @@
- 	}
- 
- 	// Send a notification request to KDE here...
--	TQString messageText = TQString(body);
-+	TQString messageCaption = TQString::fromLocal8Bit(summary);
-+	TQString messageText = TQString::fromLocal8Bit(body);
- 
--	GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y);
-+	GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y);
- 
- 	return_id = 0;
- 
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
deleted file mode 100644
index 36202497b..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-# Default version for this component
-%define tde_pkg kdbusnotification
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		a DBUS notification service [Trinity]
-
-Version:		0.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:			kdbusnotification-3.5.13.2-fix_utf8.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gtk2-devel
-
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .utf8
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%changelog
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.spec
deleted file mode 100644
index 597505ee4..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.spec
+++ /dev/null
@@ -1,119 +0,0 @@
-# Default version for this component
-%define kdecomp kdbusnotification
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a DBUS notification service [Trinity]
-
-Version:	0.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kdbusnotification/src/daemon] Missing QT LDFLAGS
-Patch1:		kdbusnotification-3.5.13-missing_ldlflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: dbus-glib-devel
-BuildRequires: gtk2-devel
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .ldflags
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kdiff3/bp000-c7e29c46.diff b/redhat/applications/kdiff3/bp000-c7e29c46.diff
deleted file mode 100644
index 821fe6fe1..000000000
--- a/redhat/applications/kdiff3/bp000-c7e29c46.diff
+++ /dev/null
@@ -1,662 +0,0 @@
-commit c7e29c4606e72cf1d3d0052eec08805c8cf3fce7
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253375 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/src/diff.h b/src/diff.h
-index ee3076e..a4015d1 100644
---- a/src/diff.h
-+++ b/src/diff.h
-@@ -169,10 +169,10 @@ public:
- typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
- 
- 
--class TotalDifftqStatus
-+class TotalDiffStatus
- {
- public:
--   TotalDifftqStatus(){ reset(); }
-+   TotalDiffStatus(){ reset(); }
-    void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
-                  bTextAEqC=false;   bTextBEqC=false;   bTextAEqB=false;
-                  nofUnsolvedConflicts=0; nofSolvedConflicts=0;
-diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
-index 3c570e4..361eb73 100644
---- a/src/difftextwindow.cpp
-+++ b/src/difftextwindow.cpp
-@@ -860,9 +860,9 @@ void DiffTextWindowData::writeLine(
-             else
-             {
-                p.fillRect( xOffset + fontWidth*outPos, yOffset,
--                           fontWidth*(spaces), fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() );
-+                           fontWidth*(spaces), fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
- 
--               p.setPen( m_pDiffTextWindow->tqcolorGroup().highlightedText() );
-+               p.setPen( m_pDiffTextWindow->colorGroup().highlightedText() );
-                p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s );
- 
-                m_selection.bSelectionContainsData = true;
-@@ -875,7 +875,7 @@ void DiffTextWindowData::writeLine(
-       if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) )
-       {
-          p.fillRect( xOffset + fontWidth*outPos, yOffset,
--                     deviceWidth, fontHeight, m_pDiffTextWindow->tqcolorGroup().highlight() );
-+                     deviceWidth, fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
-       }
-    }
- 
-diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
-index 7565e20..0520af3 100644
---- a/src/directorymergewindow.cpp
-+++ b/src/directorymergewindow.cpp
-@@ -387,7 +387,7 @@ static TQPixmap pixCombiner2( const TQPixmap* pm1, const TQPixmap* pm2 )
-    return pix;
- }
- 
--static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
-+static void calcDirStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
-                            int& nofDirs, int& nofEqualFiles, int& nofManualMerges )
- {
-    if ( i->m_pMFI->m_bDirA || i->m_pMFI->m_bDirB || i->m_pMFI->m_bDirC )
-@@ -408,7 +408,7 @@ static void calcDirtqStatus( bool bThreeDirs, DirMergeItem* i, int& nofFiles,
-       }
-    }
-    for( TQListViewItem* p = i->firstChild();  p!=0; p = p->nextSibling() )
--      calcDirtqStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
-+      calcDirStatus( bThreeDirs, static_cast<DirMergeItem*>(p), nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
- }
- 
- static TQString sortString(const TQString& s, bool bCaseSensitive)
-@@ -698,7 +698,7 @@ bool DirectoryMergeWindow::init
-       int nofEqualFiles=0;
-       int nofManualMerges=0;
-       for( TQListViewItem* p = firstChild();  p!=0; p = p->nextSibling() )
--         calcDirtqStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
-+         calcDirStatus( m_dirC.isValid(), static_cast<DirMergeItem*>(p),
-                         nofFiles, nofDirs, nofEqualFiles, nofManualMerges );
- 
-       TQString s;
-@@ -915,10 +915,10 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
-             mfi.m_bExistsInB ? mfi.m_fileInfoB.absFilePath() : TQString(""),
-             mfi.m_bExistsInC ? mfi.m_fileInfoC.absFilePath() : TQString(""),
-             "",
--            "","","",&mfi.m_totalDifftqStatus
-+            "","","",&mfi.m_totalDiffStatus
-             );
--         int nofNonwhiteConflicts = mfi.m_totalDifftqStatus.nofUnsolvedConflicts + 
--            mfi.m_totalDifftqStatus.nofSolvedConflicts - mfi.m_totalDifftqStatus.nofWhitespaceConflicts;
-+         int nofNonwhiteConflicts = mfi.m_totalDiffStatus.nofUnsolvedConflicts + 
-+            mfi.m_totalDiffStatus.nofSolvedConflicts - mfi.m_totalDiffStatus.nofWhitespaceConflicts;
- 
-          if (m_pOptions->m_bDmWhiteSpaceEqual && nofNonwhiteConflicts == 0)
-          {
-@@ -928,25 +928,25 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
-          }
-          else
-          {
--            mfi.m_bEqualAB = mfi.m_totalDifftqStatus.bBinaryAEqB;
--            mfi.m_bEqualBC = mfi.m_totalDifftqStatus.bBinaryBEqC;
--            mfi.m_bEqualAC = mfi.m_totalDifftqStatus.bBinaryAEqC;
-+            mfi.m_bEqualAB = mfi.m_totalDiffStatus.bBinaryAEqB;
-+            mfi.m_bEqualBC = mfi.m_totalDiffStatus.bBinaryBEqC;
-+            mfi.m_bEqualAC = mfi.m_totalDiffStatus.bBinaryAEqC;
-          }
-       }
-    }
-    else
-    {
-       bool bError;
--      TQString eqtqStatus;
-+      TQString eqStatus;
-       if( mfi.m_bExistsInA && mfi.m_bExistsInB )
-       {
-          if( mfi.m_bDirA ) mfi.m_bEqualAB=true;
--         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqtqStatus );
-+         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoB, mfi.m_bEqualAB, bError, eqStatus );
-       }
-       if( mfi.m_bExistsInA && mfi.m_bExistsInC )
-       {
-          if( mfi.m_bDirA ) mfi.m_bEqualAC=true;
--         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqtqStatus );
-+         else fastFileComparison( mfi.m_fileInfoA, mfi.m_fileInfoC, mfi.m_bEqualAC, bError, eqStatus );
-       }
-       if( mfi.m_bExistsInB && mfi.m_bExistsInC )
-       {
-@@ -955,7 +955,7 @@ void DirectoryMergeWindow::compareFilesAndCalcAges( MergeFileInfos& mfi )
-          else
-          {
-             if( mfi.m_bDirB ) mfi.m_bEqualBC=true;
--            else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqtqStatus );
-+            else fastFileComparison( mfi.m_fileInfoB, mfi.m_fileInfoC, mfi.m_bEqualBC, bError, eqStatus );
-          }
-       }
-    }
-@@ -1723,7 +1723,7 @@ void DirMergeItem::init(MergeFileInfos* pMFI)
- {
-    pMFI->m_pDMI = this;
-    m_pMFI = pMFI;
--   TotalDifftqStatus& tds = pMFI->m_totalDifftqStatus;
-+   TotalDiffStatus& tds = pMFI->m_totalDiffStatus;
-    if ( m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC )
-    {
-    }
-@@ -2820,7 +2820,7 @@ TQTextStream& operator<<( TQTextStream& ts, MergeFileInfos& mfi )
-    //FileAccess m_fileInfoB;
-    //FileAccess m_fileInfoC;
- 
--   //TotalDifftqStatus m_totalDifftqStatus;
-+   //TotalDiffStatus m_totalDiffStatus;
-    
-    vm.save(ts);
-    
-diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h
-index 25a66f7..99c0405 100644
---- a/src/directorymergewindow.h
-+++ b/src/directorymergewindow.h
-@@ -26,7 +26,7 @@
- #include <map>
- #include "common.h"
- #include "fileaccess.h"
--#include "diff.h" //TotalDifftqStatus
-+#include "diff.h" //TotalDiffStatus
- 
- class OptionDialog;
- class KIconLoader;
-@@ -37,7 +37,7 @@ class TQLabel;
- class KAction;
- class KToggleAction;
- class KActionCollection;
--class TotalDifftqStatus;
-+class TotalDiffStatus;
- 
- enum e_MergeOperation
- {
-@@ -99,7 +99,7 @@ public:
-    FileAccess m_fileInfoB;
-    FileAccess m_fileInfoC;
- 
--   TotalDifftqStatus m_totalDifftqStatus;   
-+   TotalDiffStatus m_totalDiffStatus;   
- };
- 
- class DirMergeItem : public TQListViewItem
-@@ -319,7 +319,7 @@ protected:
-    KAction* m_pDirSaveMergeState;
-    KAction* m_pDirLoadMergeState;
- signals:
--   void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDifftqStatus*);
-+   void startDiffMerge(TQString fn1,TQString fn2, TQString fn3, TQString ofn, TQString,TQString,TQString,TotalDiffStatus*);
-    void checkIfCanContinue( bool* pbContinue );
-    void updateAvailabilities();
-    void statusBarMessage( const TQString& msg );
-diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
-index c2be1dc..01b8d48 100644
---- a/src/fileaccess.cpp
-+++ b/src/fileaccess.cpp
-@@ -407,11 +407,11 @@ bool FileAccess::writeFile( const void* pSrcBuffer, unsigned long length )
-          if ( isExecutable() )  // value is true if the old file was executable
-          {
-             // Preserve attributes
--            struct stat srcFiletqStatus;
--            int statResult = ::stat( filePath().ascii(), &srcFiletqStatus );
-+            struct stat srcFileStatus;
-+            int statResult = ::stat( filePath().ascii(), &srcFileStatus );
-             if (statResult==0)
-             {
--               ::chmod ( filePath().ascii(), srcFiletqStatus.st_mode | S_IXUSR );
-+               ::chmod ( filePath().ascii(), srcFileStatus.st_mode | S_IXUSR );
-             }
-          }
- #endif
-@@ -938,28 +938,28 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
- 
-    // Update the times of the destFile
- #ifdef _WIN32
--   struct _stat srcFiletqStatus;
--   int statResult = ::_stat( srcName.ascii(), &srcFiletqStatus );
-+   struct _stat srcFileStatus;
-+   int statResult = ::_stat( srcName.ascii(), &srcFileStatus );
-    if (statResult==0)
-    {
-       _utimbuf destTimes;
--      destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */
--      destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */
-+      destTimes.actime = srcFileStatus.st_atime;/* time of last access */
-+      destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */
- 
-       _utime ( destName.ascii(), &destTimes );
--      _chmod ( destName.ascii(), srcFiletqStatus.st_mode );
-+      _chmod ( destName.ascii(), srcFileStatus.st_mode );
-    }
- #else
--   struct stat srcFiletqStatus;
--   int statResult = ::stat( srcName.ascii(), &srcFiletqStatus );
-+   struct stat srcFileStatus;
-+   int statResult = ::stat( srcName.ascii(), &srcFileStatus );
-    if (statResult==0)
-    {
-       utimbuf destTimes;
--      destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */
--      destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */
-+      destTimes.actime = srcFileStatus.st_atime;/* time of last access */
-+      destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */
- 
-       utime ( destName.ascii(), &destTimes );
--      chmod ( destName.ascii(), srcFiletqStatus.st_mode );
-+      chmod ( destName.ascii(), srcFileStatus.st_mode );
-    }
- #endif
-    return true;
-@@ -1010,7 +1010,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore )
-            ".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj "
-            "*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
- 
--   addEntriesFromString(TQString::tqfromLatin1(ignorestr));
-+   addEntriesFromString(TQString::fromLatin1(ignorestr));
-    addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore");
-    addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE")));
- 
-@@ -1032,7 +1032,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore )
-                {
-                   if (pos>pos1)
-                   {
--                     addEntry( TQString::tqfromLatin1( &buf[pos1], pos-pos1 ) );
-+                     addEntry( TQString::fromLatin1( &buf[pos1], pos-pos1 ) );
-                   }
-                   ++pos1;
-                }
-diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
-index c3541ec..e6b3f40 100644
---- a/src/kdiff3.cpp
-+++ b/src/kdiff3.cpp
-@@ -280,8 +280,8 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
-       KApplication::kApplication()->iconLoader() );
-    m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );
-    m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo );
--   connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*)),
--            TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDifftqStatus*)));
-+   connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
-+            TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
-    connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
-    connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
-    connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*)));
-@@ -341,13 +341,13 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ
-          SourceData* pSD=0;
-          if ( m_sd3.isEmpty() )
-          {
--            if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd1; }
-+            if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd1; }
-          }
-          else
-          {
--            if      ( m_totalDifftqStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old)
--            else if ( m_totalDifftqStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed
--            else if ( m_totalDifftqStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed
-+            if      ( m_totalDiffStatus.bBinaryBEqC ){ pSD = &m_sd3; } // B==C (assume A is old)
-+            else if ( m_totalDiffStatus.bBinaryAEqB ){ pSD = &m_sd3; } // assuming C has changed
-+            else if ( m_totalDiffStatus.bBinaryAEqC ){ pSD = &m_sd2; } // assuming B has changed
-          }
- 
-          if ( pSD!=0 )
-diff --git a/src/kdiff3.h b/src/kdiff3.h
-index f5e240f..c81ae71 100644
---- a/src/kdiff3.h
-+++ b/src/kdiff3.h
-@@ -144,7 +144,7 @@ class KDiff3App : public TQSplitter
-     /** open a file and load it into the document*/
-     void slotFileOpen();
-     void slotFileOpen2( TQString fn1, TQString fn2, TQString fn3, TQString ofn,
--                        TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus );
-+                        TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus );
- 
-     void slotFileNameChanged(const TQString& fileName, int winIdx);
- 
-@@ -281,7 +281,7 @@ class KDiff3App : public TQSplitter
- 
-     TQWidget* m_pCornerWidget;
- 
--    TotalDifftqStatus m_totalDifftqStatus;
-+    TotalDiffStatus m_totalDiffStatus;
- 
-     SourceData m_sd1;
-     SourceData m_sd2;
-@@ -310,7 +310,7 @@ class KDiff3App : public TQSplitter
-    OptionDialog* m_pOptionDialog;
-    FindDialog*   m_pFindDialog;
- 
--   void init( bool bAuto=false, TotalDifftqStatus* pTotalDifftqStatus=0, bool bLoadFiles=true );
-+   void init( bool bAuto=false, TotalDiffStatus* pTotalDiffStatus=0, bool bLoadFiles=true );
- 
-    virtual bool eventFilter( TQObject* o, TQEvent* e );
-    virtual void resizeEvent(TQResizeEvent*);
-diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
-index 119294f..a222a14 100644
---- a/src/mergeresultwindow.cpp
-+++ b/src/mergeresultwindow.cpp
-@@ -72,7 +72,7 @@ MergeResultWindow::MergeResultWindow(
-    m_sizeC = 0;
- 
-    m_pDiff3LineList = 0;
--   m_pTotalDifftqStatus = 0;
-+   m_pTotalDiffStatus = 0;
-    m_pStatusBar = pStatusBar;
- 
-    m_pOptionDialog = pOptionDialog;
-@@ -97,7 +97,7 @@ void MergeResultWindow::init(
-    const LineData* pLineDataB, int sizeB,
-    const LineData* pLineDataC, int sizeC,
-    const Diff3LineList* pDiff3LineList,
--   TotalDifftqStatus* pTotalDifftqStatus
-+   TotalDiffStatus* pTotalDiffStatus
-    )
- {
-    m_firstLine = 0;
-@@ -118,7 +118,7 @@ void MergeResultWindow::init(
-    m_sizeC = sizeC;
- 
-    m_pDiff3LineList = pDiff3LineList;
--   m_pTotalDifftqStatus = pTotalDifftqStatus;
-+   m_pTotalDiffStatus = pTotalDiffStatus;
-    
-    m_selection.reset();
-    m_cursorXPos=0;
-@@ -140,7 +140,7 @@ void MergeResultWindow::init(
- void MergeResultWindow::reset()
- {
-    m_pDiff3LineList = 0;
--   m_pTotalDifftqStatus = 0;
-+   m_pTotalDiffStatus = 0;
-    m_pldA = 0;
-    m_pldB = 0;
-    m_pldC = 0;
-@@ -467,9 +467,9 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli
-          ++nrOfWhiteSpaceConflicts;
-    }
- 
--   m_pTotalDifftqStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts;
--   m_pTotalDifftqStatus->nofSolvedConflicts = nrOfSolvedConflicts;
--   m_pTotalDifftqStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts;
-+   m_pTotalDiffStatus->nofUnsolvedConflicts = nrOfUnsolvedConflicts;
-+   m_pTotalDiffStatus->nofSolvedConflicts = nrOfSolvedConflicts;
-+   m_pTotalDiffStatus->nofWhitespaceConflicts = nrOfWhiteSpaceConflicts;
- 
- 
-    m_cursorXPos=0;
-@@ -804,17 +804,17 @@ void MergeResultWindow::showNrOfConflicts()
-          ++nrOfConflicts;
-    }
-    TQString totalInfo;
--   if ( m_pTotalDifftqStatus->bBinaryAEqB && m_pTotalDifftqStatus->bBinaryAEqC )
-+   if ( m_pTotalDiffStatus->bBinaryAEqB && m_pTotalDiffStatus->bBinaryAEqC )
-       totalInfo += i18n("All input files are binary equal.");
--   else  if ( m_pTotalDifftqStatus->bTextAEqB && m_pTotalDifftqStatus->bTextAEqC )
-+   else  if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
-       totalInfo += i18n("All input files contain the same text.");
-    else {
--      if    ( m_pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
--      else if ( m_pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
--      if    ( m_pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
--      else if ( m_pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
--      if    ( m_pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
--      else if ( m_pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
-+      if    ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
-+      else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
-+      if    ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
-+      else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
-+      if    ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
-+      else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
-    }
- 
-    int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
-@@ -1661,12 +1661,12 @@ void MergeResultWindow::writeLine(
- 
-          if( m_selection.lineWithin( line+1 ) )
-             p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
--               width(), fontHeight, tqcolorGroup().highlight() );
-+               width(), fontHeight, colorGroup().highlight() );
-          else if ( lengthInLine2>0 )
-             p.fillRect( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset,
--               fontWidth*lengthInLine2, fontHeight, tqcolorGroup().highlight() );
-+               fontWidth*lengthInLine2, fontHeight, colorGroup().highlight() );
- 
--         p.setPen( tqcolorGroup().highlightedText() );
-+         p.setPen( colorGroup().highlightedText() );
-          p.drawText( xOffset + fontWidth*(firstPosInLine2-m_firstColumn), yOffset+fontAscent,
-             s.mid(firstPosInLine2,lengthInLine2), true );
-       }
-@@ -3072,7 +3072,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar
- 
-    m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this);
-    pHLayout->addWidget( m_pModifiedLabel );
--   m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->tqsizeHint() );
-+   m_pModifiedLabel->setMinimumSize( m_pModifiedLabel->sizeHint() );
-    m_pModifiedLabel->setText("");
- 
-    pHLayout->addStretch(1);
-@@ -3137,7 +3137,7 @@ void WindowTitleWidget::setEncodings( TQTextCodec* pCodecForA, TQTextCodec* pCod
-       m_codecMap[i]=it->second;
-       ++i;
-    }
--   m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->tqsizeHint() );
-+   m_pEncodingSelector->setMinimumSize( m_pEncodingSelector->sizeHint() );
- 
-    if ( pCodecForC && pCodecForB && pCodecForA )
-    {
-diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h
-index ed524a5..2b61e6f 100644
---- a/src/mergeresultwindow.h
-+++ b/src/mergeresultwindow.h
-@@ -110,7 +110,7 @@ public:
-       const LineData* pLineDataB, int sizeB,
-       const LineData* pLineDataC, int sizeC,
-       const Diff3LineList* pDiff3LineList,
--      TotalDifftqStatus* pTotalDifftqStatus
-+      TotalDiffStatus* pTotalDiffStatus
-       );
- 
-    void reset();
-@@ -187,7 +187,7 @@ private:
-    int m_sizeC;
- 
-    const Diff3LineList* m_pDiff3LineList;
--   TotalDifftqStatus* m_pTotalDifftqStatus;
-+   TotalDiffStatus* m_pTotalDiffStatus;
- 
-    bool m_bPaintingAllowed;
-    int m_delayedDrawTimer;
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index 033fd31..1452eca 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -235,14 +235,14 @@ bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int
-    return true;
- }
- 
--void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bLoadFiles )
-+void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles )
- {
-    ProgressProxy pp;
-    // When doing a full analysis in the directory-comparison, then the statistics-results
--   // will be stored in the given TotalDifftqStatus. Otherwise it will be 0.
--   bool bGUI = pTotalDifftqStatus == 0;
--   if (pTotalDifftqStatus==0) 
--      pTotalDifftqStatus = &m_totalDifftqStatus;
-+   // will be stored in the given TotalDiffStatus. Otherwise it will be 0.
-+   bool bGUI = pTotalDiffStatus == 0;
-+   if (pTotalDiffStatus==0) 
-+      pTotalDiffStatus = &m_totalDiffStatus;
- 
-    bool bPreserveCarriageReturn = m_pOptionDialog->m_bPreserveCarriageReturn;
- 
-@@ -310,11 +310,11 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
-          pp.setMaxNofSteps( 6 );  // 3 comparisons, 3 finediffs
-    }
- 
--   pTotalDifftqStatus->reset();
-+   pTotalDiffStatus->reset();
-    // Run the diff.
-    if ( m_sd3.isEmpty() )
-    {
--      pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
-+      pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
-       pp.setInformation(i18n("Diff: A <-> B"));
- 
-       runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
-@@ -323,8 +323,8 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
- 
-       pp.setInformation(i18n("Linediff: A <-> B"));
-       calcDiff3LineListUsingAB( &m_diffList12, m_diff3LineList );
--      fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB );
--      if ( m_sd1.getSizeBytes()==0 ) pTotalDifftqStatus->bTextAEqB=false;
-+      fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
-+      if ( m_sd1.getSizeBytes()==0 ) pTotalDiffStatus->bTextAEqB=false;
- 
-       pp.step();
-    }
-@@ -337,9 +337,9 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
-          pp.step();
-       }
- 
--      pTotalDifftqStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
--      pTotalDifftqStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
--      pTotalDifftqStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
-+      pTotalDiffStatus->bBinaryAEqB = m_sd1.isBinaryEqualWith( m_sd2 );
-+      pTotalDiffStatus->bBinaryAEqC = m_sd1.isBinaryEqualWith( m_sd3 );
-+      pTotalDiffStatus->bBinaryBEqC = m_sd3.isBinaryEqualWith( m_sd2 );
- 
-       pp.setInformation(i18n("Diff: A <-> B"));
-       runDiff( m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(), m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(), m_diffList12,1,2 );
-@@ -364,16 +364,16 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
-       debugLineCheck( m_diff3LineList, m_sd3.getSizeLines(), 3 );
- 
-       pp.setInformation(i18n("Linediff: A <-> B"));
--      fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqB );
-+      fineDiff( m_diff3LineList, 1, m_sd1.getLineDataForDisplay(), m_sd2.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqB );
-       pp.step();
-       pp.setInformation(i18n("Linediff: B <-> C"));
--      fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDifftqStatus->bTextBEqC );
-+      fineDiff( m_diff3LineList, 2, m_sd2.getLineDataForDisplay(), m_sd3.getLineDataForDisplay(), pTotalDiffStatus->bTextBEqC );
-       pp.step();
-       pp.setInformation(i18n("Linediff: A <-> C"));
--      fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDifftqStatus->bTextAEqC );
-+      fineDiff( m_diff3LineList, 3, m_sd3.getLineDataForDisplay(), m_sd1.getLineDataForDisplay(), pTotalDiffStatus->bTextAEqC );
-       pp.step();
--      if ( m_sd1.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false;  pTotalDifftqStatus->bTextAEqC=false; }
--      if ( m_sd2.getSizeBytes()==0 ) { pTotalDifftqStatus->bTextAEqB=false;  pTotalDifftqStatus->bTextBEqC=false; }
-+      if ( m_sd1.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false;  pTotalDiffStatus->bTextAEqC=false; }
-+      if ( m_sd2.getSizeBytes()==0 ) { pTotalDiffStatus->bTextAEqB=false;  pTotalDiffStatus->bTextBEqC=false; }
-    }
-    m_diffBufferInfo.init( &m_diff3LineList, &m_diff3LineVector,
-       m_sd1.getLineDataForDiff(), m_sd1.getSizeLines(),
-@@ -420,7 +420,7 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
-       m_sd2.getLineDataForDisplay(), m_sd2.getSizeLines(),
-       m_bTripleDiff ? m_sd3.getLineDataForDisplay() : 0, m_sd3.getSizeLines(),
-       &m_diff3LineList,
--      pTotalDifftqStatus      
-+      pTotalDiffStatus      
-       );
-    m_pMergeResultWindowTitle->setFileName( m_outputFilename.isEmpty() ? TQString("unnamed.txt") : m_outputFilename );
- 
-@@ -507,17 +507,17 @@ void KDiff3App::init( bool bAuto, TotalDifftqStatus* pTotalDifftqStatus, bool bL
-          )
-       {
-          TQString totalInfo;
--         if ( pTotalDifftqStatus->bBinaryAEqB && pTotalDifftqStatus->bBinaryAEqC )
-+         if ( pTotalDiffStatus->bBinaryAEqB && pTotalDiffStatus->bBinaryAEqC )
-             totalInfo += i18n("All input files are binary equal.");
--         else  if ( pTotalDifftqStatus->bTextAEqB && pTotalDifftqStatus->bTextAEqC )
-+         else  if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
-             totalInfo += i18n("All input files contain the same text, but are not binary equal.");
-          else {
--            if    ( pTotalDifftqStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("B");
--            else if ( pTotalDifftqStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
--            if    ( pTotalDifftqStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("C");
--            else if ( pTotalDifftqStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
--            if    ( pTotalDifftqStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("B").tqarg("C");
--            else if ( pTotalDifftqStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
-+            if    ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("B");
-+            else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
-+            if    ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("C");
-+            else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
-+            if    ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("B").tqarg("C");
-+            else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
-          }
- 
-          if ( !totalInfo.isEmpty() )
-@@ -609,12 +609,12 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask )
- 
- 
- 
--// Function uses setMinSize( tqsizeHint ) before adding the widget.
-+// Function uses setMinSize( sizeHint ) before adding the widget.
- // void addWidget(TQBoxLayout* tqlayout, TQWidget* widget);
- template <class W, class L>
- void addWidget( L* tqlayout, W* widget)
- {
--   TQSize s = widget->tqsizeHint();
-+   TQSize s = widget->sizeHint();
-    widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) );
-    tqlayout->addWidget( widget );
- }
-@@ -1071,7 +1071,7 @@ void KDiff3App::slotFileOpen()
- }
- 
- void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString ofn,
--                              TQString an1, TQString an2, TQString an3, TotalDifftqStatus* pTotalDifftqStatus )
-+                              TQString an1, TQString an2, TQString an3, TotalDiffStatus* pTotalDiffStatus )
- {
-    if ( !canContinue() ) return;
- 
-@@ -1111,9 +1111,9 @@ void KDiff3App::slotFileOpen2(TQString fn1, TQString fn2, TQString fn3, TQString
-    else
-    {
-       m_bDirCompare = bDirCompare;  // Don't allow this to change here.
--      init( false, pTotalDifftqStatus );
-+      init( false, pTotalDiffStatus );
- 
--      if ( pTotalDifftqStatus!=0 )
-+      if ( pTotalDiffStatus!=0 )
-          return;
- 
-       if ( ! m_sd1.isEmpty() && ! m_sd1.hasData()  ||
-@@ -1969,7 +1969,7 @@ void KDiff3App::slotMergeCurrentFile()
- 
- void KDiff3App::slotWinFocusNext()
- {
--   TQWidget* focus = tqApp->tqfocusWidget();
-+   TQWidget* focus = tqApp->focusWidget();
-    if ( focus == m_pDirectoryMergeWindow && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
-    {
-       slotDirViewToggle();
-@@ -1999,7 +1999,7 @@ void KDiff3App::slotWinFocusNext()
- 
- void KDiff3App::slotWinFocusPrev()
- {
--   TQWidget* focus = tqApp->tqfocusWidget();
-+   TQWidget* focus = tqApp->focusWidget();
-    if ( focus == m_pDirectoryMergeWindow  && m_pDirectoryMergeWindow->isVisible() && ! dirShowBoth->isChecked() )
-    {
-       slotDirViewToggle();
-diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
-index 7dc6340..5ed0c26 100644
---- a/src/smalldialogs.cpp
-+++ b/src/smalldialogs.cpp
-@@ -170,7 +170,7 @@ OpenDialog::OpenDialog(
-    connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) );
-    l->addWidget( button,1 );
- 
--   TQSize sh = tqsizeHint();
-+   TQSize sh = sizeHint();
-    setFixedHeight( sh.height() );
-    m_bInputFileNameChanged = false;
- 
-@@ -498,7 +498,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
-    pGrid->addWidget(pButton,line,1);
-    connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
- 
--   resize( 800, tqsizeHint().height() );
-+   resize( 800, sizeHint().height() );
- }
- 
- void RegExpTester::init( const TQString& autoMergeRegExp, const TQString& historyStartRegExp, const TQString& historyEntryStartRegExp, const TQString historySortKeyOrder )
diff --git a/redhat/applications/kdiff3/bp001-9b57232f.diff b/redhat/applications/kdiff3/bp001-9b57232f.diff
deleted file mode 100644
index 6b0808574..000000000
--- a/redhat/applications/kdiff3/bp001-9b57232f.diff
+++ /dev/null
@@ -1,627 +0,0 @@
-commit 9b57232f1beb774a8a4bab4ae1f85999e193d037
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316180 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
-index 53360b6..ec008f1 100755
---- a/kdiff3plugin/kdiff3plugin.cpp
-+++ b/kdiff3plugin/kdiff3plugin.cpp
-@@ -101,17 +101,17 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
-    if(m_list.count() == 1)
-    {
-       int historyCount = s_pHistory ? s_pHistory->count() : 0;
--      s = i18n("Compare with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() );
-+      s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
-       pAction = new KAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection());
-       pAction->setEnabled( m_list.count()>0 && historyCount>0 );
-       pActionMenu->insert (pAction);
- 
--      s = i18n("Merge with %1").tqarg( historyCount>0 ? s_pHistory->front() : TQString() );
-+      s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
-       pAction = new KAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection());
-       pAction->setEnabled( m_list.count()>0 && historyCount>0 );
-       pActionMenu->insert (pAction);
- 
--      s = i18n("Save '%1' for later").tqarg( ( m_list.front() ) );
-+      s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
-       pAction = new KAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection());
-       pAction->setEnabled( m_list.count()>0 );
-       pActionMenu->insert(pAction);
-diff --git a/src/diff.cpp b/src/diff.cpp
-index 136275c..722950f 100644
---- a/src/diff.cpp
-+++ b/src/diff.cpp
-@@ -492,7 +492,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
-             KMessageBox::error(m_pOptionDialog, 
-                i18n("Preprocessing possibly failed. Check this command:\n\n  %1"
-                   "\n\nThe preprocessing command will be disabled now."
--               ).tqarg(cmd) );
-+               ).arg(cmd) );
-             m_pOptionDialog->m_PreProcessorCmd = "";
-             m_normalData.readFile( fileNameIn1 );
-             pEncoding1 = m_pEncoding;
-@@ -527,7 +527,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
-             KMessageBox::error(m_pOptionDialog, 
-                i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n  %1"
-                     "\n\nThe line-matching-preprocessing command will be disabled now."
--                   ).tqarg(cmd) );
-+                   ).arg(cmd) );
-             m_pOptionDialog->m_LineMatchingPreProcessorCmd = "";
-             m_lmppData.readFile( fileNameIn2 );
-          }
-@@ -1190,7 +1190,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
-    if ( pManualDiffHelpList->empty() )
-       return;
- 
--   // If a line appears unaligned in comparison to the manual tqalignment, correct this.
-+   // If a line appears unaligned in comparison to the manual alignment, correct this.
- 
-    ManualDiffHelpList::iterator iMDHL;
-    for( iMDHL =  pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL )
-@@ -1228,7 +1228,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
- 
-       if (wi>=1 && wi <= 3)
-       {
--         // Found manual tqalignment for one source
-+         // Found manual alignment for one source
-          Diff3LineList::iterator iDest = i3;
- 
-          // Move lines up until the next firstLine is found. Omit wi from move and search.
-diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
-index 361eb73..e8124fa 100644
---- a/src/difftextwindow.cpp
-+++ b/src/difftextwindow.cpp
-@@ -1656,7 +1656,7 @@ void DiffTextWindowFrame::setFirstLine( int firstLine )
-          s += " " + TQString::number( l+1 );
- 
-       d->m_pTopLine->setText( s );
--      d->m_pTopLine->tqrepaint();
-+      d->m_pTopLine->repaint();
-    }
- }
- 
-diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
-index 0520af3..b4f6b20 100644
---- a/src/directorymergewindow.cpp
-+++ b/src/directorymergewindow.cpp
-@@ -187,13 +187,13 @@ void DirectoryMergeWindow::fastFileComparison(
-    TempRemover tr1( fileName1, fi1 );
-    if ( !tr1.success() )
-    {
--      status = i18n("Creating temp copy of %1 failed.").tqarg(fileName1);
-+      status = i18n("Creating temp copy of %1 failed.").arg(fileName1);
-       return;
-    }
-    TempRemover tr2( fileName2, fi2 );
-    if ( !tr2.success() )
-    {
--      status = i18n("Creating temp copy of %1 failed.").tqarg(fileName2);
-+      status = i18n("Creating temp copy of %1 failed.").arg(fileName2);
-       return;
-    }
- 
-@@ -204,7 +204,7 @@ void DirectoryMergeWindow::fastFileComparison(
- 
-    if ( ! file1.open(IO_ReadOnly) )
-    {
--      status = i18n("Opening %1 failed.").tqarg(fileName1);
-+      status = i18n("Opening %1 failed.").arg(fileName1);
-       return;
-    }
- 
-@@ -212,7 +212,7 @@ void DirectoryMergeWindow::fastFileComparison(
- 
-    if ( ! file2.open(IO_ReadOnly) )
-    {
--      status = i18n("Opening %1 failed.").tqarg(fileName2);
-+      status = i18n("Opening %1 failed.").arg(fileName2);
-       return;
-    }
- 
-@@ -230,13 +230,13 @@ void DirectoryMergeWindow::fastFileComparison(
-       int len = min2( sizeLeft, (t_FileSize)buf1.size() );
-       if( len != file1.readBlock( &buf1[0], len ) )
-       {
--         status = i18n("Error reading from %1").tqarg(fileName1);
-+         status = i18n("Error reading from %1").arg(fileName1);
-          return;
-       }
- 
-       if( len != file2.readBlock( &buf2[0], len ) )
-       {
--         status = i18n("Error reading from %1").tqarg(fileName2);
-+         status = i18n("Error reading from %1").arg(fileName2);
-          return;
-       }
- 
-@@ -507,13 +507,13 @@ bool DirectoryMergeWindow::init
-        TQString text( i18n("Opening of directories failed:") );
-        text += "\n\n";
-        if ( !dirA.isDir() )
--       {  text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").tqarg(m_dirA.prettyAbsPath()); }
-+       {  text += i18n("Dir A \"%1\" does not exist or is not a directory.\n").arg(m_dirA.prettyAbsPath()); }
- 
-        if ( !dirB.isDir() )
--       {  text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").tqarg(m_dirB.prettyAbsPath()); }
-+       {  text += i18n("Dir B \"%1\" does not exist or is not a directory.\n").arg(m_dirB.prettyAbsPath()); }
- 
-        if ( m_dirC.isValid() && !m_dirC.isDir() )
--       {  text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").tqarg(m_dirC.prettyAbsPath()); }
-+       {  text += i18n("Dir C \"%1\" does not exist or is not a directory.\n").arg(m_dirC.prettyAbsPath()); }
- 
-        KMessageBox::sorry( this, text, i18n("Directory Open Error") );
-        return false;
-@@ -2138,7 +2138,7 @@ void DirectoryMergeWindow::slotRunOperationForCurrentItem()
-    if ( m_mergeItemList.empty() )
-    {
-       TQListViewItem* pBegin = currentItem();
--      TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no tqchildren)
-+      TQListViewItem* pEnd = treeIterator(pBegin,false,false); // find next visible sibling (no children)
- 
-       prepareMergeStart( pBegin, pEnd, bVerbose );
-       mergeContinue(true, bVerbose);
-@@ -2411,16 +2411,16 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup )
-       bool bSuccess = renameFLD( name, name+".orig" );
-       if (!bSuccess)
-       {
--         m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").tqarg(name) );
-+         m_pStatusInfo->addText( i18n("Error: While deleting %1: Creating backup failed.").arg(name) );
-          return false;
-       }
-    }
-    else
-    {
-       if ( fi.isDir() && !fi.isSymLink() )
--         m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").tqarg(name));
-+         m_pStatusInfo->addText(i18n("delete directory recursively( %1 )").arg(name));
-       else
--         m_pStatusInfo->addText(i18n("delete( %1 )").tqarg(name));
-+         m_pStatusInfo->addText(i18n("delete( %1 )").arg(name));
- 
-       if ( m_bSimulatedMergeStarted )
-       {
-@@ -2454,7 +2454,7 @@ bool DirectoryMergeWindow::deleteFLD( const TQString& name, bool bCreateBackup )
-             bSuccess = FileAccess::removeDir( name );
-             if ( !bSuccess )
-             {
--               m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").tqarg(name));
-+               m_pStatusInfo->addText( i18n("Error: rmdir( %1 ) operation failed.").arg(name));
-                return false;
-             }
-          }
-@@ -2490,7 +2490,7 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB
-          return false;
-    }
- 
--   m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").tqarg(nameA).tqarg(nameB).tqarg(nameC).tqarg(nameDest));
-+   m_pStatusInfo->addText(i18n("manual merge( %1, %2, %3 -> %4)").arg(nameA).arg(nameB).arg(nameC).arg(nameDest));
-    if ( m_bSimulatedMergeStarted )
-    {
-       m_pStatusInfo->addText(i18n("     Note: After a manual merge the user should continue by pressing F7.") );
-@@ -2517,7 +2517,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
-       if ( !bSuccess )
-       {
-          m_pStatusInfo->addText(i18n("Error: copy( %1 -> %2 ) failed."
--            "Deleting existing destination failed.").tqarg(srcName).tqarg(destName));
-+            "Deleting existing destination failed.").arg(srcName).arg(destName));
-          return false;
-       }
-    }
-@@ -2526,7 +2526,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
- 
-    if ( fi.isSymLink() && (fi.isDir() && !m_bFollowDirLinks  ||  !fi.isDir() && !m_bFollowFileLinks) )
-    {
--      m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").tqarg(srcName).tqarg(destName));
-+      m_pStatusInfo->addText(i18n("copyLink( %1 -> %2 )").arg(srcName).arg(destName));
- #ifdef _WIN32
-       // What are links?
- #else
-@@ -2563,7 +2563,7 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des
-          return false;
-    }
- 
--   m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").tqarg(srcName).tqarg(destName));
-+   m_pStatusInfo->addText(i18n("copy( %1 -> %2 )").arg(srcName).arg(destName));
- 
-    if ( m_bSimulatedMergeStarted )
-    {
-@@ -2590,12 +2590,12 @@ bool DirectoryMergeWindow::renameFLD( const TQString& srcName, const TQString& d
-       if (!bSuccess)
-       {
-          m_pStatusInfo->addText( i18n("Error during rename( %1 -> %2 ): "
--                             "Cannot delete existing destination." ).tqarg(srcName).tqarg(destName));
-+                             "Cannot delete existing destination." ).arg(srcName).arg(destName));
-          return false;
-       }
-    }
- 
--   m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").tqarg(srcName).tqarg(destName));
-+   m_pStatusInfo->addText(i18n("rename( %1 -> %2 )").arg(srcName).arg(destName));
-    if ( m_bSimulatedMergeStarted )
-    {
-       return true;
-@@ -2623,7 +2623,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
-       if (!bSuccess)
-       {
-          m_pStatusInfo->addText( i18n("Error during makeDir of %1. "
--                             "Cannot delete existing file." ).tqarg(name));
-+                             "Cannot delete existing file." ).arg(name));
-          return false;
-       }
-    }
-@@ -2638,7 +2638,7 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet )
-    }
- 
-    if ( ! bQuiet )
--      m_pStatusInfo->addText(i18n("makeDir( %1 )").tqarg(name));
-+      m_pStatusInfo->addText(i18n("makeDir( %1 )").arg(name));
- 
-    if ( m_bSimulatedMergeStarted )
-    {
-diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
-index 01b8d48..1f90d5d 100644
---- a/src/fileaccess.cpp
-+++ b/src/fileaccess.cpp
-@@ -625,7 +625,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
- 
-    connect( pStatJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*)));
- 
--   g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
-+   g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
- 
-    return m_bSuccess;
- }
-@@ -668,7 +668,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
-       connect( pJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(KIO::Job*, const TQByteArray&)));
-       connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- 
--      g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
-+      g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
-       return m_bSuccess;
-    }
-    else
-@@ -704,7 +704,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
-       connect( pJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(KIO::Job*, TQByteArray&)));
-       connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- 
--      g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
-+      g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
-       return m_bSuccess;
-    }
-    else
-@@ -721,7 +721,7 @@ void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data )
-    {
-       long maxChunkSize = 100000;
-       long length = min2( maxChunkSize, m_maxLength - m_transferredBytes );
--      bool bSuccess = data.tqresize( length );
-+      bool bSuccess = data.resize( length );
-       if ( bSuccess )
-       {
-          if ( length>0 )
-@@ -767,7 +767,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
-       KIO::SimpleJob* pJob = KIO::mkdir( dirURL );
-       connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- 
--      g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").tqarg(dirName) );
-+      g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
-       return m_bSuccess;
-    }
- }
-@@ -787,7 +787,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
-       KIO::SimpleJob* pJob = KIO::rmdir( dirURL );
-       connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- 
--      g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").tqarg(dirName));
-+      g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
-       return m_bSuccess;
-    }
- }
-@@ -802,7 +802,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
-       KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false );
-       connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- 
--      g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").tqarg(fileName) );
-+      g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
-       return m_bSuccess;
-    }
- }
-@@ -818,7 +818,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
-       connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- 
-       g_pProgressDialog->enterEventLoop( pJob,
--         i18n("Creating symbolic link: %1 -> %2").tqarg(linkLocation).tqarg(linkTarget) );
-+         i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
-       return m_bSuccess;
-    }
- }
-@@ -848,7 +848,7 @@ bool FileAccessJobHandler::rename( const TQString& dest )
-       connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- 
-       g_pProgressDialog->enterEventLoop( pJob,
--         i18n("Renaming file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
-+         i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
-       return m_bSuccess;
-    }
- }
-@@ -884,7 +884,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
-       connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
-       connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
-       g_pProgressDialog->enterEventLoop( pJob,
--         i18n("Copying file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
-+         i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
- 
-       return m_bSuccess;
-       // Note that the KIO-slave preserves the original date, if this is supported.
-@@ -898,13 +898,13 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
-    bool bReadSuccess = srcFile.open( IO_ReadOnly );
-    if ( bReadSuccess == false )
-    {
--      m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").tqarg(srcName);
-+      m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").arg(srcName);
-       return false;
-    }
-    bool bWriteSuccess = destFile.open( IO_WriteOnly );
-    if ( bWriteSuccess == false )
-    {
--      m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").tqarg(destName);
-+      m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").arg(destName);
-       return false;
-    }
- 
-@@ -916,7 +916,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
-       TQ_LONG readSize = srcFile.readBlock( &buffer[0], min2( srcSize, bufSize ) );
-       if ( readSize==-1 || readSize==0 )
-       {
--         m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").tqarg(srcName);
-+         m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").arg(srcName);
-          return false;
-       }
-       srcSize -= readSize;
-@@ -925,7 +925,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
-          TQ_LONG writeSize = destFile.writeBlock( &buffer[0], readSize );
-          if ( writeSize==-1 || writeSize==0 )
-          {
--            m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").tqarg(destName);
-+            m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").arg(destName);
-             return false;
-          }
-          readSize -= writeSize;
-@@ -1344,7 +1344,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
-          //connect( pListJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- 
-          g_pProgressDialog->enterEventLoop( pListJob,
--            i18n("Listing directory: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
-+            i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
-       }
-    }
- 
-diff --git a/src/gnudiff_diff.h b/src/gnudiff_diff.h
-index 7bc8b92..482435c 100644
---- a/src/gnudiff_diff.h
-+++ b/src/gnudiff_diff.h
-@@ -110,7 +110,7 @@ bool brief;
- bool expand_tabs;
- 
- /* Use a tab in the output, rather than a space, before the text of an
--   input line, so as to keep the proper tqalignment in the input line
-+   input line, so as to keep the proper alignment in the input line
-    without changing the characters in it (-T).  */
- bool initial_tab;
- 
-diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
-index e6b3f40..ef1a843 100644
---- a/src/kdiff3.cpp
-+++ b/src/kdiff3.cpp
-@@ -259,7 +259,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
-       slotViewStatusBar();
-       if( toolBar("mainToolBar")!=0 )
-          toolBar("mainToolBar")->setBarPos( (KToolBar::BarPosition) m_pOptionDialog->m_toolBarPos );
--/*      TQSize size = m_pOptionDialog->m_tqgeometry;
-+/*      TQSize size = m_pOptionDialog->m_geometry;
-       TQPoint pos = m_pOptionDialog->m_position;
-       if(!size.isEmpty())
-       {
-@@ -303,7 +303,7 @@ void KDiff3App::completeInit( const TQString& fn1, const TQString& fn2, const TQ
- {
-    if (m_pKDiff3Shell!=0)
-    {
--      TQSize size=m_pOptionDialog->m_tqgeometry;
-+      TQSize size=m_pOptionDialog->m_geometry;
-       TQPoint pos=m_pOptionDialog->m_position;
-       if(!size.isEmpty())
-       {
-@@ -577,7 +577,7 @@ void KDiff3App::saveOptions( KConfig* config )
-          m_pOptionDialog->m_bMaximised = m_pKDiff3Shell->isMaximized();
-          if( ! m_pKDiff3Shell->isMaximized() && m_pKDiff3Shell->isVisible() )
-          {
--            m_pOptionDialog->m_tqgeometry = m_pKDiff3Shell->size();
-+            m_pOptionDialog->m_geometry = m_pKDiff3Shell->size();
-             m_pOptionDialog->m_position = m_pKDiff3Shell->pos();
-          }
-          if ( toolBar("mainToolBar")!=0 )
-diff --git a/src/kdiff3.h b/src/kdiff3.h
-index c81ae71..46c0d3c 100644
---- a/src/kdiff3.h
-+++ b/src/kdiff3.h
-@@ -110,7 +110,7 @@ class KDiff3App : public TQSplitter
-     /** initializes the KActions of the application */
-     void initActions( KActionCollection* );
- 
--    /** save general Options like all bar positions and status as well as the tqgeometry
-+    /** save general Options like all bar positions and status as well as the geometry
-         and the recent file list to the configuration file */
-     void saveOptions( KConfig* );
- 
-diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
-index 75894a1..c49adaf 100644
---- a/src/kreplacements/kreplacements.cpp
-+++ b/src/kreplacements/kreplacements.cpp
-@@ -676,7 +676,7 @@ KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KA
- KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection)
- {
-    KMainWindow* p = actionCollection->m_pMainWindow;
--   KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false );
-+   KAction* a = new KAction( i18n("&Configure %1...").arg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false );
-    if(p) a->addTo( p->settingsMenu );
-    return a;
- }
-diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
-index a222a14..dea1407 100644
---- a/src/mergeresultwindow.cpp
-+++ b/src/mergeresultwindow.cpp
-@@ -134,7 +134,7 @@ void MergeResultWindow::init(
-    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-    if (m_pStatusBar)
-       m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
--         .tqarg(nofUnsolved).tqarg(wsc) );
-+         .arg(nofUnsolved).arg(wsc) );
- }
- 
- void MergeResultWindow::reset()
-@@ -809,12 +809,12 @@ void MergeResultWindow::showNrOfConflicts()
-    else  if ( m_pTotalDiffStatus->bTextAEqB && m_pTotalDiffStatus->bTextAEqC )
-       totalInfo += i18n("All input files contain the same text.");
-    else {
--      if    ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("B");
--      else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("B");
--      if    ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("A").tqarg("C");
--      else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("A").tqarg("C");
--      if    ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").tqarg("B").tqarg("C");
--      else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").tqarg("B").tqarg("C");
-+      if    ( m_pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("B");
-+      else if ( m_pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("B");
-+      if    ( m_pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("A").arg("C");
-+      else if ( m_pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("A").arg("C");
-+      if    ( m_pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n").arg("B").arg("C");
-+      else if ( m_pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text.\n").arg("B").arg("C");
-    }
- 
-    int nrOfUnsolvedConflicts = getNrOfUnsolvedConflicts();
-@@ -948,7 +948,7 @@ void MergeResultWindow::choose( int selector )
-    int wsc;
-    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
--         .tqarg(nofUnsolved).tqarg(wsc) );
-+         .arg(nofUnsolved).arg(wsc) );
- }
- 
- // bConflictsOnly: automatically choose for conflicts only (true) or for everywhere (false)
-@@ -962,7 +962,7 @@ void MergeResultWindow::chooseGlobal(int selector, bool bConflictsOnly, bool bWh
-    int wsc;
-    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
--         .tqarg(nofUnsolved).tqarg(wsc) );
-+         .arg(nofUnsolved).arg(wsc) );
- }
- 
- void MergeResultWindow::slotAutoSolve()
-@@ -974,7 +974,7 @@ void MergeResultWindow::slotAutoSolve()
-    int wsc;
-    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
--         .tqarg(nofUnsolved).tqarg(wsc) );
-+         .arg(nofUnsolved).arg(wsc) );
- }
- 
- void MergeResultWindow::slotUnsolve()
-@@ -986,7 +986,7 @@ void MergeResultWindow::slotUnsolve()
-    int wsc;
-    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-    m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
--         .tqarg(nofUnsolved).tqarg(wsc) );
-+         .arg(nofUnsolved).arg(wsc) );
- }
- 
- static TQString calcHistoryLead(const TQString& s )
-@@ -2105,9 +2105,9 @@ void MergeResultWindow::slotCursorUpdate()
-       int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
- 
-       if (!m_pOptionDialog->m_bRightToLeftLanguage)
--         tqrepaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
-+         repaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
-       else
--         tqrepaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
-+         repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
- 
-       m_bCursorUpdate=false;
-    }
-diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
-index 9b46a6d..8b15dc8 100644
---- a/src/optiondialog.cpp
-+++ b/src/optiondialog.cpp
-@@ -495,7 +495,7 @@ void OptionDialog::setupOtherOptions()
-    new OptionToggleAction( true,  "Show Statusbar", &m_bShowStatusBar, this );
- 
-    new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this );
--   new OptionSize( TQSize(600,400),"Geometry", &m_tqgeometry, this );
-+   new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this );
-    new OptionPoint( TQPoint(0,22), "Position", &m_position, this );
-    new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this );
- 
-diff --git a/src/optiondialog.h b/src/optiondialog.h
-index 697dfe3..b7a27e6 100644
---- a/src/optiondialog.h
-+++ b/src/optiondialog.h
-@@ -59,7 +59,7 @@ public:
-     TQString calcOptionHelp();
- 
-     // Some settings are not available in the option dialog:
--    TQSize  m_tqgeometry;
-+    TQSize  m_geometry;
-     TQPoint m_position;
-     bool   m_bMaximised; 
-     bool   m_bShowToolBar;
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index 1452eca..3986596 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -512,12 +512,12 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF
-          else  if ( pTotalDiffStatus->bTextAEqB && pTotalDiffStatus->bTextAEqC )
-             totalInfo += i18n("All input files contain the same text, but are not binary equal.");
-          else {
--            if    ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("B");
--            else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("B");
--            if    ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("A").tqarg("C");
--            else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("A").tqarg("C");
--            if    ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).tqarg("B").tqarg("C");
--            else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").tqarg("B").tqarg("C");
-+            if    ( pTotalDiffStatus->bBinaryAEqB ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).arg("A").arg("B");
-+            else if ( pTotalDiffStatus->bTextAEqB ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("B");
-+            if    ( pTotalDiffStatus->bBinaryAEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).arg("A").arg("C");
-+            else if ( pTotalDiffStatus->bTextAEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("A").arg("C");
-+            if    ( pTotalDiffStatus->bBinaryBEqC ) totalInfo += i18n("Files %1 and %2 are binary equal.\n"                          ).arg("B").arg("C");
-+            else if ( pTotalDiffStatus->bTextBEqC ) totalInfo += i18n("Files %1 and %2 have equal text, but are not binary equal. \n").arg("B").arg("C");
-          }
- 
-          if ( !totalInfo.isEmpty() )
-diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
-index 5ed0c26..ff7ca56 100644
---- a/src/smalldialogs.cpp
-+++ b/src/smalldialogs.cpp
-@@ -111,15 +111,15 @@ OpenDialog::OpenDialog(
- 
-    TQPopupMenu* m = new TQPopupMenu(this);
-    int id=0;
--   m->insertItem( i18n("Swap %1<->%2").tqarg("A").tqarg("B"), id++ );
--   m->insertItem( i18n("Swap %1<->%2").tqarg("B").tqarg("C"), id++ );
--   m->insertItem( i18n("Swap %1<->%2").tqarg("C").tqarg("A"), id++ );
--   m->insertItem( i18n("Copy %1->Output").tqarg("A"), id++ );
--   m->insertItem( i18n("Copy %1->Output").tqarg("B"), id++ );
--   m->insertItem( i18n("Copy %1->Output").tqarg("C"), id++  );
--   m->insertItem( i18n("Swap %1<->Output").tqarg("A"), id++  );
--   m->insertItem( i18n("Swap %1<->Output").tqarg("B"), id++  );
--   m->insertItem( i18n("Swap %1<->Output").tqarg("C"), id++  );
-+   m->insertItem( i18n("Swap %1<->%2").arg("A").arg("B"), id++ );
-+   m->insertItem( i18n("Swap %1<->%2").arg("B").arg("C"), id++ );
-+   m->insertItem( i18n("Swap %1<->%2").arg("C").arg("A"), id++ );
-+   m->insertItem( i18n("Copy %1->Output").arg("A"), id++ );
-+   m->insertItem( i18n("Copy %1->Output").arg("B"), id++ );
-+   m->insertItem( i18n("Copy %1->Output").arg("C"), id++  );
-+   m->insertItem( i18n("Swap %1<->Output").arg("A"), id++  );
-+   m->insertItem( i18n("Swap %1<->Output").arg("B"), id++  );
-+   m->insertItem( i18n("Swap %1<->Output").arg("C"), id++  );
-    connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int)));
-    button->setPopup(m);
- 
diff --git a/redhat/applications/kdiff3/bp002-d654b107.diff b/redhat/applications/kdiff3/bp002-d654b107.diff
deleted file mode 100644
index dc4a95c9e..000000000
--- a/redhat/applications/kdiff3/bp002-d654b107.diff
+++ /dev/null
@@ -1,328 +0,0 @@
-commit d654b1079f7801b0a65c8de8936d0d174656702b
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497860 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/src/diff.cpp b/src/diff.cpp
-index 722950f..feb1373 100644
---- a/src/diff.cpp
-+++ b/src/diff.cpp
-@@ -557,7 +557,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
-       m_lmppData.m_v.resize( m_normalData.m_vSize );
-       for(int i=m_lmppData.m_vSize; i<m_normalData.m_vSize; ++i )
-       {  // Set all empty lines to point to the end of the buffer.
--         m_lmppData.m_v[i].pLine = m_lmppData.m_tqunicodeBuf.tqunicode()+m_lmppData.m_tqunicodeBuf.length();
-+         m_lmppData.m_v[i].pLine = m_lmppData.m_unicodeBuf.unicode()+m_lmppData.m_unicodeBuf.length();
-       }
- 
-       m_lmppData.m_vSize = m_normalData.m_vSize;
-@@ -567,8 +567,8 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
-    if ( m_pOptionDialog->m_bIgnoreCase )
-    {
-       int i;
--      TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_tqunicodeBuf.tqunicode());
--      int ucSize = m_lmppData.m_tqunicodeBuf.length();
-+      TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_unicodeBuf.unicode());
-+      int ucSize = m_lmppData.m_unicodeBuf.length();
-       for(i=0; i<ucSize; ++i)
-       {
-          pBuf[i] = pBuf[i].upper();
-@@ -604,7 +604,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
- /** Prepare the linedata vector for every input line.*/
- void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding )
- {
--   //m_tqunicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
-+   //m_unicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
- 
-    long skipBytes = 0;
-    TQTextCodec* pCodec = ::detectEncoding( m_pBuf, m_size, skipBytes );
-@@ -616,11 +616,11 @@ void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding
-    TQTextStream ts( ba, IO_ReadOnly );
-    ts.setCodec( pEncoding);
-    //ts.setAutoDetectUnicode( false );
--   m_tqunicodeBuf = ts.read();
-+   m_unicodeBuf = ts.read();
-    ba.resetRawData( m_pBuf+skipBytes, m_size-skipBytes );
- 
--   int ucSize = m_tqunicodeBuf.length();
--   const TQChar* p = m_tqunicodeBuf.tqunicode();
-+   int ucSize = m_unicodeBuf.length();
-+   const TQChar* p = m_unicodeBuf.unicode();
- 
-    m_bIsText = true;
-    int lines = 1;
-@@ -770,9 +770,9 @@ static void checkLineForComments(
- void SourceData::FileData::removeComments()
- {
-    int line=0;
--   TQChar* p = const_cast<TQChar*>(m_tqunicodeBuf.tqunicode());
-+   TQChar* p = const_cast<TQChar*>(m_unicodeBuf.unicode());
-    bool bWithinComment=false;
--   int size = m_tqunicodeBuf.length();
-+   int size = m_unicodeBuf.length();
-    for(int i=0; i<size; ++i )
-    {
- //      std::cout << "2        " << std::string(&p[i], m_v[line].size) << std::endl;
-diff --git a/src/diff.h b/src/diff.h
-index a4015d1..3f876f8 100644
---- a/src/diff.h
-+++ b/src/diff.h
-@@ -293,7 +293,7 @@ private:
-       const char* m_pBuf;
-       int m_size;
-       int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
--      TQString m_tqunicodeBuf;
-+      TQString m_unicodeBuf;
-       std::vector<LineData> m_v;
-       bool m_bIsText;
-       bool readFile( const TQString& filename );
-diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
-index 1f90d5d..5584c50 100644
---- a/src/fileaccess.cpp
-+++ b/src/fileaccess.cpp
-@@ -1088,7 +1088,7 @@ void CvsIgnoreList::addEntry(const TQString& pattern)
-       unsigned int nofMetaCharacters = 0;
- 
-       const TQChar* pos;
--      pos = pattern.tqunicode();
-+      pos = pattern.unicode();
-       const TQChar* posEnd;
-       posEnd=pos + pattern.length();
-       while (pos < posEnd)
-@@ -1454,27 +1454,27 @@ ProgressDialog::ProgressDialog( TQWidget* pParent )
- : TQDialog( pParent, 0, true )
- {
-    m_bStayHidden = false;
--   TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
-+   TQVBoxLayout* layout = new TQVBoxLayout(this);
- 
-    m_pInformation = new TQLabel( " ", this );
--   tqlayout->addWidget( m_pInformation );
-+   layout->addWidget( m_pInformation );
- 
-    m_pProgressBar = new KProgress(1000, this);
--   tqlayout->addWidget( m_pProgressBar );
-+   layout->addWidget( m_pProgressBar );
- 
-    m_pSubInformation = new TQLabel( " ", this);
--   tqlayout->addWidget( m_pSubInformation );
-+   layout->addWidget( m_pSubInformation );
- 
-    m_pSubProgressBar = new KProgress(1000, this);
--   tqlayout->addWidget( m_pSubProgressBar );
-+   layout->addWidget( m_pSubProgressBar );
- 
-    m_pSlowJobInfo = new TQLabel( " ", this);
--   tqlayout->addWidget( m_pSlowJobInfo );
-+   layout->addWidget( m_pSlowJobInfo );
- 
--   TQHBoxLayout* htqlayout = new TQHBoxLayout( tqlayout );
--   htqlayout->addStretch(1);
-+   TQHBoxLayout* hlayout = new TQHBoxLayout( layout );
-+   hlayout->addStretch(1);
-    m_pAbortButton = new TQPushButton( i18n("&Cancel"), this);
--   htqlayout->addWidget( m_pAbortButton );
-+   hlayout->addWidget( m_pAbortButton );
-    connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) );
- 
-    m_progressDelayTimer = 0;
-diff --git a/src/gnudiff_io.cpp b/src/gnudiff_io.cpp
-index f29fd31..aab645f 100644
---- a/src/gnudiff_io.cpp
-+++ b/src/gnudiff_io.cpp
-@@ -169,7 +169,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
- 	    while ( p<bufend && (c = *p) != '\n' )
-             {
- 	      if (! (isWhite(c) || bIgnoreNumbers && (c.isDigit() || c=='-' || c=='.' ) ))
--                  h = HASH (h, c.lower().tqunicode());
-+                  h = HASH (h, c.lower().unicode());
-               ++p;
-             }            
- 	    break;
-@@ -177,7 +177,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
- 	  default:
- 	    while ( p<bufend && (c = *p) != '\n' )
-             {
--               h = HASH (h, c.lower().tqunicode());
-+               h = HASH (h, c.lower().unicode());
-                ++p;
-             }
- 	    break;
-@@ -189,7 +189,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
- 	    while ( p<bufend && (c = *p) != '\n')
-             {
- 	      if (! (isWhite(c)|| bIgnoreNumbers && (c.isDigit() || c=='-' || c=='.' ) ))
--                 h = HASH (h, c.tqunicode());
-+                 h = HASH (h, c.unicode());
-               ++p;
-             }
- 	    break;
-@@ -197,7 +197,7 @@ void GnuDiff::find_and_hash_each_line (struct file_data *current)
- 	  default:
- 	    while ( p<bufend && (c = *p) != '\n')
-             {
--               h = HASH (h, c.tqunicode());
-+               h = HASH (h, c.unicode());
-                ++p;
-             }
- 	    break;
-diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
-index dea1407..760d794 100644
---- a/src/mergeresultwindow.cpp
-+++ b/src/mergeresultwindow.cpp
-@@ -2613,10 +2613,10 @@ void MergeResultWindow::pasteClipboard( bool bFromSelection )
-    TQString str = melIt->getString( this );
-    int x = convertToPosInText( str, m_cursorXPos, m_pOptionDialog->m_tabSize );
- 
--   if ( !TQApplication::tqclipboard()->supportsSelection() )
-+   if ( !TQApplication::clipboard()->supportsSelection() )
-       bFromSelection = false;
- 
--   TQString clipBoard = TQApplication::tqclipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard );
-+   TQString clipBoard = TQApplication::clipboard()->text( bFromSelection ? TQClipboard::Selection : TQClipboard::Clipboard );
- 
-    TQString currentLine = str.left(x);
-    TQString endOfLine = str.mid(x);
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index 3986596..0a10b00 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -610,13 +610,13 @@ void KDiff3App::sourceMask( int srcMask, int enabledMask )
- 
- 
- // Function uses setMinSize( sizeHint ) before adding the widget.
--// void addWidget(TQBoxLayout* tqlayout, TQWidget* widget);
-+// void addWidget(TQBoxLayout* layout, TQWidget* widget);
- template <class W, class L>
--void addWidget( L* tqlayout, W* widget)
-+void addWidget( L* layout, W* widget)
- {
-    TQSize s = widget->sizeHint();
-    widget->setMinimumSize( TQSize(max2(s.width(),0),max2(s.height(),0) ) );
--   tqlayout->addWidget( widget );
-+   layout->addWidget( widget );
- }
- 
- void KDiff3App::initView()
-@@ -1174,7 +1174,7 @@ void KDiff3App::slotEditCut()
- 
-    if ( !s.isNull() )
-    {
--      TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
-+      TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
-    }
- 
-    slotStatusMsg(i18n("Ready."));
-@@ -1190,7 +1190,7 @@ void KDiff3App::slotEditCopy()
-    if ( s.isNull() && m_pMergeResultWindow!=0 ) s = m_pMergeResultWindow->getSelection();
-    if ( !s.isNull() )
-    {
--      TQApplication::tqclipboard()->setText( s, TQClipboard::Clipboard );
-+      TQApplication::clipboard()->setText( s, TQClipboard::Clipboard );
-    }
- 
-    slotStatusMsg(i18n("Ready."));
-@@ -1208,17 +1208,17 @@ void KDiff3App::slotEditPaste()
-    {
-       if ( m_pDiffTextWindow1->hasFocus() )
-       {
--         m_sd1.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
-+         m_sd1.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
-          init();
-       }
-       else if ( m_pDiffTextWindow2->hasFocus() )
-       {
--         m_sd2.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
-+         m_sd2.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
-          init();
-       }
-       else if ( m_pDiffTextWindow3->hasFocus() )
-       {
--         m_sd3.setData( TQApplication::tqclipboard()->text(TQClipboard::Clipboard) );
-+         m_sd3.setData( TQApplication::clipboard()->text(TQClipboard::Clipboard) );
-          init();
-       }
-    }
-@@ -1465,7 +1465,7 @@ void KDiff3App::slotSelectionEnd()
-    }
-    else
-    {
--       TQClipboard *clipBoard = TQApplication::tqclipboard();
-+       TQClipboard *clipBoard = TQApplication::clipboard();
- 
-        if (clipBoard->supportsSelection ())
-        {
-@@ -1484,7 +1484,7 @@ void KDiff3App::slotSelectionEnd()
- 
- void KDiff3App::slotClipboardChanged()
- {
--   TQString s = TQApplication::tqclipboard()->text();
-+   TQString s = TQApplication::clipboard()->text();
-    //editPaste->setEnabled(!s.isEmpty());
- }
- 
-diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
-index ff7ca56..b19b7c2 100644
---- a/src/smalldialogs.cpp
-+++ b/src/smalldialogs.cpp
-@@ -339,47 +339,47 @@ void OpenDialog::slotSwapCopyNames( int id ) // id selected in the popup menu
- FindDialog::FindDialog(TQWidget* pParent)
- : TQDialog( pParent )
- {
--   TQGridLayout* tqlayout = new TQGridLayout( this );
--   tqlayout->setMargin(5);
--   tqlayout->setSpacing(5);
-+   TQGridLayout* layout = new TQGridLayout( this );
-+   layout->setMargin(5);
-+   layout->setSpacing(5);
- 
-    int line=0;
--   tqlayout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
-+   layout->addMultiCellWidget( new TQLabel(i18n("Search text:"),this), line,line,0,1 );
-    ++line;
- 
-    m_pSearchString = new TQLineEdit( this );
--   tqlayout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
-+   layout->addMultiCellWidget( m_pSearchString, line,line,0,1 );
-    ++line;
- 
-    m_pCaseSensitive = new TQCheckBox(i18n("Case sensitive"),this);
--   tqlayout->addWidget( m_pCaseSensitive, line, 1 );
-+   layout->addWidget( m_pCaseSensitive, line, 1 );
- 
-    m_pSearchInA = new TQCheckBox(i18n("Search A"),this);
--   tqlayout->addWidget( m_pSearchInA, line, 0 );
-+   layout->addWidget( m_pSearchInA, line, 0 );
-    m_pSearchInA->setChecked( true );
-    ++line;
- 
-    m_pSearchInB = new TQCheckBox(i18n("Search B"),this);
--   tqlayout->addWidget( m_pSearchInB, line, 0 );
-+   layout->addWidget( m_pSearchInB, line, 0 );
-    m_pSearchInB->setChecked( true );
-    ++line;
- 
-    m_pSearchInC = new TQCheckBox(i18n("Search C"),this);
--   tqlayout->addWidget( m_pSearchInC, line, 0 );
-+   layout->addWidget( m_pSearchInC, line, 0 );
-    m_pSearchInC->setChecked( true );
-    ++line;
- 
-    m_pSearchInOutput = new TQCheckBox(i18n("Search output"),this);
--   tqlayout->addWidget( m_pSearchInOutput, line, 0 );
-+   layout->addWidget( m_pSearchInOutput, line, 0 );
-    m_pSearchInOutput->setChecked( true );
-    ++line;
- 
-    TQPushButton* pButton = new TQPushButton( i18n("&Search"), this );
--   tqlayout->addWidget( pButton, line, 0 );
-+   layout->addWidget( pButton, line, 0 );
-    connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
- 
-    pButton = new TQPushButton( i18n("&Cancel"), this );
--   tqlayout->addWidget( pButton, line, 1 );
-+   layout->addWidget( pButton, line, 1 );
-    connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
- 
-    hide();
diff --git a/redhat/applications/kdiff3/bp003-3f02b2be.diff b/redhat/applications/kdiff3/bp003-3f02b2be.diff
deleted file mode 100644
index f287d6592..000000000
--- a/redhat/applications/kdiff3/bp003-3f02b2be.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3f02b2be383bb2ab233fe8885f062f75fd902e78
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332366465 -0500
-
-    Change tqaddAction -> addAction. There is no tqaddAction defined in tqt headers.
-
-diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
-index ec008f1..02fa72d 100755
---- a/kdiff3plugin/kdiff3plugin.cpp
-+++ b/kdiff3plugin/kdiff3plugin.cpp
-@@ -150,7 +150,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
-    pActionMenu->insert (pAction);
- 
-    addSeparator();
--   tqaddAction( pActionMenu );
-+   addAction( pActionMenu );
-    addSeparator();
- }
- 
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.12.spec b/redhat/applications/kdiff3/kdiff3-3.5.12.spec
deleted file mode 100644
index 8c378cd72..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.12.spec
+++ /dev/null
@@ -1,111 +0,0 @@
-# Default version for this component
-%define kdecomp kdiff3
-%define version 0.9.91
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{tde_docdir}/HTML/*/*
-%{_datadir}/services/*.desktop
-%{tde_libdir}/*.so
-%{_datadir}/applnk/Development/*.desktop
-%{_datadir}/applnk/.hidden/*.desktop
-%{_mandir}/man*/*
-
-%{tde_libdir}/*.la
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec
deleted file mode 100644
index f8912c6d3..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default version for this component
-%define kdecomp kdiff3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:	0.9.91
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_tdedocdir}/HTML/*/*
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Fix post and postun
-- Rename old tq methods that no longer need a unique name [Commit #c7e29c46]
-- Remove additional unneeded tq method conversions [Commit #9b57232f]
-- Rename obsolete tq methods to standard names [Commit #d654b107]
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
deleted file mode 100644
index e4099e05b..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define tde_pkg kdiff3
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:		0.9.91
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-# These are not HTML files but weird files in wrong place ??
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kdiff3
-%{tde_datadir}/apps/kdiff3/
-%{tde_datadir}/apps/kdiff3part/
-%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
-%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
-%{tde_tdedocdir}/HTML/*/kdiff3/
-%{tde_datadir}/services/kdiff3_plugin.desktop
-%{tde_datadir}/services/kdiff3part.desktop
-%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdelibdir}/libkdiff3part.la
-%{tde_tdelibdir}/libkdiff3part.so
-%{tde_tdelibdir}/libkdiff3plugin.la
-%{tde_tdelibdir}/libkdiff3plugin.so
-
-%changelog
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.spec
deleted file mode 100644
index bf89b7f56..000000000
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-# Default version for this component
-%define kdecomp kdiff3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Version:	0.9.91
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kdiff3] Rename old tq methods that no longer need a unique name [Commit #c7e29c46]
-Patch0:		bp000-c7e29c46.diff
-# [kdiff3] Remove additional unneeded tq method conversions [Commit #9b57232f]
-Patch1:		bp001-9b57232f.diff
-# [kdiff3] Rename obsolete tq methods to standard names [Commit #d654b107]
-Patch2:		bp002-d654b107.diff
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_tdedocdir}/HTML/*/*
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Fix post and postun
-- Rename old tq methods that no longer need a unique name [Commit #c7e29c46]
-- Remove additional unneeded tq method conversions [Commit #9b57232f]
-- Rename obsolete tq methods to standard names [Commit #d654b107]
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec
deleted file mode 100644
index 47e8fea50..000000000
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec
+++ /dev/null
@@ -1,148 +0,0 @@
-# Default version for this component
-%define kdecomp kdirstat
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	graphical disk usage display with cleanup facilities [Trinity]
-Version:	2.4.4
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KDirStat (KDE Directory Statistics) is a small utility program that sums
-up disk usage for directory trees, very much like the Unix 'du' command.
-It displays the disk space used up by a directory tree, both numerically
-and graphically.  It is network transparent (i.e., you can use it to sum
-up FTP servers), and comes with predefined and user configurable cleanup
-actions.  You can directly open a directory branch in Konqueror or the
-shell of your choice, compress it to a .tar.bz2 archive, or define your
-own cleanup actions. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdirstat
-%{tde_datadir}/applnk/Utilities/kdirstat.desktop
-%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{tde_datadir}/apps/kconf_update/kdirstat.upd
-%{tde_datadir}/apps/kdirstat/
-%{tde_tdedocdir}/HTML/en/kdirstat/
-%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
deleted file mode 100644
index 7eae449e0..000000000
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
+++ /dev/null
@@ -1,133 +0,0 @@
-# Default version for this component
-%define tde_pkg kdirstat
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		graphical disk usage display with cleanup facilities [Trinity]
-Version:		2.4.4
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KDirStat (TDE Directory Statistics) is a small utility program that sums
-up disk usage for directory trees, very much like the Unix 'du' command.
-It displays the disk space used up by a directory tree, both numerically
-and graphically.  It is network transparent (i.e., you can use it to sum
-up FTP servers), and comes with predefined and user configurable cleanup
-actions.  You can directly open a directory branch in Konqueror or the
-shell of your choice, compress it to a .tar.bz2 archive, or define your
-own cleanup actions. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdirstat
-%{tde_datadir}/applnk/Utilities/kdirstat.desktop
-%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{tde_datadir}/apps/kconf_update/kdirstat.upd
-%{tde_datadir}/apps/kdirstat/
-%{tde_tdedocdir}/HTML/en/kdirstat/
-%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
-
-
-%changelog
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.spec
deleted file mode 100644
index 843e486b8..000000000
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define kdecomp kdirstat
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	graphical disk usage display with cleanup facilities [Trinity]
-Version:	2.4.4
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KDirStat (KDE Directory Statistics) is a small utility program that sums
-up disk usage for directory trees, very much like the Unix 'du' command.
-It displays the disk space used up by a directory tree, both numerically
-and graphically.  It is network transparent (i.e., you can use it to sum
-up FTP servers), and comes with predefined and user configurable cleanup
-actions.  You can directly open a directory branch in Konqueror or the
-shell of your choice, compress it to a .tar.bz2 archive, or define your
-own cleanup actions. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdirstat
-%{tde_datadir}/applnk/Utilities/kdirstat.desktop
-%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{tde_datadir}/apps/kconf_update/kdirstat.upd
-%{tde_datadir}/apps/kdirstat/
-%{tde_tdedocdir}/HTML/en/kdirstat/
-%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-3.5.13.1.spec b/redhat/applications/keep/keep-3.5.13.1.spec
deleted file mode 100644
index be0abbb80..000000000
--- a/redhat/applications/keep/keep-3.5.13.1.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define kdecomp keep
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	backup system for KDE [Trinity]
-Version:	0.4.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires: rdiff-backup
-
-%description
-Keep is an automatic backup program that allows users to set the parameters of
-the backup, including the frequency and the number of backups.
-
-Homepage: http://jr.falleri.free.fr/keep
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/keep
-%{tde_tdelibdir}/kded_keep.la
-%{tde_tdelibdir}/kded_keep.so
-%{tde_tdeappdir}/keep.desktop
-%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{tde_datadir}/apps/keep/
-%{tde_datadir}/config.kcfg/keepsettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keep.png
-%{tde_datadir}/services/kded/keep.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
-- Rebuilt for Fedora 17
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec
deleted file mode 100644
index 7dba42000..000000000
--- a/redhat/applications/keep/keep-3.5.13.2.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define tde_pkg keep
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		backup system for TDE [Trinity]
-Version:		0.4.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Requires:		rdiff-backup
-
-%description
-Keep is an automatic backup program that allows users to set the parameters of
-the backup, including the frequency and the number of backups.
-
-Homepage: http://jr.falleri.free.fr/keep
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/keep
-%{tde_tdelibdir}/kded_keep.la
-%{tde_tdelibdir}/kded_keep.so
-%{tde_tdeappdir}/keep.desktop
-%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{tde_datadir}/apps/keep/
-%{tde_datadir}/config.kcfg/keepsettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keep.png
-%{tde_datadir}/services/kded/keep.desktop
-
-
-%changelog
diff --git a/redhat/applications/keep/keep-3.5.13.spec b/redhat/applications/keep/keep-3.5.13.spec
deleted file mode 100644
index 3518b879e..000000000
--- a/redhat/applications/keep/keep-3.5.13.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define kdecomp keep
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	backup system for KDE [Trinity]
-Version:	0.4.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires: rdiff-backup
-
-%description
-Keep is an automatic backup program that allows users to set the parameters of
-the backup, including the frequency and the number of backups.
-
-Homepage: http://jr.falleri.free.fr/keep
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/keep
-%{tde_tdelibdir}/kded_keep.la
-%{tde_tdelibdir}/kded_keep.so
-%{tde_tdeappdir}/keep.desktop
-%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{tde_datadir}/apps/keep/
-%{tde_datadir}/config.kcfg/keepsettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keep.png
-%{tde_datadir}/services/kded/keep.desktop
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
-- Rebuilt for Fedora 17
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch b/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch
deleted file mode 100644
index a4ba56b6e..000000000
--- a/redhat/applications/kerry/kerry-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kerry/kerry/src/Makefile.am.ORI	2012-08-05 16:28:11.459614735 +0200
-+++ kerry/kerry/src/Makefile.am	2012-08-05 16:28:35.195085921 +0200
-@@ -28,7 +28,7 @@
- 		dcopinterface.skel dcopinterface.stub kerrylabel.cpp query.cpp
- 
- kerry_la_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_QT)
--kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
-+kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_KDECORE)
- 
- autostartdir = $(datadir)/autostart
- autostart_DATA = kerry.autostart.desktop beagled.desktop
---- kerry/kerry/src/kcm/Makefile.am.ORI	2012-08-06 10:28:54.410310191 -0400
-+++ kerry/kerry/src/kcm/Makefile.am	2012-08-06 10:29:27.804685127 -0400
-@@ -9,7 +9,7 @@
-                         select_privacy_resource.ui
- 
- kcm_beagle_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
--kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD)
-+kcm_beagle_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBBEAGLE_LIBADD) $(LIB_QT) $(LIB_KDECORE) -lDCOP
- 
- xdg_apps_DATA = kcmbeagle.desktop
- 
diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec
deleted file mode 100644
index c1fbec722..000000000
--- a/redhat/applications/kerry/kerry-3.5.13.1.spec
+++ /dev/null
@@ -1,148 +0,0 @@
-# Default version for this component
-%define kdecomp kerry
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
-Version:	0.2.1
-Release:	2%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://en.opensuse.org/Kerry
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	kerry.1.docbook
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	libbeagle-devel >= 0.3.0
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	docbook2x
-%else
-BuildRequires:	docbook2X
-%endif
-
-%description
-Kerry is a Trinity frontend for the Beagle desktop search daemon.
-
-A program for indexing and searching user's data. At the moment, it can index
-filesystems, chat logs, mail and data, RSS and other.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-#%__install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/kerry.1.docbook
-#docbook2man %{buildroot}%{_mandir}/man1/kerry.1.docbook
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
-%{tde_bindir}/beagled-shutdown
-%{tde_bindir}/kerry
-%{tde_libdir}/libkdeinit_kerry.la
-%{tde_libdir}/libkdeinit_kerry.so
-%{tde_tdelibdir}/kcm_beagle.la
-%{tde_tdelibdir}/kcm_beagle.so
-%{tde_tdelibdir}/kerry.la
-%{tde_tdelibdir}/kerry.so
-%{tde_tdeappdir}/kcmbeagle.desktop
-%{tde_tdeappdir}/kerry.desktop
-%{tde_datadir}/applnk/.hidden/kcmkerry.desktop
-%{tde_datadir}/apps/kerry/search-running.mng
-%{tde_datadir}/autostart/beagled.desktop
-%{tde_datadir}/autostart/kerry.autostart.desktop
-%{tde_datadir}/icons/hicolor/*/*/*
-
-
-%changelog
diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec
deleted file mode 100644
index eb48b72c8..000000000
--- a/redhat/applications/kerry/kerry-3.5.13.2.spec
+++ /dev/null
@@ -1,148 +0,0 @@
-# Default version for this component
-%define tdecomp kerry
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tdecomp}
-Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
-Version:	0.2.1
-Release:	3%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://en.opensuse.org/Kerry
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-3.5.13.2.tar.gz
-Source1:	kerry.1.docbook
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	libbeagle-devel >= 0.3.0
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	docbook2x
-%else
-BuildRequires:	docbook2X
-%endif
-
-%description
-Kerry is a Trinity frontend for the Beagle desktop search daemon.
-
-A program for indexing and searching user's data. At the moment, it can index
-filesystems, chat logs, mail and data, RSS and other.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-3.5.13.2
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-#%__install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/kerry.1.docbook
-#docbook2man %{buildroot}%{_mandir}/man1/kerry.1.docbook
-
-%find_lang %{tdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
-%{tde_bindir}/beagled-shutdown
-%{tde_bindir}/kerry
-%{tde_libdir}/libkdeinit_kerry.la
-%{tde_libdir}/libkdeinit_kerry.so
-%{tde_tdelibdir}/kcm_beagle.la
-%{tde_tdelibdir}/kcm_beagle.so
-%{tde_tdelibdir}/kerry.la
-%{tde_tdelibdir}/kerry.so
-%{tde_tdeappdir}/kcmbeagle.desktop
-%{tde_tdeappdir}/kerry.desktop
-%{tde_datadir}/applnk/.hidden/kcmkerry.desktop
-%{tde_datadir}/apps/kerry/search-running.mng
-%{tde_datadir}/autostart/beagled.desktop
-%{tde_datadir}/autostart/kerry.autostart.desktop
-%{tde_datadir}/icons/hicolor/*/*/*
-
-
-%changelog
diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec
deleted file mode 100644
index ead20877c..000000000
--- a/redhat/applications/kerry/kerry-3.5.13.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define kdecomp kerry
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
-Version:	0.2.1
-Release:	1%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://en.opensuse.org/Kerry
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kerry.1.docbook
-
-# [kerry] Missing LDFLAGS cause FTBFS on Mageia and Mandriva
-Patch1:		kerry-3.5.13-missing_ldflags.patch
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	libbeagle-devel >= 0.3.0
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	docbook2x
-%else
-BuildRequires:	docbook2X
-%endif
-
-%description
-Kerry is a Trinity frontend for the Beagle desktop search daemon.
-
-A program for indexing and searching user's data. At the moment, it can index
-filesystems, chat logs, mail and data, RSS and other.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-#%__install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/kerry.1.docbook
-#docbook2man %{buildroot}%{_mandir}/man1/kerry.1.docbook
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
-%{tde_bindir}/beagled-shutdown
-%{tde_bindir}/kerry
-%{tde_libdir}/libkdeinit_kerry.la
-%{tde_libdir}/libkdeinit_kerry.so
-%{tde_tdelibdir}/kcm_beagle.la
-%{tde_tdelibdir}/kcm_beagle.so
-%{tde_tdelibdir}/kerry.la
-%{tde_tdelibdir}/kerry.so
-%{tde_tdeappdir}/kcmbeagle.desktop
-%{tde_tdeappdir}/kerry.desktop
-%{tde_datadir}/applnk/.hidden/kcmkerry.desktop
-%{tde_datadir}/apps/kerry/search-running.mng
-%{tde_datadir}/autostart/beagled.desktop
-%{tde_datadir}/autostart/kerry.autostart.desktop
-%{tde_datadir}/icons/hicolor/*/*/*
-
-
-%changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
deleted file mode 100644
index a8deaa551..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13-fix_libsuffix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kgtk-qt3/qt3/kqt3-wrapper.cmake.ORI	2012-08-08 22:30:14.598900960 +0200
-+++ kgtk-qt3/qt3/kqt3-wrapper.cmake	2012-08-08 22:30:39.661367613 +0200
-@@ -15,7 +15,7 @@
- app=`basename $0`
- 
- if [ "$app" = "kqt3-wrapper" ] ; then
--    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkqt3.so:$LD_PRELOAD "$@"
-+    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkqt3.so:$LD_PRELOAD "$@"
- else
-     dir=`dirname $0`
-     oldPath=$PATH
---- kgtk-qt3/gtk2/kgtk2-wrapper.cmake.ORI	2012-08-08 22:31:30.684286835 +0200
-+++ kgtk-qt3/gtk2/kgtk2-wrapper.cmake	2012-08-08 22:32:10.294452119 +0200
-@@ -19,7 +19,7 @@
- app=`basename $0`
- 
- if [ "$app" = "kgtk2-wrapper" ] ; then
--    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
-+    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/kgtk/libkgtk2.so:libnspr4.so:$LD_PRELOAD "$@"
- else
-     dir=`dirname $0`
-     oldPath=$PATH
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
deleted file mode 100644
index a0b4ae4bd..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp kgtk-qt3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Use KDE dialogs in Gtk apps
-Version:	0.10.2
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this KDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-find . -name CMakeLists.txt -exec sed -i {} \
-  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
-  \;
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kgtk
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kgtk.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
-- Add 'preload' file for startkde script
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
deleted file mode 100644
index 6bde2ebd1..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg kgtk-qt3
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Use TDE dialogs in Gtk apps
-Version:		0.10.2
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this TDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kgtk
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kgtk.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
deleted file mode 100644
index c15f8b933..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define kdecomp kgtk-qt3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Use KDE dialogs in Gtk apps
-Version:	0.10.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kgtk-qt-engine] Fix libsuffix for 64 bits machines
-Patch1:		kgtk-qt3-3.5.13-fix_libsuffix.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this KDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-find . -name CMakeLists.txt -exec sed -i {} \
-  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \
-  -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \
-  -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \
-  \;
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -L${QTLIB} -lX11"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kdialogd3
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kdialogd3.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-%Changelog
-* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
-- Add 'preload' file for startkde script
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-3.5.13.1.spec b/redhat/applications/kile/kile-3.5.13.1.spec
deleted file mode 100644
index 039e3afd2..000000000
--- a/redhat/applications/kile/kile-3.5.13.1.spec
+++ /dev/null
@@ -1,210 +0,0 @@
-# Default version for this component
-%define kdecomp kile
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDE Integrated LaTeX Environment [Trinity]
-Version:	2.0.2
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Publishing
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Obsoletes: %{name}-i18n-ar
-Obsoletes: %{name}-i18n-bg
-Obsoletes: %{name}-i18n-br
-Obsoletes: %{name}-i18n-ca
-Obsoletes: %{name}-i18n-cs
-Obsoletes: %{name}-i18n-cy
-Obsoletes: %{name}-i18n-da
-Obsoletes: %{name}-i18n-de
-Obsoletes: %{name}-i18n-el
-Obsoletes: %{name}-i18n-engb
-Obsoletes: %{name}-i18n-es
-Obsoletes: %{name}-i18n-et
-Obsoletes: %{name}-i18n-eu
-Obsoletes: %{name}-i18n-fi
-Obsoletes: %{name}-i18n-fr
-Obsoletes: %{name}-i18n-ga
-Obsoletes: %{name}-i18n-gl
-Obsoletes: %{name}-i18n-hi
-Obsoletes: %{name}-i18n-hu
-Obsoletes: %{name}-i18n-is
-Obsoletes: %{name}-i18n-it
-Obsoletes: %{name}-i18n-ja
-Obsoletes: %{name}-i18n-lt
-Obsoletes: %{name}-i18n-ms
-Obsoletes: %{name}-i18n-mt
-Obsoletes: %{name}-i18n-nb
-Obsoletes: %{name}-i18n-nds
-Obsoletes: %{name}-i18n-nl
-Obsoletes: %{name}-i18n-nn
-Obsoletes: %{name}-i18n-pa
-Obsoletes: %{name}-i18n-pl
-Obsoletes: %{name}-i18n-pt
-Obsoletes: %{name}-i18n-ptbr
-Obsoletes: %{name}-i18n-ro
-Obsoletes: %{name}-i18n-ru
-Obsoletes: %{name}-i18n-rw
-Obsoletes: %{name}-i18n-sk
-Obsoletes: %{name}-i18n-sr
-Obsoletes: %{name}-i18n-srlatin
-Obsoletes: %{name}-i18n-sv
-Obsoletes: %{name}-i18n-ta
-Obsoletes: %{name}-i18n-th
-Obsoletes: %{name}-i18n-tr
-Obsoletes: %{name}-i18n-uk
-Obsoletes: %{name}-i18n-zhcn
-
-
-%description
-Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
-
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-
-Kile can support large projects consisting of several smaller files.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kile
-%{tde_tdeappdir}/kile.desktop
-%{tde_datadir}/apps/kconf_update
-%{tde_datadir}/apps/kile
-%{tde_datadir}/config.kcfg/kile.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kile.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_tdedocdir}/HTML/en/kile
-%{tde_datadir}/mimelnk/text/x-kilepr.desktop
-
-%lang(da) %{tde_tdedocdir}/HTML/da/kile/
-%lang(es) %{tde_tdedocdir}/HTML/es/kile/
-%lang(et) %{tde_tdedocdir}/HTML/et/kile/
-%lang(it) %{tde_tdedocdir}/HTML/it/kile/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
-- Rebuilt for Fedora 17
-- Removes the XPM icon
-
-* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
-- Fix file conflict with trinity-kdelibs
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec
deleted file mode 100644
index 9967337e3..000000000
--- a/redhat/applications/kile/kile-3.5.13.2.spec
+++ /dev/null
@@ -1,194 +0,0 @@
-# Default version for this component
-%define tde_pkg kile
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE Integrated LaTeX Environment [Trinity]
-Version:		2.0.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Publishing
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Obsoletes: %{name}-i18n-ar
-Obsoletes: %{name}-i18n-bg
-Obsoletes: %{name}-i18n-br
-Obsoletes: %{name}-i18n-ca
-Obsoletes: %{name}-i18n-cs
-Obsoletes: %{name}-i18n-cy
-Obsoletes: %{name}-i18n-da
-Obsoletes: %{name}-i18n-de
-Obsoletes: %{name}-i18n-el
-Obsoletes: %{name}-i18n-engb
-Obsoletes: %{name}-i18n-es
-Obsoletes: %{name}-i18n-et
-Obsoletes: %{name}-i18n-eu
-Obsoletes: %{name}-i18n-fi
-Obsoletes: %{name}-i18n-fr
-Obsoletes: %{name}-i18n-ga
-Obsoletes: %{name}-i18n-gl
-Obsoletes: %{name}-i18n-hi
-Obsoletes: %{name}-i18n-hu
-Obsoletes: %{name}-i18n-is
-Obsoletes: %{name}-i18n-it
-Obsoletes: %{name}-i18n-ja
-Obsoletes: %{name}-i18n-lt
-Obsoletes: %{name}-i18n-ms
-Obsoletes: %{name}-i18n-mt
-Obsoletes: %{name}-i18n-nb
-Obsoletes: %{name}-i18n-nds
-Obsoletes: %{name}-i18n-nl
-Obsoletes: %{name}-i18n-nn
-Obsoletes: %{name}-i18n-pa
-Obsoletes: %{name}-i18n-pl
-Obsoletes: %{name}-i18n-pt
-Obsoletes: %{name}-i18n-ptbr
-Obsoletes: %{name}-i18n-ro
-Obsoletes: %{name}-i18n-ru
-Obsoletes: %{name}-i18n-rw
-Obsoletes: %{name}-i18n-sk
-Obsoletes: %{name}-i18n-sr
-Obsoletes: %{name}-i18n-srlatin
-Obsoletes: %{name}-i18n-sv
-Obsoletes: %{name}-i18n-ta
-Obsoletes: %{name}-i18n-th
-Obsoletes: %{name}-i18n-tr
-Obsoletes: %{name}-i18n-uk
-Obsoletes: %{name}-i18n-zhcn
-
-
-%description
-Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
-
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-
-Kile can support large projects consisting of several smaller files.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kile
-%{tde_tdeappdir}/kile.desktop
-%{tde_datadir}/apps/kconf_update
-%{tde_datadir}/apps/kile
-%{tde_datadir}/config.kcfg/kile.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kile.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_tdedocdir}/HTML/en/kile
-%{tde_datadir}/mimelnk/text/x-kilepr.desktop
-
-%lang(da) %{tde_tdedocdir}/HTML/da/kile/
-%lang(es) %{tde_tdedocdir}/HTML/es/kile/
-%lang(et) %{tde_tdedocdir}/HTML/et/kile/
-%lang(it) %{tde_tdedocdir}/HTML/it/kile/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
-
-
-
-%changelog
diff --git a/redhat/applications/kile/kile-3.5.13.spec b/redhat/applications/kile/kile-3.5.13.spec
deleted file mode 100644
index c67f253fd..000000000
--- a/redhat/applications/kile/kile-3.5.13.spec
+++ /dev/null
@@ -1,648 +0,0 @@
-# Default version for this component
-%define kdecomp kile
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDE Integrated LaTeX Environment [Trinity]
-Version:	2.0.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Publishing
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-%package i18n-ar
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Arabic (ar) translations for Kile [Trinity]
-%description i18n-ar
-This package contains the Arabic translations for Kile.
-
-%package i18n-bg
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Bulgarian (bg) translations for Kile [Trinity]
-%description i18n-bg
-This package contains the Bulgarian translations for Kile.
-
-%package i18n-br
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Brazilian (br) translations for Kile [Trinity]
-%description i18n-br
-This package contains the Brazilian translations for Kile.
-
-%package i18n-ca
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Catalan (ca) translations for Kile [Trinity]
-%description i18n-ca
-This package contains the Catalan translations for Kile.
-
-%package i18n-cs
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Czech (cs) translations for Kile [Trinity]
-%description i18n-cs
-This package contains the Czech translations for Kile.
-
-%package i18n-cy
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Welsh (cy) translations for Kile [Trinity]
-%description i18n-cy
-This package contains the Welsh translations for Kile.
-
-%package i18n-da
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Danish (da) translations for Kile [Trinity]
-%description i18n-da
-This package contains the Danish translations for Kile.
-
-%package i18n-de
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: German (de) translations for Kile [Trinity]
-%description i18n-de
-This package contains the German translations for Kile.
-
-%package i18n-el
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Greek (el) translations for Kile [Trinity]
-%description i18n-el
-This package contains the greek translations for Kile.
-
-%package i18n-engb
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: British English (en_GB) translations for Kile [Trinity]
-%description i18n-engb
-This package contains the British English (en_GB) translations for Kile [Trinity].
-
-%package i18n-es
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Spanish (es) translations for Kile [Trinity]
-%description i18n-es
-This package contains the Spanish translations for Kile.
-
-%package i18n-et
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Estonian (et) translations for Kile [Trinity]
-%description i18n-et
-This package contains the Estonian translations for Kile.
-
-%package i18n-eu
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Basque (eu) translations for Kile [Trinity]
-%description i18n-eu
-This package contains the Basque translations for Kile.
-
-%package i18n-fi
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Finnish (fi) translations for Kile [Trinity]
-%description i18n-fi
-This package contains the Finnish translations for Kile.
-
-%package i18n-fr
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: French (fr) translations for Kile [Trinity]
-%description i18n-fr
-This package contains the French translations for Kile.
-
-%package i18n-ga
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Irish Gaelic (ga) translations for Kile [Trinity]
-%description i18n-ga
-This package contains the Irish Gaelic translations for Kile.
-
-%package i18n-gl
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Galician (gl) translations for Kile [Trinity]
-%description i18n-gl
-This package contains the Galician translations for Kile.
-
-%package i18n-hi
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Hindi (hi) translations for Kile [Trinity]
-%description i18n-hi
-This package contains the Hindi translations for Kile.
-
-%package i18n-hu
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Hungarian (hu) translations for Kile [Trinity]
-%description i18n-hu
-This package contains the Hungarian translations for Kile.
-
-%package i18n-is
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Icelandic (is) translations for Kile [Trinity]
-%description i18n-is
-This package contains the Icelandic translations for Kile.
-
-%package i18n-it
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Italian (it) translations for Kile [Trinity]
-%description i18n-it
-This package contains the Italian translations for Kile.
-
-%package i18n-ja
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Japanese (ja) translations for Kile [Trinity]
-%description i18n-ja
-This package contains the Japanese translations for Kile.
-
-%package i18n-lt
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Lithuanian (lt) translations for Kile [Trinity]
-%description i18n-lt
-This package contains the Lithuanian translations for Kile.
-
-%package i18n-ms
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Malay (ms) translations for Kile [Trinity]
-%description i18n-ms
-This package contains the Malay translations for Kile.
-
-%package i18n-mt
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Maltese (mt) translations for Kile [Trinity]
-%description i18n-mt
-This package contains the Maltese translations for Kile.
-
-%package i18n-nb
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Norwegian Bookmal (nb) translations for Kile [Trinity]
-%description i18n-nb
-This package contains the Norwegian Bookmal translations for Kile.
-
-%package i18n-nds
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Low Saxon (nds) translations for Kile [Trinity]
-%description i18n-nds
-This package contains the Low Saxon translations for Kile.
-
-%package i18n-nl
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Dutch (nl) translations for Kile [Trinity]
-%description i18n-nl
-This package contains the Dutch translations for Kile.
-
-%package i18n-nn
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Norwegian Nynorsk (nn) translations for Kile [Trinity]
-%description i18n-nn
-This package contains the Norwegian Nynorsk translations for Kile.
-
-%package i18n-pa
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Punjabi (pa) translations for Kile [Trinity]
-%description i18n-pa
-This package contains the Punjabi translations for Kile.
-
-%package i18n-pl
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Polish (pl) translations for Kile [Trinity]
-%description i18n-pl
-This package contains the Polish translations for Kile.
-
-%package i18n-pt
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Portuguese (pt) translations for Kile [Trinity]
-%description i18n-pt
-This package contains the Portuguese translations for Kile.
-
-%package i18n-ptbr
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Brazilian Portuguese (pt_BR) translations for Kile [Trinity]
-%description i18n-ptbr
-This package contains the Brazilian Portuguese translations for Kile.
-
-%package i18n-ro
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Romanian (ro) translations for Kile [Trinity]
-%description i18n-ro
-This package contains the Romanian translations for Kile.
-
-%package i18n-ru
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Russian (ru) translations for Kile [Trinity]
-%description i18n-ru
-This package contains the Russian translations for Kile.
-
-%package i18n-rw
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Kinyarwanda (rw) translations for Kile [Trinity]
-%description i18n-rw
-This package contains the Kinyarwanda translations for Kile.
-
-%package i18n-sk
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Slovak (sk) translations for Kile [Trinity]
-%description i18n-sk
-This package contains the Slovak translations for Kile.
-
-%package i18n-sr
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Serbian (sr) translations for Kile [Trinity]
-%description i18n-sr
-This package contains the Serbian translations for Kile.
-
-%package i18n-srlatin
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Latin Serbian (sr@Latn) translations for Kile [Trinity]
-%description i18n-srlatin
-This package contains the Latin Serbian translations for Kile.
-
-%package i18n-sv
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Swedish (sv) translations for Kile [Trinity]
-%description i18n-sv
-This package contains the Swedish translations for Kile.
-
-%package i18n-ta
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Tamil (ta) translations for Kile [Trinity]
-%description i18n-ta
-This package contains the Tamil translations for Kile.
-
-%package i18n-th
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Thai (th) translations for Kile [Trinity]
-%description i18n-th
-This package contains the Thai translations for Kile.
-
-%package i18n-tr
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Turkish (tr) translations for Kile [Trinity]
-%description i18n-tr
-This package contains the Turkish translations for Kile.
-
-%package i18n-uk
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Ukrainian (uk) translations for Kile [Trinity]
-%description i18n-uk
-This package contains the Ukrainian translations for Kile.
-
-%package i18n-zhcn
-Group:		Applications/Publishing
-Requires: %{name} >= %{version}
-Provides: trinity-kile-i18n
-Summary: Chinese Simplified (zh_CN) translations for Kile [Trinity]
-%description i18n-zhcn
-This package contains the Chinese Simplified translations for Kile.
-
-
-%description
-Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
-
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-
-Kile can support large projects consisting of several smaller files.
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kile
-%{tde_tdeappdir}/kile.desktop
-%{tde_datadir}/apps/kconf_update
-%{tde_datadir}/apps/kile
-%{tde_datadir}/config.kcfg/kile.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kile.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_tdedocdir}/HTML/en/kile
-%{tde_datadir}/mimelnk/text/x-kilepr.desktop
-
-%files i18n-da
-%lang(da) %{tde_tdedocdir}/HTML/da/kile
-%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/kile.mo
-
-%files i18n-es
-%lang(es) %{tde_tdedocdir}/HTML/es/kile
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/kile.mo
-
-%files i18n-et
-%lang(et) %{tde_tdedocdir}/HTML/et/kile
-%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/kile.mo
-
-%files i18n-it
-%lang(it) %{tde_tdedocdir}/HTML/it/kile
-%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kile.mo
-
-%files i18n-nl
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kile
-%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kile.mo
-
-%files i18n-pt
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kile
-%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/kile.mo
-
-%files i18n-sv
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kile
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/kile.mo
-
-%files i18n-ar
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/kile.mo
-
-%files i18n-bg
-%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kile.mo
-
-%files i18n-br
-%lang(br) %{tde_datadir}/locale/br/LC_MESSAGES/kile.mo
-
-%files i18n-ca
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/kile.mo
-
-%files i18n-cs
-%lang(cs) %{tde_datadir}/locale/cs/LC_MESSAGES/kile.mo
-
-%files i18n-cy
-%lang(cy) %{tde_datadir}/locale/cy/LC_MESSAGES/kile.mo
-
-%files i18n-de
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kile.mo
-
-%files i18n-el
-%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/kile.mo
-
-%files i18n-engb
-%lang(en_GB) %{tde_datadir}/locale/en_GB/LC_MESSAGES/kile.mo
-
-%files i18n-eu
-%lang(eu) %{tde_datadir}/locale/eu/LC_MESSAGES/kile.mo
-
-%files i18n-fi
-%lang(fi) %{tde_datadir}/locale/fi/LC_MESSAGES/kile.mo
-
-%files i18n-fr
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/kile.mo
-
-%files i18n-ga
-%lang(ga) %{tde_datadir}/locale/ga/LC_MESSAGES/kile.mo
-
-%files i18n-gl
-%lang(gl) %{tde_datadir}/locale/gl/LC_MESSAGES/kile.mo
-
-%files i18n-hi
-%lang(hi) %{tde_datadir}/locale/hi/LC_MESSAGES/kile.mo
-
-%files i18n-hu
-%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kile.mo
-
-%files i18n-is
-%lang(is) %{tde_datadir}/locale/is/LC_MESSAGES/kile.mo
-
-%files i18n-ja
-%lang(ja) %{tde_datadir}/locale/ja/LC_MESSAGES/kile.mo
-
-%files i18n-lt
-%lang(lt) %{tde_datadir}/locale/lt/LC_MESSAGES/kile.mo
-
-%files i18n-ms
-%lang(ms) %{tde_datadir}/locale/ms/LC_MESSAGES/kile.mo
-
-%files i18n-mt
-%lang(mt) %{tde_datadir}/locale/mt/LC_MESSAGES/kile.mo
-
-%files i18n-nb
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/kile.mo
-
-%files i18n-nds
-%lang(nds) %{tde_datadir}/locale/nds/LC_MESSAGES/kile.mo
-
-%files i18n-nn
-%lang(nn) %{tde_datadir}/locale/nn/LC_MESSAGES/kile.mo
-
-%files i18n-pa
-%lang(pa) %{tde_datadir}/locale/pa/LC_MESSAGES/kile.mo
-
-%files i18n-pl
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/kile.mo
-
-%files i18n-ptbr
-%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/kile.mo
-
-%files i18n-ro
-%lang(ro) %{tde_datadir}/locale/ro/LC_MESSAGES/kile.mo
-
-%files i18n-ru
-%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kile.mo
-
-%files i18n-rw
-%lang(rw) %{tde_datadir}/locale/rw/LC_MESSAGES/kile.mo
-
-%files i18n-sk
-%lang(sk) %{tde_datadir}/locale/sk/LC_MESSAGES/kile.mo
-
-%files i18n-sr
-%lang(sr) %{tde_datadir}/locale/sr/LC_MESSAGES/kile.mo
-
-%files i18n-srlatin
-%lang(sr@Latn) %{tde_datadir}/locale/sr@Latn/LC_MESSAGES/kile.mo
-
-%files i18n-ta
-%lang(ta) %{tde_datadir}/locale/ta/LC_MESSAGES/kile.mo
-
-%files i18n-th
-%lang(th) %{tde_datadir}/locale/th/LC_MESSAGES/kile.mo
-
-%files i18n-tr
-%lang(tr) %{tde_datadir}/locale/tr/LC_MESSAGES/kile.mo
-
-%files i18n-uk
-%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/kile.mo
-
-%files i18n-zhcn
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/kile.mo
- 
-
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
-- Rebuilt for Fedora 17
-- Removes the XPM icon
-
-* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
-- Fix file conflict with trinity-kdelibs
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-3.5.13.1.spec b/redhat/applications/kima/kima-3.5.13.1.spec
deleted file mode 100644
index adf052a06..000000000
--- a/redhat/applications/kima/kima-3.5.13.1.spec
+++ /dev/null
@@ -1,127 +0,0 @@
-# Default version for this component
-%define kdecomp kima
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	kicker monitoring applet [Trinity]
-Version:	0.7.3.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.elliptique.net/~ken/kima/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-This applet monitors various temperature,
-frequency and fan sources in your kicker
-panel.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/libkima.la
-%{tde_tdelibdir}/libkima.so
-%{tde_datadir}/apps/kicker/applets/kima.desktop
-%{tde_tdedocdir}/HTML/en/kima/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec
deleted file mode 100644
index aad28627b..000000000
--- a/redhat/applications/kima/kima-3.5.13.2.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define tde_pkg kima
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		kicker monitoring applet [Trinity]
-Version:		0.7.3.2
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.elliptique.net/~ken/kima/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# HAL support
-#  On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.4.8
-%endif
-
-
-%description
-This applet monitors various temperature,
-frequency and fan sources in your kicker
-panel.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/libkima.la
-%{tde_tdelibdir}/libkima.so
-%{tde_datadir}/apps/kicker/applets/kima.desktop
-%{tde_tdedocdir}/HTML/en/kima/
-
-
-%changelog
diff --git a/redhat/applications/kima/kima-3.5.13.spec b/redhat/applications/kima/kima-3.5.13.spec
deleted file mode 100644
index 80f5dc115..000000000
--- a/redhat/applications/kima/kima-3.5.13.spec
+++ /dev/null
@@ -1,118 +0,0 @@
-# Default version for this component
-%define kdecomp kima
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	kicker monitoring applet [Trinity]
-Version:	0.7.3.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.elliptique.net/~ken/kima/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-This applet monitors various temperature,
-frequency and fan sources in your kicker
-panel.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/acinclude.m4.in" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/libkima.la
-%{tde_tdelibdir}/libkima.so
-%{tde_datadir}/apps/kicker/applets/kima.desktop
-%{tde_tdedocdir}/HTML/en/kima/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec
deleted file mode 100644
index c95fcd01c..000000000
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default version for this component
-%define kdecomp kiosktool
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Version:	1.0
-Release:	3%{?dist}%{?_variant}
-Summary:	tool to configure the TDE kiosk framework
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-
-Source0: %{kdecomp}-3.5.13.1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gettext
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-
-
-%description
-A Point&Click tool for system administrators to enable 
-TDE's KIOSK features or otherwise preconfigure TDE for 
-groups of users.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --enable-closure \
-  --with-extra-includes=%{tde_includedir}/tqt
-  
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-kdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/*.png
-%{tde_tdedocdir}/HTML/en/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/apps/kiosktool/kiosk_data.xml
-%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
deleted file mode 100644
index 68c088ba5..000000000
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define tde_pkg kiosktool
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Version:		1.0
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-Summary:		tool to configure the TDE kiosk framework
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-A Point&Click tool for system administrators to enable 
-TDE's KIOSK features or otherwise preconfigure TDE for 
-groups of users.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-kdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/*.png
-%{tde_tdedocdir}/HTML/en/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/apps/kiosktool/kiosk_data.xml
-%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
-
-%changelog
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.spec
deleted file mode 100644
index 8ec53de65..000000000
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp kiosktool
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Version:	1.0
-Release:	2%{?dist}%{?_variant}
-Summary:	tool to configure the TDE kiosk framework
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gettext
-BuildRequires: trinity-tdelibs-devel
-
-
-%description
-A Point&Click tool for system administrators to enable 
-TDE's KIOSK features or otherwise preconfigure TDE for 
-groups of users.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --enable-closure \
-  --with-extra-includes=%{tde_includedir}/tqt
-  
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-## File lists
-# locale's
-%find_lang %{kdecomp}
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-kdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/*.png
-%{tde_tdedocdir}/HTML/en/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_datadir}/apps/kiosktool/kiosk_data.xml
-%{tde_datadir}/apps/kiosktool/kiosktoolui.rc
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 02962e256..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 5106117b5c1439d3fee08395c1a025f62d30a53e
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335631986 -0500
-
-    GCC 4.7 fixes.
-
-diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
-index ebf7b0d..c4bf580 100644
---- a/src/gstplayer.cpp
-+++ b/src/gstplayer.cpp
-@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) {
-     gstapp->exec ();
- 
-     XLockDisplay(display);
--    XClientMessageEvent ev = {
--        ClientMessage, 0, true, display, wid, 
--        XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"}
--    };
--    XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev);
-+    XEvent ev;
-+    ev.xclient.type = ClientMessage;
-+    ev.xclient.serial = 0;
-+    ev.xclient.send_event = true;
-+    ev.xclient.display = display;
-+    ev.xclient.window = wid;
-+    ev.xclient.message_type = XInternAtom (display, "XVIDEO", false);
-+    ev.xclient.format = 8;
-+    strcpy(ev.xclient.data.b, "quit_now");
-+    XSendEvent (display, wid, false, StructureNotifyMask, &ev);
-     XFlush (display);
-     XUnlockDisplay(display);
-     eventThread->wait (500);
-diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
-index 27b26cd..bdeac91 100644
---- a/src/kmplayerapp.cpp
-+++ b/src/kmplayerapp.cpp
-@@ -17,6 +17,8 @@
- 
- #undef Always
- 
-+#include <unistd.h>
-+
- // include files for QT
- #include <tqdatastream.h>
- #include <tqregexp.h>
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ba6c16cb9..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmplayer/src/Makefile.am.ORI	2012-08-05 17:09:59.963896862 +0200
-+++ kmplayer/src/Makefile.am	2012-08-05 17:10:16.667563785 +0200
-@@ -6,7 +6,7 @@
- 
- libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
- libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries)
--libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS)
-+libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO)
- 
- if include_koffice_support
- kofficeplugin_lib= libkmplayerkofficepart.la
---- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
-+++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
-@@ -58,6 +58,7 @@
- kgstplayer_SOURCES= gstplayer.cpp
- 
- knpplayer_LDADD= $(LIBNSPR_LIBS)
-+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
- knpplayer_SOURCES= npplayer.c
- 
- xdg_apps_DATA = kmplayer.desktop
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch b/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch
deleted file mode 100644
index 1dd604c1a..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: b/src/xineplayer.cpp
-===================================================================
---- a/src/xineplayer.cpp	2012-10-30 18:39:16.000000000 +0000
-+++ b/src/xineplayer.cpp	2012-11-03 17:56:01.760234144 +0000
-@@ -528,7 +528,11 @@
-     xine_event_create_listener_thread (event_queue, event_listener, NULL);
-     if (mrl == "cdda:/") {
-         int nr;
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
-+        const char * const* mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
-+#else
-         char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
-+#endif
-         running = 1;
-         for (int i = 0; i < nr; i++) {
-             TQString m (mrls[i]);
-@@ -863,10 +867,10 @@
-                             case XK_p: // previous
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_PREVIOUS,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_PREVIOUS;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -875,10 +879,10 @@
-                             case XK_n: // next
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_NEXT,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_NEXT;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -887,10 +891,10 @@
-                             case XK_u: // up menu
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_MENU1,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU1;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -899,10 +903,10 @@
-                             case XK_r: // root menu
-                                 mutex.lock ();
-                                 if (stream) {
--                                    xine_event_t xine_event =  { 
--                                        XINE_EVENT_INPUT_MENU3,
--                                        stream, 0L, 0, { 0, 0 }
--                                    };
-+                                    xine_event_t xine_event;
-+                                    memset(&xine_event, 0, sizeof(xine_event));
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU3;
-+                                    xine_event.stream = stream;
-                                     xine_event_send (stream, &xine_event);
-                                 } 
-                                 mutex.unlock ();
-@@ -985,11 +989,12 @@
-                         data.x = rect.x;
-                         data.y = rect.y;
-                         data.button = 0;
--                        xine_event_t xine_event =  { 
--                                XINE_EVENT_INPUT_MOUSE_MOVE,
--                                stream, &data, sizeof (xine_input_data_t),
--                                { 0 , 0 }
--                        };
-+                        xine_event_t xine_event;
-+                        memset(&xine_event, 0, sizeof(xine_event));
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
-+                        xine_event.stream = stream;
-+                        xine_event.data = &data;
-+                        xine_event.data_length = sizeof (xine_input_data_t);
-                         mutex.lock ();
-                         xine_event_send (stream, &xine_event);
-                         mutex.unlock ();
-@@ -1023,11 +1028,12 @@
-                         data.x = rect.x;
-                         data.y = rect.y;
-                         data.button = 1;
--                        xine_event_t xine_event =  { 
--                                XINE_EVENT_INPUT_MOUSE_BUTTON,
--                                stream, &data, sizeof (xine_input_data_t),
--                                { 0, 0 }
--                        };
-+                        xine_event_t xine_event;
-+                        memset(&xine_event, 0, sizeof(xine_event));
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
-+                        xine_event.stream = stream;
-+                        xine_event.data = &data;
-+                        xine_event.data_length = sizeof (xine_input_data_t);
-                         mutex.lock ();
-                         xine_event_send (stream, &xine_event);
-                         mutex.unlock ();
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
deleted file mode 100644
index e01ee9a36..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
+++ /dev/null
@@ -1,247 +0,0 @@
-# Default version for this component
-%define kdecomp kmplayer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	media player for Trinity
-Version:	0.10.0c
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kmplayer.kde.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kmplayer] Fix xine 1.2 support
-Patch1:		kmplayer-3.5.13.1-fix_xine12_support.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires:	libxv-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-
-Requires:	%{name}-base
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		trinity-kmplayer-base, trinity-kdebase
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%changelog
-* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4
-- Fix xine 1.2 support (openSUSE 12.2 only)
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
-- Fix compilation with GCC 4.7 [Commit #5106117b]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
deleted file mode 100644
index ef8bb091c..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ /dev/null
@@ -1,275 +0,0 @@
-# Default version for this component
-%define tde_pkg kmplayer
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		media player for Trinity
-Version:		0.10.0c
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://kmplayer.kde.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-# DBUS support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libgstreamer0.10-devel
-%else
-BuildRequires:	%{_lib}gstreamer0.10-devel
-%endif
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-#BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxt-devel
-BuildRequires:	libxv-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXv-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel 
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXv-devel
-%endif
-
-# GTK2 stuff
-BuildRequires:	gtk2-devel
-
-# DBUS stuff
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-Requires:		%{name}-base = %{version}-%{release}
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		%{name}-base = %{version}-%{release}
-Requires:		trinity-tdebase >= %{tde_version}
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for TDE.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%changelog
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.spec
deleted file mode 100644
index 47248bc5d..000000000
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.spec
+++ /dev/null
@@ -1,232 +0,0 @@
-# Default version for this component
-%define kdecomp kmplayer
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	media player for Trinity
-Version:	0.10.0c
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kmplayer.kde.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b]
-Patch1:		kmplayer-3.5.13-fix_gcc47_compilation.patch
-
-# [kmplayer] Missing LDLFLAGS cause FTBFS
-Patch2:		kmplayer-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	dbus-tqt-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer0.10-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-BuildRequires:	libxv-devel
-%else
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	libXv-devel
-%endif
-
-Requires:	%{name}-base
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		trinity-kmplayer-base, trinity-kdebase
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
-  --enable-closure
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libkdeinit_kmplayer.la
-%{tde_libdir}/libkdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdeappdir}/kmplayer.desktop
-%{tde_datadir}/apps/kmplayer
-%{tde_datadir}/services/kmplayer_part.desktop
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
-- Fix compilation with GCC 4.7 [Commit #5106117b]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 4daf67e9b..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig	2012-05-02 04:58:04.051212974 -0400
-+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp	2012-05-02 05:07:11.093803088 -0400
-@@ -305,14 +305,15 @@
- 	if ( m_zone && ! m_host ) {
- 		if ( onOff ) {
- 			m_protocolUsage = 0;
--			if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
-+			KMFProtocolUsage* pro;
-+			if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
- 				m_protocolUsage = pro;
- 			} else { 
- 					KMFUndoEngine::instance()->startTransaction(
- 					m_zone,
- 					i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
- 					);
--					KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
-+					pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
- 			
- 				if ( pro ) {
- 					kdDebug() << "Added Protocol to zone: " << m_zone-> name()  << endl;
-@@ -341,15 +342,16 @@
- 	} else if ( m_host ) {
- 		if ( onOff ) {
- 			m_protocolUsage = 0;
-+			KMFProtocolUsage* pro;
- 			
--				if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
-+				if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
- 				m_protocolUsage = pro;
- 			} else {
- 				KMFUndoEngine::instance()->startTransaction(
- 					m_host,
- 					i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
- 					);
--					KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
-+					pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
- 			
- 				if ( pro ) {
- 					kdDebug() << "Added Protocol to host: " << m_host-> name()  << endl;
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
deleted file mode 100644
index f2d236faa..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmyfirewall/kmyfirewall/core/Makefile.am.ROI	2012-08-05 17:28:28.006801940 +0200
-+++ kmyfirewall/kmyfirewall/core/Makefile.am	2012-08-05 17:28:40.878545270 +0200
-@@ -53,7 +53,7 @@
- 
- libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
- 
--libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO)
-+libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- 
- libkmfcoreinclude_HEADERS = ipaddress.h \
- 	iptable.h \
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
deleted file mode 100644
index 22037de91..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-# Default version for this component
-%define kdecomp kmyfirewall
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
-Version:	1.1.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
-- GCC 4.7 fixes. [Commit #88d2d2a7]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
deleted file mode 100644
index ffea0e925..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-# Default version for this component
-%define tde_pkg kmyfirewall
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		iptables based firewall configuration tool for TDE [Trinity]
-Version:		1.1.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%changelog
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
deleted file mode 100644
index 0414eddca..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
+++ /dev/null
@@ -1,207 +0,0 @@
-# Default version for this component
-%define kdecomp kmyfirewall
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
-Version:	1.1.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
-Patch1:		kmyfirewall-3.5.13-fix_gcc47_compilation.patch
-# [kmyfirefall] Missing LDFLAGS cause FTBFS
-Patch2:		kmyfirewall-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor Locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
-%{tde_datadir}/apps/kmfsystray
-%{tde_datadir}/apps/kmyfirewall
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_datadir}/config/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
-- GCC 4.7 fixes. [Commit #88d2d2a7]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz b/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz
deleted file mode 100644
index 2d81662a6..000000000
--- a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz
+++ /dev/null
diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/admin-fix-parallel-test.diff
deleted file mode 100644
index 9f6f46ba8..000000000
--- a/redhat/applications/kmymoney/admin-fix-parallel-test.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
-+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
-@@ -123,7 +123,7 @@
- fi
- 
- echo "*** Creating Makefile templates"
--$AUTOMAKE || exit 1
-+$AUTOMAKE --add-missing || exit 1
- 
- if test "$UNSERMAKE" = no; then
-   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index f9c6cb62e..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI	2012-05-02 05:22:43.788349181 -0400
-+++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp	2012-05-02 05:23:01.910909490 -0400
-@@ -20,6 +20,8 @@
- #include <config.h>
- #endif
- 
-+#include <unistd.h>
-+
- // ----------------------------------------------------------------------------
- // QT Includes
- 
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch
deleted file mode 100644
index 8a6754fb5..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kmymoney/kmymoney2/widgets/Makefile.am.ORI	2012-08-05 18:38:59.001977368 +0200
-+++ kmymoney/kmymoney2/widgets/Makefile.am	2012-08-05 18:39:47.007986865 +0200
-@@ -68,19 +68,19 @@
- # Hence the quick hack to include the required objects from the
- # libkmm_mymoney.so directly into libkmymoney.so
- libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
--libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
-+libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- 
- if INSTALL_QTDESIGNER_SUPPORT
- install-exec-local: libkmymoney.la
--	$(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer
--	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer
-+	$(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer
-+	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/designer
- 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
- 	for file in $(WIDGET_PNGS); do \
- 	  $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
- 	done
- 
- uninstall-local:
--	-rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so
-+	-rm $(DESTDIR)${QTPLUGINS}/designer/libkmymoney.so
- 	for file in $(WIDGET_PNGS); do \
- 	  rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
- 	done
---- kmymoney/admin/acinclude.m4.ORI	2012-08-05 19:47:47.819789267 +0200
-+++ kmymoney/admin/acinclude.m4.in	2012-08-05 19:48:35.842776216 +0200
-@@ -6724,7 +6724,11 @@
-       QTDIR=`dirname $MOC`
-       QTDIR=${QTDIR%/bin}
-     fi
--    LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
-+    if test x$QTPLUGINS = x; then
-+      LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
-+    else
-+      LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so
-+    fi
- 
-     # do the checks
-     if test $enable_sqlite3 = auto; then
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
deleted file mode 100644
index 83bfec920..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-commit 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326525051 -0600
-
-    Fix a number of crashes
-
-diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
-index 52ef770..880b1c2 100644
---- a/kmymoney2/converter/mymoneyqifprofile.cpp
-+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
-@@ -769,7 +769,7 @@ TQString MyMoneyQifProfile::inputDateFormat(void) const
-   possibleDateFormats(list);
-   if(list.count() == 1)
-     return list.first();
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
-diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
-index 9390429..a974e8f 100644
---- a/kmymoney2/converter/mymoneyqifreader.cpp
-+++ b/kmymoney2/converter/mymoneyqifreader.cpp
-@@ -714,7 +714,7 @@ const TQString MyMoneyQifReader::extractLine(const TQChar id, int cnt)
-     }
-   }
-   m_extractedLine = -1;
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyQifReader::extractSplits(TQValueList<qSplit>& listqSplits) const
-diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-index 4de99f6..beb8e98 100644
---- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
-@@ -53,7 +53,7 @@ KCategoryReassignDlg::~KCategoryReassignDlg()
- TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
- {
-   if (category.id().isEmpty())
--   return TQString(); // no payee available? nothing can be selected...
-+   return TQString::null; // no payee available? nothing can be selected...
- 
-   AccountSet set;
-   set.addAccountGroup(MyMoneyAccount::Income);
-@@ -79,12 +79,12 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
-   // if there is no category for reassignment left, we bail out
-   if(list.isEmpty()) {
-     KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>.  However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>"));
--    return TQString();
-+    return TQString::null;
-   }
- 
-   // execute dialog and if aborted, return empty string
-   if (this->exec() == TQDialog::Rejected)
--    return TQString();
-+    return TQString::null;
- 
-   // otherwise return index of selected payee
-   return m_category->selectedItem();
-diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
-index 884807f..87baaf9 100644
---- a/kmymoney2/dialogs/knewloanwizard.cpp
-+++ b/kmymoney2/dialogs/knewloanwizard.cpp
-@@ -1072,7 +1072,7 @@ int KNewLoanWizard::term(void) const
- TQString KNewLoanWizard::initialPaymentAccount(void) const
- {
-   if(m_dontCreatePayoutCheckBox->isChecked()) {
--    return TQString();
-+    return TQString::null;
-   }
-   return m_assetAccountEdit->selectedItems().first();
- }
-diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
-index 0c3c0cf..1db13f1 100644
---- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
-+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
-@@ -53,13 +53,13 @@ KPayeeReassignDlg::~KPayeeReassignDlg()
- TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist)
- {
-   if (payeeslist.isEmpty())
--   return TQString(); // no payee available? nothing can be selected...
-+   return TQString::null; // no payee available? nothing can be selected...
- 
-   payeeCombo->loadPayees(payeeslist);
- 
-   // execute dialog and if aborted, return empty string
-   if (this->exec() == TQDialog::Rejected)
--    return TQString();
-+    return TQString::null;
- 
-   // otherwise return index of selected payee
-   return payeeCombo->selectedItem();
-diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
-index 6ef1f9c..c83e834 100644
---- a/kmymoney2/mymoney/mymoneyaccount.cpp
-+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
-@@ -450,7 +450,7 @@ void MyMoneyAccountLoan::setPayee(const TQString& payee)
- 
- const TQString MyMoneyAccountLoan::interestAccountId(void) const
- {
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyAccountLoan::setInterestAccountId(const TQString& /* id */)
-diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
-index 4809b28..c59d577 100644
---- a/kmymoney2/mymoney/mymoneyfile.cpp
-+++ b/kmymoney2/mymoney/mymoneyfile.cpp
-@@ -1230,7 +1230,7 @@ TQString MyMoneyFile::locateSubAccount(const MyMoneyAccount& base, const TQStrin
-       return locateSubAccount(nextBase, remainder);
-     }
-   }
--  return TQString();
-+  return TQString::null;
- }
- 
- TQString MyMoneyFile::value(const TQString& key) const
-diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-index 22fa1ac..cabf772 100644
---- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
-@@ -55,7 +55,7 @@ const TQString& MyMoneyKeyValueContainer::value(const TQString& key) const
-   it = m_kvp.find(key);
-   if(it != m_kvp.end())
-     return (*it);
--  return TQString();
-+  return TQString::null;
- }
- 
- void MyMoneyKeyValueContainer::setValue(const TQString& key, const TQString& value)
-diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp
-index 08ffff4..8012200 100644
---- a/kmymoney2/mymoney/mymoneyutils.cpp
-+++ b/kmymoney2/mymoney/mymoneyutils.cpp
-@@ -305,7 +305,7 @@ TQString dateToString(const TQDate& date)
-   if(!date.isNull() && date.isValid())
-     return date.toString(Qt::ISODate);
- 
--  return TQString();
-+  return TQString::null;
- }
- 
- TQDate stringToDate(const TQString& str)
-@@ -323,7 +323,7 @@ TQString TQStringEmpty(const TQString& val)
-   if(!val.isEmpty())
-     return TQString(val);
- 
--  return TQString();
-+  return TQString::null;
- }
- 
- unsigned long extractId(const TQString& txt)
-diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-index 084d73c..ec2d4a0 100644
---- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
-@@ -98,14 +98,14 @@ const TQString& KOnlineBankingtqStatus::appId(void) const
- {
-   if(m_appId)
-     return m_appId->appId();
--  return TQString();
-+  return TQString::null;
- }
- 
- TQString KOnlineBankingtqStatus::headerVersion(void) const
- {
-   if(m_headerVersion)
-     return m_headerVersion->headerVersion();
--  return TQString();
-+  return TQString::null;
- }
- 
- #include "konlinebankingstatus.moc"
-diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-index 36a05b5..7408a38 100644
---- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
-@@ -125,7 +125,7 @@ const TQString& OfxAppVersion::appId(void) const
-   TQString app = m_combo->currentText();
-   if(m_appMap[app] != defaultAppId)
-     return m_appMap[app];
--  return TQString();
-+  return TQString::null;
- }
- 
- MyMoneyOfxConnector::MyMoneyOfxConnector(const MyMoneyAccount& _account):
-diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
-index f8b6489..761b537 100644
---- a/kmymoney2/widgets/kmymoneycombo.cpp
-+++ b/kmymoney2/widgets/kmymoneycombo.cpp
-@@ -588,7 +588,7 @@ public:
-         return it.key();
-       }
-     }
--    return TQString();
-+    return TQString::null;
-   }
- };
- 
-diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
-index ff00c78..f446acf 100644
---- a/kmymoney2/widgets/kmymoneywizard.cpp
-+++ b/kmymoney2/widgets/kmymoneywizard.cpp
-@@ -106,7 +106,7 @@ bool KMyMoneyWizardPage::isComplete(void) const
- 
- const TQString& KMyMoneyWizardPage::helpContext(void) const
- {
--  return TQString();
-+  return TQString::null;
- }
- 
- KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) :
-diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h
-index e9c21d3..83b9a04 100644
---- a/kmymoney2/widgets/registeritem.h
-+++ b/kmymoney2/widgets/registeritem.h
-@@ -88,14 +88,14 @@ public:
-   virtual const TQDate& sortPostDate(void) const { return nullDate; }
-   virtual int sortSamePostDate(void) const = 0;
-   virtual const TQDate& sortEntryDate(void) const { return nullDate; }
--  virtual const TQString& sortPayee(void) const { return TQString(); }
-+  virtual const TQString& sortPayee(void) const { return TQString::null; }
-   virtual const MyMoneyMoney& sortValue(void) const { return nullValue; }
--  virtual const TQString& sortNumber(void) const { return TQString(); }
--  virtual const TQString& sortEntryOrder(void) const { return TQString(); }
-+  virtual const TQString& sortNumber(void) const { return TQString::null; }
-+  virtual const TQString& sortEntryOrder(void) const { return TQString::null; }
-   virtual CashFlowDirection sortType(void) const { return Deposit; }
--  virtual const TQString& sortCategory(void) const { return TQString(); }
-+  virtual const TQString& sortCategory(void) const { return TQString::null; }
-   virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return MyMoneySplit::MaxReconcileState; }
--  virtual const TQString& sortSecurity(void) const { return TQString(); }
-+  virtual const TQString& sortSecurity(void) const { return TQString::null; }
- 
-   /**
-     * This method sets the row offset of the item in the register
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch
deleted file mode 100644
index c80007000..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro.ORI	2012-08-05 18:51:56.961702141 +0200
-+++ kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro	2012-08-05 19:05:43.064116419 +0200
-@@ -4,13 +4,13 @@
- # Target is una libreria:  qsqlite3
- 
- INSTALLS += target 
--target.path = $QTDIR/plugins/sqldrivers 
-+target.path = $(qt_plugins)/sqldrivers 
- HEADERS += qsql_sqlite3.h \
-            qsqlcachedresult.h 
- SOURCES += smain.cpp \
-            qsql_sqlite3.cpp \
-            qsqlcachedresult.cpp 
--LIBS += -lsqlite3 
-+LIBS += -lsqlite3 -L$(QTLIB)
- TARGET = qsqlite3 
- DESTDIR = ../sqldrivers 
- CONFIG += release \
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch
deleted file mode 100644
index 522329f19..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kmymoney/doc/en/Makefile.am.ORI	2011-11-26 17:57:22.473298551 +0100
-+++ kmymoney/doc/en/Makefile.am	2011-11-26 17:58:18.611423284 +0100
-@@ -111,7 +111,7 @@
- kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
- 	$(MAKE) get-files
- 	$(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl  $(srcdir)/index.docbook -o index.html;
--	recode utf8..latin1 index.html
-+	recode utf8..latin1 index.html || :
- 	html2ps -o kmymoney-user.ps -n index.html
- 	ps2pdf kmymoney-user.ps kmymoney-user.pdf
- 	rm index.html kmymoney-user.ps
---- kmymoney/developer-doc/phb/Makefile.am.ORI	2011-11-26 12:00:54.708855347 -0500
-+++ kmymoney/developer-doc/phb/Makefile.am	2011-11-26 12:01:01.683692300 -0500
-@@ -106,7 +106,7 @@
- kmymoney-phb.pdf: $(DOCBOOK_FILES)
- 	$(MAKE) get-files
- 	$(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
--	recode utf8..latin1 index.html
-+	recode utf8..latin1 index.html || :
- 	html2ps -o kmymoney-phb.ps -n index.html
- 	ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
- 	rm index.html kmymoney-phb.ps
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
deleted file mode 100644
index 7aefe2026..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-commit 8654cea10f6902719006d5975db7dc07b2fcc713
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1326571732 -0600
-
-    Update to upstream stable version 1.0.5
-
-diff --git a/ChangeLog b/ChangeLog
-index d250496..c996acb 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,7 +1,40 @@
- 
-+2010-05-15 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Released 1.0.5
-+
-+2010-05-12 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Fixed the way to calculate balance variation for the linear regression
-+    forecast method (backported from KDE4)
-+
-+2010-05-09 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Fixed a crash when a budget selected for a report is no longer present
-+
-+2010-05-04 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * replace all new line characters because we only have one line
-+    available for the displayed data (backported from KDE4)
-+  * Don't allow import of investment transactions that don't have a share
-+    amount. This used to end in a div by zero when calculating the price.
-+    (Backported from KDE4)
-+
-+2010-05-03 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Add all overdue schedules when calculating forecast
-+  * Do not show accounts of institutions if it has been selected
-+    in the general settings to Do not show closed accounts
-+  * Do not show an institution if it has no visible accounts and
-+    it has been selected to not show closed accounts
-+
-+2010-04-20 Thomas Baumgart <ipwizard@users.sourceforge.net>
-+  * Backported fix from Ian Neal to solve problems when opening the ledger
-+    with specific scheduled transactions
-+
-+2010-04-03 Alvaro Soliverez <asoliverez@gmail.com>
-+  * Fixed loop in payments of the home page when a schedule is set to
-+    end by date
-+
- 2010-03-30 Thomas Baumgart <ipwizard@users.sourceforge.net>
-   * Backported encoding patch from KDE4 version
-   * Bumped version number
-+  * Released 1.0.4
- 
- 2010-03-29 Thomas Baumgart <ipwizard@users.sourceforge.net>
-   * Updated Finnish translation by Mikael Kujanpaa
-diff --git a/configure.in b/configure.in
-index 8a6c1b8..1a8dd02 100644
---- a/configure.in
-+++ b/configure.in
-@@ -40,7 +40,7 @@ dnl Perform program name transformation
- AC_ARG_PROGRAM
- 
- dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kmymoney2, 1.0.4) dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kmymoney2, 1.0.5) dnl searches for some needed programs
- 
- KDE_SET_PREFIX
- 
-diff --git a/configure.in.in b/configure.in.in
-index 3f82103..a90f40f 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -1,6 +1,6 @@
- #MIN_CONFIG(3.3.1)
- 
--AM_INIT_AUTOMAKE(kmymoney2,1.0.4)
-+AM_INIT_AUTOMAKE(kmymoney2,1.0.5)
- 
- KDE_ENABLE_HIDDEN_VISIBILITY
- 
-diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
-index 6756767..c08dcff 100644
---- a/kmymoney2/converter/mymoneystatementreader.cpp
-+++ b/kmymoney2/converter/mymoneystatementreader.cpp
-@@ -664,6 +664,10 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
-       if(!t_in.m_price.isZero()) {
-         s1.setPrice(t_in.m_price);
-       } else {
-+        if(t_in.m_shares.isZero()) {
-+          KMessageBox::information(0, i18n("This imported statement contains investment transactions with no share amount.  These transactions will be ignored."), i18n("No share amount provided"), TQString("BlankAmount"));
-+          return;
-+        }
-         s1.setPrice(((t_in.m_amount - t_in.m_fees) / t_in.m_shares).convert(MyMoneyMoney::precToDenom(KMyMoneyGlobalSettings::pricePrecision())));
-       }
- 
-diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp
-index bfecce0..c1c88c7 100644
---- a/kmymoney2/mymoney/mymoneyforecast.cpp
-+++ b/kmymoney2/mymoney/mymoneyforecast.cpp
-@@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void)
-   TQValueList<MyMoneySchedule> schedule;
- 
-   schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY,
--                                TQDate::tqcurrentDate(), forecastEndDate());
-+                                TQDate(), forecastEndDate());
-   if(schedule.count() > 0) {
-     TQValueList<MyMoneySchedule>::Iterator it;
-     do {
-@@ -871,8 +871,21 @@ MyMoneyMoney MyMoneyForecast::accountCycleVariation(const MyMoneyAccount& acc)
-   MyMoneyMoney cycleVariation;
- 
-   if (forecastMethod() == eHistoric) {
--    for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
--      cycleVariation += m_accountTrendList[acc.id()][t_day];
-+    switch(historyMethod()) {
-+      case 0:
-+      case 1:
-+        {
-+          for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
-+            cycleVariation += m_accountTrendList[acc.id()][t_day];
-+          }
-+        }
-+        break;
-+
-+      case 2:
-+        {
-+          cycleVariation = m_accountList[acc.id()][TQDate::currentDate().addDays(accountsCycle())] - m_accountList[acc.id()][TQDate::currentDate()];
-+        }
-+        break;
-     }
-   }
-   return cycleVariation;
-diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
-index db73062..b75ffb9 100644
---- a/kmymoney2/reports/pivottable.cpp
-+++ b/kmymoney2/reports/pivottable.cpp
-@@ -825,9 +825,27 @@ void PivotTable::calculateBudgetMapping( void )
-     //
-     // It will choose the first budget in the list for the start year of the report if no budget is select
-     MyMoneyBudget budget = MyMoneyBudget();
-+    
-+    TQValueList<MyMoneyBudget> budgets = file->budgetList();
-+    bool validBudget = false;
-+    
-+    //check that the selected budget is valid
-+    if (m_config_f.budget() != "Any") {
-+      TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
-+      while( budgets_it != budgets.end() ) {
-+        //pick the budget by id
-+        if ((*budgets_it).id() == m_config_f.budget()) {
-+          budget = file->budget((*budgets_it).id());
-+          validBudget = true;
-+          break;
-+        }
-+        ++budgets_it;
-+      }
-+    }
-+    
-     //if no budget has been selected
--    if (m_config_f.budget() == "Any" ) {
--      TQValueList<MyMoneyBudget> budgets = file->budgetList();
-+    if (!validBudget ) {
-+      
-       TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
-       while( budgets_it != budgets.end() ) {
-         //pick the first budget that matches the report start year
-@@ -843,9 +861,6 @@ void PivotTable::calculateBudgetMapping( void )
- 
-       //assign the budget to the report
-       m_config_f.setBudget(budget.id(), m_config_f.isIncludingBudgetActuals());
--    } else {
--      //pick the budget selected by the user
--      budget = file->budget( m_config_f.budget());
-     }
- 
-     // Dump the budget
-diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
-index 8209d3f..e82459a 100644
---- a/kmymoney2/views/kgloballedgerview.cpp
-+++ b/kmymoney2/views/kgloballedgerview.cpp
-@@ -485,7 +485,12 @@ void KGlobalLedgerView::loadView(void)
-             break;
- 
-           // for all others, we check if the next payment date is still 'in range'
--          s.setNextDueDate(s.nextPayment(s.nextDueDate()));
-+          TQDate nextDueDate = s.nextPayment(s.nextDueDate());
-+          if (nextDueDate.isValid()) {
-+            s.setNextDueDate(nextDueDate);
-+          } else {
-+            break;
-+          }
-         }
-         scheduleList.pop_front();
-       }
-diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
-index 60bb173..8745d64 100644
---- a/kmymoney2/views/khomeview.cpp
-+++ b/kmymoney2/views/khomeview.cpp
-@@ -595,6 +595,13 @@ void KHomeView::showPayments(void)
-           schedule.remove(it);
-           continue;
-         }
-+        
-+        //if nextPayment returns an invalid date, setNextDueDate will just skip it, resulting in a loop
-+        //we check the resulting date and erase the schedule if invalid
-+        if(!((*it).nextPayment((*it).nextDueDate())).isValid()) {
-+          schedule.remove(it);
-+          continue;
-+        }
- 
-         (*it).setNextDueDate((*it).nextPayment((*it).nextDueDate()));
-         qBubbleSort(schedule);
-diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
-index 0b9258f..87c0fc1 100644
---- a/kmymoney2/views/kinstitutionsview.cpp
-+++ b/kmymoney2/views/kinstitutionsview.cpp
-@@ -161,6 +161,9 @@ void KInstitutionsView::loadAccounts(void)
- 
-     // hide it, if unused
-     noInstitutionItem->setVisible(noInstitutionItem->childCount() != 0);
-+    
-+    bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
- 
-     TQValueList<MyMoneyInstitution> list = file->institutionList();
-     TQValueList<MyMoneyInstitution>::const_iterator it_i;
-@@ -168,6 +171,8 @@ void KInstitutionsView::loadAccounts(void)
-       KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(m_accountTree, *it_i);
-       item->setPixmap(0, none.pixmap());
-       loadSubAccounts(item, (*it_i).id());
-+      if(!showClosedAccounts)
-+        item->setVisible(item->childCount() != 0);
-     }
- 
-   } catch(MyMoneyException *e) {
-@@ -201,7 +206,8 @@ void KInstitutionsView::loadAccounts(void)
- 
- void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent)
- {
--  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
-+  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
-   const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject());
-   TQValueList<TQString>::const_iterator it_a;
-   MyMoneyFile* file = MyMoneyFile::instance();
-@@ -230,7 +236,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const T
- 
-   TQMap<TQString, MyMoneyAccount>::const_iterator it_a;
-   MyMoneyMoney  value;
--  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
-+  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
-+      || !KMyMoneyGlobalSettings::hideClosedAccounts();
- 
-   for(it_a = m_accountMap.begin(); it_a != m_accountMap.end(); ++it_a) {
-     const MyMoneyAccount& acc = *it_a;
-diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
-index 833c88e..9900c3c 100644
---- a/kmymoney2/widgets/stdtransactionmatched.cpp
-+++ b/kmymoney2/widgets/stdtransactionmatched.cpp
-@@ -179,6 +179,8 @@
-                 memo = memo.left(pos);
-                 if(memo.endsWith("\n"))
-                   memo = memo.left(pos-1);
-+                // replace all new line characters because we only have one line available for the displayed data
-+                memo.replace('\n', " ");
-               }
-             }
-             txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo);
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
deleted file mode 100644
index 9cc8c496b..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
+++ /dev/null
@@ -1,277 +0,0 @@
-# Default version for this component
-%define kdecomp kmymoney
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-%if 0%{?suse_version}
-%define qt3pluginsdir /usr/lib/qt3/plugins
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	personal finance manager for TDE
-
-Version:	1.0.5
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	kmymoneytitlelabel.png
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4:		kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-BuildRequires: recode
-BuildRequires: html2ps
-BuildRequires: libofx-devel
-
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}OpenSP5-devel
-%else
-BuildRequires: opensp-devel
-%endif
-
-Requires:		%{name}-common == %{version}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary:	KMyMoney architecture independent files
-Group:		Applications/Utilities
-Requires:	%{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary:	KMyMoney development files
-Group:		Development/Libraries
-Requires:	%{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR=%{tde_prefix}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure \
-  --enable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-	  if [ -d $lang_dir ]; then
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-		# replace absolute symlinks with relative ones
-		pushd $lang_dir
-		  for i in *; do
-			[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-		  done
-		popd
-	  fi
-	done
-fi
-
-%find_lang kmymoney2
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Updates to upstream 1.0.5
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 87e022f0f..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./kmymoney2/widgets/Makefile.am.ftbfs	2013-06-06 19:37:02.000000000 +0200
-+++ ./kmymoney2/widgets/Makefile.am	2013-07-28 18:58:51.406093917 +0200
-@@ -7,14 +7,14 @@
- libwidgets_a_METASOURCES = AUTO
- 
- libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
--transactionsortoption.cpp transactionsortoption.ui \
-+transactionsortoption.ui \
- selectedtransaction.cpp
- 
- #libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \
- #register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \
- #transactionsortoption.ui
- 
--EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
-+EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
- 
- # include the widgets that are available to 3rd party sw (e.g. plugins or
- # Qt designer) here
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
deleted file mode 100644
index ce17fff0b..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ /dev/null
@@ -1,268 +0,0 @@
-# Default version for this component
-%define tde_pkg kmymoney
-%define tde_version 3.5.13.2
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-%if 0%{?suse_version}
-%define qt3pluginsdir /usr/lib/qt3/plugins
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		personal finance manager for TDE
-
-Version:		1.0.5
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kmymoneytitlelabel.png
-
-# [kmymoney] Fix FTBFS
-Patch1:		kmymoney-3.5.13.2-ftbfs.patch
-
-# [admin] Fix automake 1.13 build issue
-Patch2:			admin-fix-parallel-test.diff
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4:		kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	recode
-BuildRequires:	libofx-devel
-
-# OPENSP support
-%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}osp-devel
-%else
-BuildRequires:	%{_lib}OpenSP5-devel
-%endif
-%else
-BuildRequires:	opensp-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	opensp-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	openjade-devel
-%endif
-
-Requires:		%{name}-common == %{version}-%{release}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary:		KMyMoney architecture independent files
-Group:			Applications/Utilities
-Requires:		%{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary:		KMyMoney development files
-Group:			Development/Libraries
-Requires:		%{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-%patch2 -p1 -b .automake113
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR="%{tde_prefix}"
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS="%{_libdir}/qt3/plugins"
-%endif
-
-# Fix strange FTBFS on RHEL4
-%if 0%{?rhel} == 4
-grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
-%endif
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --disable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kmymoney2
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%changelog
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.spec
deleted file mode 100644
index dfe995a5f..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.spec
+++ /dev/null
@@ -1,278 +0,0 @@
-# Default version for this component
-%define kdecomp kmymoney
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define qt3pluginsdir %{_libdir}/qt3/plugins
-%else
-%define qt3pluginsdir %{_libdir}/qt-3.3/plugins
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	personal finance manager for TDE
-
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kmymoneytitlelabel.png
-Patch0:		kmymoney-3.5.13-recode_ftbfs.patch
-
-# TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
-Patch1:		kmymoney-3.5.13-lots_of_crash.patch
-
-# TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713
-Patch2:		kmymoney-3.5.13-update_to_1.0.5.patch
-
-# [kmymoney] Fix compilation with GCC 4.7 [Bug #958]
-Patch3:		kmymoney-3.5.13-fix_gcc47_compilation.patch
-
-# [kmymoney] Missing LDFLAGS causing FTBFS
-Patch4:		kmymoney-3.5.13-missing_ldflags.patch
-
-# [kmymoney] Fix QT3 plugins directory location
-Patch5:		kmymoney-3.5.13-fix_qt3_plugins_location.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: recode
-BuildRequires: html2ps
-BuildRequires: libofx-devel
-
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}OpenSP5-devel
-%else
-BuildRequires: opensp-devel
-%endif
-
-Requires:		%{name}-common == %{version}
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-
-%package common
-Summary:	KMyMoney architecture independent files
-Group:		Applications/Utilities
-Requires:	%{name} == %{version}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-
-%package devel
-Summary:	KMyMoney development files
-Group:		Development/Libraries
-Requires:	%{name} == %{version}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%patch5 -p1 -b .qtpluginsdir
-%endif
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure \
-  --enable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --enable-sqlite3
-
-# Fix FTBFS inside sqlite3 archive
-patch -p1 < %{PATCH4}
-
-%__make %{?_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-# Required to find the QT3 plugins directory
-%if 0%{?mgaversion} || 0%{?mdkversion}
-export QTPLUGINS=%{_libdir}/qt3/plugins
-%endif
-
-%__make install DESTDIR=%{buildroot}
-
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-	  if [ -d $lang_dir ]; then
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-		# replace absolute symlinks with relative ones
-		pushd $lang_dir
-		  for i in *; do
-			[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-		  done
-		popd
-	  fi
-	done
-fi
-
-%find_lang kmymoney2
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-for f in hicolor locolor Tango oxygen; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/html/
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
-%{tde_datadir}/apps/kmymoney2/pics/*.png
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
-%{tde_datadir}/apps/kmymoney2/tips
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/*.h
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{qt3pluginsdir}/sqldrivers/libsqlite3*.so
-%{qt3pluginsdir}/designer/libkmymoney.so
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Updates to upstream 1.0.5
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/knemo/knemo-3.5.13.1.spec b/redhat/applications/knemo/knemo-3.5.13.1.spec
deleted file mode 100644
index 4072c693b..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.1.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-# Default version for this component
-%define kdecomp knemo
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	network interfaces monitor for the Trinity systray
-Version:	0.4.8
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec
deleted file mode 100644
index efdd7ccfc..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.2.spec
+++ /dev/null
@@ -1,136 +0,0 @@
-# Default version for this component
-%define tde_pkg knemo
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		network interfaces monitor for the Trinity systray
-Version:		0.4.8
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://beta.smileaf.org/projects
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-%if 0%{?fedora} >= 18
-BuildRequires:	net-tools
-%endif
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%changelog
diff --git a/redhat/applications/knemo/knemo-3.5.13.spec b/redhat/applications/knemo/knemo-3.5.13.spec
deleted file mode 100644
index b316cf6b5..000000000
--- a/redhat/applications/knemo/knemo-3.5.13.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp knemo
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	network interfaces monitor for the Trinity systray
-Version:	0.4.8
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/eventsrc
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.1.spec b/redhat/applications/knetload/knetload-3.5.13.1.spec
deleted file mode 100644
index 0dc01dc02..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.1.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp knetload
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a network meter for Kicker [Trinity]
-Version:	2.3
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the KDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec
deleted file mode 100644
index f61799be5..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.2.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define tde_pkg knetload
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		a network meter for Kicker [Trinity]
-Version:		2.3
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the TDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%changelog
diff --git a/redhat/applications/knetload/knetload-3.5.13.spec b/redhat/applications/knetload/knetload-3.5.13.spec
deleted file mode 100644
index 0d4293016..000000000
--- a/redhat/applications/knetload/knetload-3.5.13.spec
+++ /dev/null
@@ -1,136 +0,0 @@
-# Default version for this component
-%define kdecomp knetload
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	a network meter for Kicker [Trinity]
-Version:	2.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KNetLoad is a small network meter for Kicker (the KDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.1.spec b/redhat/applications/knetstats/knetstats-3.5.13.1.spec
deleted file mode 100644
index 0d12ef070..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.1.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define kdecomp knetstats
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	network interfaces monitor for the Trinity systray
-Version:	1.6.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-A simple KDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec
deleted file mode 100644
index d38b4db5c..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec
+++ /dev/null
@@ -1,123 +0,0 @@
-# Default version for this component
-%define tde_pkg knetstats
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		network interfaces monitor for the Trinity systray
-Version:		1.6.1
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-A simple TDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%changelog
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.spec b/redhat/applications/knetstats/knetstats-3.5.13.spec
deleted file mode 100644
index 17a63d2bf..000000000
--- a/redhat/applications/knetstats/knetstats-3.5.13.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define kdecomp knetstats
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	network interfaces monitor for the Trinity systray
-Version:	1.6.1
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-A simple KDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
deleted file mode 100644
index 175d299e7..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI	2011-11-11 15:06:49.854247242 -0500
-+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt	2011-11-11 15:06:58.662060747 -0500
-@@ -18,6 +18,7 @@
-   ${CMAKE_BINARY_DIR}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${DBUS_TQT_INCLUDE_DIRS}
-   ${NM_UTIL_INCLUDE_DIRS}
- )
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
deleted file mode 100644
index 9db3ab5de..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- knetworkmanager9/CMakeLists.txt.ORI	2011-11-11 13:36:01.462536187 -0500
-+++ knetworkmanager9/CMakeLists.txt	2011-11-11 13:36:10.762446937 -0500
-@@ -63,7 +63,7 @@
- 
- ##### source directories ########################
- 
--add_subdirectory( knetworkmanager-0.8 )
-+add_subdirectory( knetworkmanager-0.9 )
- 
- 
- ##### write configure files #####################
---- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI	2011-11-11 13:39:32.866229477 -0500
-+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt	2011-11-11 13:39:48.169042904 -0500
-@@ -18,7 +18,7 @@
- 
- ##### knm_dbus (static) #########################
- 
--set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
-+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" )
- 
- # options:
- #  p - generate proxy files
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
deleted file mode 100644
index ad10145cf..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:45:47.964680619 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp	2011-11-11 20:51:32.689072955 +0100
-@@ -432,14 +432,15 @@
- 	, _wireless_setting(wireless_setting)
- {
- 	txtPSK->setText(_security_setting->getPSK());
--	connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&)));
-+	connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged()));
- }
- 
- void
--WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
-+WirelessSecurityWPAPSKImpl::slotPSKChanged()
- {
- 	if (_wireless_setting)
- 	{
-+		TQString psk = txtPSK->text();
- 		_security_setting->setPSK(psk);
- 	}
- }
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:45:47.962680657 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h	2011-11-11 20:46:21.640030856 +0100
-@@ -145,7 +145,7 @@
- 			TQCString String2Hex(TQByteArray bytes, int final_len) const;
- 
- 		public slots:
--			void slotPSKChanged(const TQString&);
-+			void slotPSKChanged();
- 
- 		private:
- 			WirelessSecurity* _security_setting;
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
deleted file mode 100644
index 38e901008..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{kdecomp}
-Version:		%{?version}
-Release:	4%{?dist}%{?_variant}
-
-Summary:        Trinity applet for Network Manager
-
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0:		%{kdecomp}9-3.5.13.tar.gz
-%else
-Source0:		%{kdecomp}8-3.5.13.tar.gz
-%endif
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
-%endif
-
-BuildRequires:	dbus-1-tqt-devel
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	NetworkManager-glib-devel
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep 
-%if "%{?version}" == "0.9"
-%setup -q -n %{kdecomp}-3.5.13.19
-%else
-%setup -q -n applications/knetworkmanager8
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
deleted file mode 100644
index b51395370..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{kdecomp}
-Version:		%{?version}
-Release:		3%{?dist}%{?_variant}
-
-Summary:        Trinity applet for Network Manager
-
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0:		%{kdecomp}9-3.5.13.tar.gz
-%else
-Source0:		%{kdecomp}8-3.5.13.tar.gz
-%endif
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-Patch1:			knetworkmanager-3.5.13-wpa_passphrase_lag.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
-%endif
-
-BuildRequires:	dbus-1-tqt-devel
-BuildRequires:	dbus-tqt-devel
-BuildRequires:	NetworkManager-glib-devel
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%prep 
-%if "%{?version}" == "0.9"
-%setup -q -n applications/%{kdecomp}9
-%else
-%setup -q -n applications/%{kdecomp}8
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-#patch1 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
deleted file mode 100644
index 0ada2aed4..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
+++ /dev/null
@@ -1,179 +0,0 @@
-# Default version for this component
-%define tde_pkg knetworkmanager8
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Version:		0.8
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-Summary:		Trinity applet for Network Manager
-
-Group:			Applications/Internet
-License:		GPLv2+
-URL:			http://en.opensuse.org/Projects/KNetworkManager
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
-
-# NETWORKMANAGER support
-%if 0%{?rhel} || 0%{?fedora}
-Requires:		NetworkManager-gnome
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires:		networkmanager
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	NetworkManager-glib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	NetworkManager-devel
-Requires:		NetworkManager
-%endif
-
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:		Common data shared among the MySQL GUI Suites
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep 
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%post devel
-/sbin/ldconfig
-
-
-%postun devel
-/sbin/ldconfig
-
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
diff --git a/redhat/applications/knights/knights-3.5.13.1.spec b/redhat/applications/knights/knights-3.5.13.1.spec
deleted file mode 100644
index bba7572b4..000000000
--- a/redhat/applications/knights/knights-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp knights
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A chess interface for the K Desktop Environment [Trinity]
-Version:	0.6
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec
deleted file mode 100644
index 523111ac8..000000000
--- a/redhat/applications/knights/knights-3.5.13.2.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define tde_pkg knights
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		A chess interface for the K Desktop Environment [Trinity]
-Version:		0.6
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Amusements/Games
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%changelog
diff --git a/redhat/applications/knights/knights-3.5.13.spec b/redhat/applications/knights/knights-3.5.13.spec
deleted file mode 100644
index 0ce527693..000000000
--- a/redhat/applications/knights/knights-3.5.13.spec
+++ /dev/null
@@ -1,137 +0,0 @@
-# Default version for this component
-%define kdecomp knights
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A chess interface for the K Desktop Environment [Trinity]
-Version:	0.6
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_datadir}/applnk/Games/Board/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
-- Rebuild for Fedora 17
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.1.spec b/redhat/applications/knowit/knowit-3.5.13.1.spec
deleted file mode 100644
index 6fb781e27..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.1.spec
+++ /dev/null
@@ -1,142 +0,0 @@
-# Default version for this component
-%define kdecomp knowit
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Tool for managing notes [Trinity]
-Version:	0.10
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but KDE-based, and requires Trinity.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec
deleted file mode 100644
index 00791f091..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.2.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define tde_pkg knowit
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Tool for managing notes [Trinity]
-Version:		0.10
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but TDE-based, and requires Trinity.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{tde_pkg}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%changelog
diff --git a/redhat/applications/knowit/knowit-3.5.13.spec b/redhat/applications/knowit/knowit-3.5.13.spec
deleted file mode 100644
index b76bc64db..000000000
--- a/redhat/applications/knowit/knowit-3.5.13.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp knowit
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Tool for managing notes [Trinity]
-Version:	0.10
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but KDE-based, and requires Trinity.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__mkdir_p %{buildroot}%{tde_tdeappdir}
-%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop
-%__rm -r %{buildroot}%{tde_datadir}/applnk
-
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/knowitui.rc
-%{tde_datadir}/apps/knowit/tips
-%{tde_tdedocdir}/HTML/en/knowit/common
-%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/knowit/index.docbook
-%{tde_tdedocdir}/HTML/en/knowit/screenshot.png
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.1.spec b/redhat/applications/knutclient/knutclient-3.5.13.1.spec
deleted file mode 100644
index e10e2a487..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.1.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-# Default version for this component
-%define kdecomp knutclient
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version:	0.9.5
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.knut.noveradsl.cz/knutclient/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec
deleted file mode 100644
index 016bb891e..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define tde_pkg knutclient
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version:		0.9.5
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.knut.noveradsl.cz/knutclient/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%changelog
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.spec b/redhat/applications/knutclient/knutclient-3.5.13.spec
deleted file mode 100644
index 989670893..000000000
--- a/redhat/applications/knutclient/knutclient-3.5.13.spec
+++ /dev/null
@@ -1,133 +0,0 @@
-# Default version for this component
-%define kdecomp knutclient
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Version:	0.9.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.knut.noveradsl.cz/knutclient/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/knutclient
-%{tde_datadir}/applnk/Utilities/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec
deleted file mode 100644
index 5ce586eb3..000000000
--- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec
+++ /dev/null
@@ -1,1086 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?KDE_LANGS}" == ""
-%define KDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
-%endif
-
-
-Name:		trinity-koffice-i18n
-Summary:	Internationalization support for Trinity
-Version:	1.6.3
-Release:	2%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:	GFDL
-Group:		User Interface/Desktops
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:	koffice-i18n-3.5.13.1.tar.gz
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-
-%description
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for TDE
-Group: User Interface/Desktops
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-%description Basque
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for TDE
-Group: User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-%description Japanese
-%{summary}.
-
-%package Khmer
-Summary: Khmer(km) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-km = %{version}-%{release}
-%description Khmer
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-%description Macedonian
-%{summary}.
-
-%package Malay
-Summary: Malay(ms) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ms = %{version}-%{release}
-%description Malay
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-%description Maltese
-%{summary}.
-
-%package LowSaxon
-Summary: Low Saxon (nds) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nds = %{version}-%{release}
-%description LowSaxon
-%{summary}.
-
-%package Nepali
-Summary: Nepali(ne) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ne = %{version}-%{release}
-%description Nepali
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for TDE
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n koffice-i18n-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-for l in %{KDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      autoreconf -fiv
-      %__make -f ../admin/Makefile.common
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{KDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# make symlinks relative
-%if "%{tde_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_tdedocdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%lang(af) %{tde_datadir}/locale/af/*
-%endif
-
-%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%lang(ar) %{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%lang(az) %{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%lang(be) %{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%lang(bg) %{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%lang(bn) %{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%lang(bo) %{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%lang(br) %{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%lang(bs) %{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%lang(ca) %{tde_datadir}/locale/ca/*
-%lang(ca) %{tde_tdedocdir}/HTML/ca/
-%lang(ca) %{tde_datadir}/apps/koffice/autocorrect/ca.xml
-%endif
-
-%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%lang(cs) %{tde_datadir}/locale/cs/*
-%lang(cs) %{tde_datadir}/apps/koffice/autocorrect/cs.xml
-%endif
-
-%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%lang(cy) %{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%lang(da) %{tde_datadir}/locale/da/*
-%lang(da) %{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%lang(de) %{tde_datadir}/locale/de/*
-%lang(de) %{tde_tdedocdir}/HTML/de/
-%lang(de) %{tde_datadir}/apps/koffice/autocorrect/de.xml
-%endif
-
-%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%lang(el) %{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%lang(en_GB) %{tde_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%lang(eo) %{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%lang(es) %{tde_datadir}/locale/es/*
-%lang(es) %{tde_tdedocdir}/HTML/es/
-%lang(es) %{tde_datadir}/apps/koffice/autocorrect/es.xml
-%endif
-
-%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%lang(et) %{tde_datadir}/locale/et/*
-%lang(et) %{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%lang(eu) %{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%lang(fa) %{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%lang(fi) %{tde_datadir}/locale/fi/*
-%endif
-
-%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%lang(fo) %{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%lang(fr) %{tde_datadir}/locale/fr/*
-%lang(fr) %{tde_tdedocdir}/HTML/fr/
-%lang(fr) %{tde_datadir}/apps/koffice/autocorrect/fr.xml
-%endif
-
-%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%lang(fy) %{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%lang(ga) %{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%lang(gl) %{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%lang(he) %{tde_datadir}/locale/he/*
-%endif
-
-%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%lang(hi) %{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%lang(hr) %{tde_datadir}/locale/hr/*
-%endif
-
-%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%lang(hu) %{tde_datadir}/locale/hu/*
-%lang(hu) %{tde_datadir}/apps/koffice/autocorrect/hu.xml
-%endif
-
-%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%lang(id) %{tde_datadir}/locale/id/*
-%endif
-
-%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%lang(is) %{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%lang(it) %{tde_datadir}/locale/it/*
-%lang(it) %{tde_tdedocdir}/HTML/it/
-%lang(it) %{tde_datadir}/apps/koffice/autocorrect/it.xml
-%endif
-
-%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%lang(ja) %{tde_datadir}/locale/ja/*
-%endif
-
-%if "%( grep -w km <<< '%{KDE_LANGS}' )" != ""
-%files Khmer
-%defattr(-,root,root,-)
-%lang(km) %{tde_datadir}/locale/km/*
-%endif
-
-%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%lang(ko) %{tde_datadir}/locale/ko/*
-%endif
-
-%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%lang(ku) %{tde_datadir}/locale/ku/*
-%endif
-
-%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%lang(lo) %{tde_datadir}/locale/lo/*
-%endif
-
-%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%lang(lt) %{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%lang(lv) %{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%lang(mi) %{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%lang(mk) %{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w ms <<< '%{KDE_LANGS}' )" != ""
-%files Malay
-%defattr(-,root,root,-)
-%lang(ms) %{tde_datadir}/locale/ms/*
-%endif
-
-%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%lang(mt) %{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nds <<< '%{KDE_LANGS}' )" != ""
-%files LowSaxon
-%defattr(-,root,root,-)
-%lang(nds) %{tde_datadir}/locale/nds/*
-%endif
-
-%if "%( grep -w ne <<< '%{KDE_LANGS}' )" != ""
-%files Nepali
-%defattr(-,root,root,-)
-%lang(ne) %{tde_datadir}/locale/ne/*
-%endif
-
-%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%lang(nl) %{tde_datadir}/locale/nl/*
-%lang(nl) %{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%lang(nb) %{tde_datadir}/locale/nb/*
-%endif
-
-%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%lang(nn) %{tde_datadir}/locale/nn/*
-%endif
-
-%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%lang(oc) %{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%lang(pa) %{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%lang(pl) %{tde_datadir}/locale/pl/*
-%endif
-
-%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%lang(pt) %{tde_datadir}/locale/pt/*
-%lang(pt) %{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%lang(ro) %{tde_datadir}/locale/ro/*
-%endif
-
-%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%lang(ru) %{tde_datadir}/locale/ru/*
-%lang(ru) %{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%lang(sk) %{tde_datadir}/locale/sk/*
-%lang(sk) %{tde_tdedocdir}/HTML/sk/
-%lang(sk) %{tde_datadir}/apps/koffice/autocorrect/sk.xml
-%endif
-
-%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%lang(sl) %{tde_datadir}/locale/sl/*
-%lang(sl) %{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%lang(sr) %{tde_datadir}/locale/sr/*
-%endif
-
-%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%lang(sv) %{tde_datadir}/locale/sv/*
-%lang(sv) %{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%lang(ta) %{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%lang(tg) %{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%lang(th) %{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%lang(tr) %{tde_datadir}/locale/tr/*
-%endif
-
-%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%lang(uk) %{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%lang(ven) %{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%lang(vi) %{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%lang(wa) %{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%lang(xh) %{tde_datadir}/locale/xh/*
-%endif
-
-%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
-%endif
-
-%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
-%endif
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for TDE 3.5.13
-
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
deleted file mode 100644
index 88a4619fb..000000000
--- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,1045 +0,0 @@
-# Default version for this component
-%define tde_pkg koffice-i18n
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
-%endif
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Internationalization support for Koffice [Trinity]
-Version:		1.6.3
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:		GFDL
-Group:			User Interface/Desktops
-BuildArch:		noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	autoconf automake libtool m4
-
-%description
-%{summary}.
-
-%package Bulgarian
-Summary:		Bulgarian(bg) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary:		Bengali(bn) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary:		Tibetan(bo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary:		Breton(br) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary:		Bosnian(bs) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary:		Catalan(ca) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary:		Czech(cs) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary:		Cymraeg language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary:		Welsh(cy) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary:		Danish(da) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-%description Danish
-%{summary}.
-
-%package German
-Summary:		German(de) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-%description German
-%{summary}.
-
-%package Greek
-Summary:		Greek(el) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-%description Greek
-%{summary}.
-
-%package British
-Summary:		British(en_GB) English support for TDE
-Group:			User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-%description British
-%{summary}.
-
-%package Esperanto
-Summary:		Esperanto(eo) support for TDE
-Group:			User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary:		Spanish(es) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary:		Estonian(et) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary:		Basque(eu) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-%description Basque
-%{summary}.
-
-%package Finnish
-Summary:		Finnish(fi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary:		Faroese(fo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-%description Faroese
-%{summary}.
-
-%package French
-Summary:		French(fr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary:		Frisian(fy) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary:		Irish(ga) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-%description Irish
-%{summary}.
-
-%package Galician
-Summary:		Galician(gl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary:		Hebrew(he) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary:		Hindi(hi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary:		Croatian(hr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary:		Hungarian(hu) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary:		Indonesian(id) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary:		Icelandic(is) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary:		Italian(it) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary:		Japanese(ja) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-%description Japanese
-%{summary}.
-
-%package Khmer
-Summary:		Khmer(km) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-km = %{version}-%{release}
-%description Khmer
-%{summary}.
-
-%package Korean
-Summary:		Korean(ko) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary:		Kurdish(ku) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary:		Lao(lo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary:		Lithuanian(lt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary:		Latvian(lv) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary:		Maori(mi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary:		Macedonian(mk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-%description Macedonian
-%{summary}.
-
-%package Malay
-Summary:		Malay(ms) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ms = %{version}-%{release}
-%description Malay
-%{summary}.
-
-%package Maltese
-Summary:		Maltese(mt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-%description Maltese
-%{summary}.
-
-%package LowSaxon
-Summary:		Low Saxon (nds) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nds = %{version}-%{release}
-%description LowSaxon
-%{summary}.
-
-%package Nepali
-Summary:		Nepali(ne) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ne = %{version}-%{release}
-%description Nepali
-%{summary}.
-
-%package Dutch
-Summary:		Dutch(nl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary:		Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary:		Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary:		Occitan(oc) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary:		Polish(pl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary:		Portuguese(pt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary:		Punjabi(pa) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary:		Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary:		Romanian(ro) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary:		Russian(ru) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary:		Slovak(sk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary:		Slovenian(sl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary:		Serbian(sr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary:		Swedish(sv) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary:		Tamil(ta) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary:		Tajik(tg) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary:		Thai(th) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary:		Turkish(tr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary:		Ukrainian(uk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary:		Venda(ven) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary:		Vietnamese(vi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary:		Walloon(wa) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary:		Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary:		Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary:		Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/*
-%endif
-
-%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/*
-%{tde_tdedocdir}/HTML/ca/
-%{tde_datadir}/apps/koffice/autocorrect/ca.xml
-%endif
-
-%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/*
-%{tde_datadir}/apps/koffice/autocorrect/cs.xml
-%endif
-
-%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/*
-%{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/*
-%{tde_tdedocdir}/HTML/de/
-%{tde_datadir}/apps/koffice/autocorrect/de.xml
-%endif
-
-%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/*
-%{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/*
-%{tde_tdedocdir}/HTML/es/
-%{tde_datadir}/apps/koffice/autocorrect/es.xml
-%endif
-
-%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/*
-%{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/*
-%endif
-
-%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/*
-%{tde_tdedocdir}/HTML/fr/
-%{tde_datadir}/apps/koffice/autocorrect/fr.xml
-%endif
-
-%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/*
-%endif
-
-%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/*
-%endif
-
-%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/*
-%{tde_datadir}/apps/koffice/autocorrect/hu.xml
-%endif
-
-%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/id/*
-%endif
-
-%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/*
-%{tde_tdedocdir}/HTML/it/
-%{tde_datadir}/apps/koffice/autocorrect/it.xml
-%endif
-
-%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/*
-%endif
-
-%if "%( grep -w km <<< '%{TDE_LANGS}' )" != ""
-%files Khmer
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/km/*
-%endif
-
-%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/*
-%endif
-
-%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ku/*
-%endif
-
-%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lo/*
-%endif
-
-%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != ""
-%files Malay
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ms/*
-%endif
-
-%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != ""
-%files LowSaxon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nds/*
-%endif
-
-%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != ""
-%files Nepali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ne/*
-%endif
-
-%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/*
-%{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/*
-%endif
-
-%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/*
-%endif
-
-%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/*
-%endif
-
-%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/*
-%{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/*
-%{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/*
-%endif
-
-%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/*
-%{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/*
-%{tde_tdedocdir}/HTML/sk/
-%{tde_datadir}/apps/koffice/autocorrect/sk.xml
-%endif
-
-%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/*
-%{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/*
-%endif
-
-%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/*
-%{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/*
-%endif
-
-%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/xh/*
-%endif
-
-%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/*
-%endif
-
-%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/*
-%endif
-
-
-%changelog
diff --git a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec b/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec
deleted file mode 100644
index 043e71331..000000000
--- a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec
+++ /dev/null
@@ -1,1090 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?KDE_LANGS}" == ""
-#define KDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
-%define KDE_LANGS fr
-%endif
-
-
-Name:		trinity-koffice-i18n
-Summary:	Internationalization support for Trinity
-Version:	1.6.3
-Release:	1%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-License:	GFDL
-Group:		User Interface/Desktops
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:	koffice-l10n_1.6.3.orig.tar.gz
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-
-%description
-%{summary}.
-
-%package Bulgarian
-Summary: Bulgarian(bg) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bg = %{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary: Bengali(bn) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bn = %{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary: Tibetan(bo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bo = %{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary: Breton(br) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-br = %{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary: Bosnian(bs) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-bs = %{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary: Catalan(ca) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ca = %{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary: Czech(cs) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-cs = %{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary: Cymraeg language support for KDE3
-Group: User Interface/Desktops
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary: Welsh(cy) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-cy = %{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary: Danish(da) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-da = %{version}-%{release}
-#Requires: kde-filesystem
-%description Danish
-%{summary}.
-
-%package German
-Summary: German(de) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-de = %{version}-%{release}
-#Requires: kde-filesystem
-%description German
-%{summary}.
-
-%package Greek
-Summary: Greek(el) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-el = %{version}-%{release}
-#Requires: kde-filesystem
-%description Greek
-%{summary}.
-
-%package British
-Summary: British(en_GB) English support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-en_GB = %{version}-%{release}
-#Requires: kde-filesystem
-%description British
-%{summary}.
-
-%package Esperanto
-Summary: Esperanto(eo) support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-eo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary: Spanish(es) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-es = %{version}-%{release}
-#Requires: kde-filesystem
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary: Estonian(et) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-et = %{version}-%{release}
-#Requires: kde-filesystem
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary: Basque(eu) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-eu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Basque
-%{summary}.
-
-%package Farsi
-Summary: Farsi(fa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Farsi
-%{summary}.
-
-%package Finnish
-Summary: Finnish(fi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary: Faroese(fo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Faroese
-%{summary}.
-
-%package French
-Summary: French(fr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fr = %{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary: Frisian(fy) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-fy = %{version}-%{release}
-#Requires: kde-filesystem
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary: Irish(ga) language support for KDE3
-Group: User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{version}
-Provides: %{name}-ga = %{version}-%{release}
-#Requires: kde-filesystem
-%description Irish
-%{summary}.
-
-%package Galician
-Summary: Galician(gl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-gl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary: Hebrew(he) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-he = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary: Hindi(hi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary: Croatian(hr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary: Hungarian(hu) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-hu = %{version}-%{release}
-#Requires: kde-filesystem
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary: Indonesian(id) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-id = %{version}-%{release}
-#Requires: kde-filesystem
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary: Icelandic(is) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-is = %{version}-%{release}
-#Requires: kde-filesystem
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary: Italian(it) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-it = %{version}-%{release}
-#Requires: kde-filesystem
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary: Japanese(ja) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ja = %{version}-%{release}
-#Requires: kde-filesystem
-%description Japanese
-%{summary}.
-
-%package Korean
-Summary: Korean(ko) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ko = %{version}-%{release}
-#Requires: kde-filesystem
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary: Kurdish(ku) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ku = %{version}-%{release}
-#Requires: kde-filesystem
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary: Lao(lo) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lo = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary: Lithuanian(lt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary: Latvian(lv) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-lv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary: Maori(mi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary: Macedonian(mk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Macedonian
-%{summary}.
-
-%package Maltese
-Summary: Maltese(mt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-mt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Maltese
-%{summary}.
-
-%package Dutch
-Summary: Dutch(nl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-nl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary: Norwegian(no) (Bokmaal) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-no = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary: Norwegian(nn) (Nynorsk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-nn = %{version}-%{release}
-#Requires: kde-filesystem
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary: Occitan(oc) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-oc = %{version}-%{release}
-#Requires: kde-filesystem
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary: Polish(pl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary: Portuguese(pt) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pt = %{version}-%{release}
-#Requires: kde-filesystem
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary: Punjabi(pa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary: Brazil(pt_BR) Portuguese language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-pt_BR = %{version}-%{release}
-#Requires: kde-filesystem
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary: Romanian(ro) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ro = %{version}-%{release}
-#Requires: kde-filesystem
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary: Russian(ru) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ru = %{version}-%{release}
-#Requires: kde-filesystem
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary: Slovak(sk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary: Slovenian(sl) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sl = %{version}-%{release}
-#Requires: kde-filesystem
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary: Serbian(sr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary: Swedish(sv) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-sv = %{version}-%{release}
-#Requires: kde-filesystem
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary: Tamil(ta) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ta = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary: Tajik(tg) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tg = %{version}-%{release}
-#Requires: kde-filesystem
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary: Thai(th) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-th = %{version}-%{release}
-#Requires: kde-filesystem
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary: Turkish(tr) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tr = %{version}-%{release}
-#Requires: kde-filesystem
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary: Ukrainian(uk) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-uk = %{version}-%{release}
-#Requires: kde-filesystem
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary: Venda(ven) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-ven = %{version}-%{release}
-#Requires: kde-filesystem
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary: Vietnamese(vi) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-vi = %{version}-%{release}
-#Requires: kde-filesystem
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary: Walloon(wa) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-wa = %{version}-%{release}
-#Requires: kde-filesystem
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary: Xhosa(xh) (a Bantu language) support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-xh = %{version}-%{release}
-#Requires: kde-filesystem
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary: Chinese(zh_CN) (Simplified Chinese) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-zh_CN = %{version}-%{release}
-#Requires: kde-filesystem
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary: Chinese(zh_TW) (Big5) language support for KDE3
-Group: User Interface/Desktops
-Provides: %{name}-tz_TW = %{version}-%{release}
-#Requires: kde-filesystem
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n koffice-l10n-%{version}
-
-for l in %{KDE_LANGS}; do
-  for f in koffice-l10n-${l}-*.tar.bz2; do
-    tar xjf "${f}"
-  done
-done
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-export kde_htmldir="%{tde_docdir}/HTML"
-
-for l in %{KDE_LANGS}; do
-  for f in koffice-l10n-${l}-*/; do
-    if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then 
-      pushd ${f}
-      %configure
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{_bindir}:${PATH}"
-
-for l in %{KDE_LANGS}; do
-  for f in koffice-l10n-${l}-*/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# make symlinks relative
-%if "%{_prefix}" == "/usr"
-pushd "%{buildroot}%{tde_docdir}/HTML"
-for lang in *; do
-  if [ -d "$lang" ]; then
-    pushd "$lang"
-    for i in */*/*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../../docs/common $i
-      fi
-    done
-
-    for i in */*; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../../docs/common $i
-      fi
-    done
-
-    for i in *; do
-      if [ -d $i -a -L $i/common ]; then
-        rm -f $i/common
-        ln -sf ../docs/common $i
-      fi
-    done
-
-    popd
-  fi
-done
-popd   
-%endif
-
-# remove zero-length file
-find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%lang(af) %{_datadir}/locale/af/*
-%lang(af) %{tde_docdir}/HTML/af/
-%endif
-
-%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%lang(ar) %{_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%lang(az) %{_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%lang(be) %{_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%lang(bg) %{_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%lang(bn) %{_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%lang(bo) %{_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%lang(br) %{_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%lang(bs) %{_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%lang(ca) %{_datadir}/locale/ca/*
-%lang(ca) %{tde_docdir}/HTML/ca/
-%endif
-
-%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/*
-%lang(cs) %{tde_docdir}/HTML/cs/
-%endif
-
-%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%lang(cy) %{_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%lang(da) %{_datadir}/locale/da/*
-%lang(da) %{tde_docdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%lang(de) %{_datadir}/locale/de/*
-%lang(de) %{tde_docdir}/HTML/de/
-%endif
-
-%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%lang(el) %{_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%lang(en_GB) %{_datadir}/locale/en_GB/*
-%lang(en_GB) %{tde_docdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%lang(es) %{_datadir}/locale/es/*
-%lang(es) %{tde_docdir}/HTML/es/
-%endif
-
-%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%lang(et) %{_datadir}/locale/et/*
-%lang(et) %{tde_docdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%lang(eu) %{_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%lang(fa) %{_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%lang(fi) %{_datadir}/locale/fi/*
-%lang(fi) %{tde_docdir}/HTML/fi/
-%endif
-
-%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%lang(fo) %{_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%lang(fr) %{_datadir}/locale/fr/*
-%lang(fr) %{tde_docdir}/HTML/fr/
-%lang(fr) %{_datadir}/apps/koffice/autocorrect/fr.xml
-%endif
-
-%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%lang(fy) %{_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%lang(ga) %{_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%lang(gl) %{_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/*
-%lang(he) %{tde_docdir}/HTML/he/
-%endif
-
-%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%lang(hr) %{_datadir}/locale/hr/*
-%lang(hr) %{tde_docdir}/HTML/hr/
-%endif
-
-%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%lang(hu) %{_datadir}/locale/hu/*
-%lang(hu) %{tde_docdir}/HTML/hu/
-%endif
-
-%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%lang(id) %{_datadir}/locale/id/*
-%lang(id) %{tde_docdir}/HTML/id/
-%endif
-
-%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%lang(is) %{_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%lang(it) %{_datadir}/locale/it/*
-%lang(it) %{tde_docdir}/HTML/it/
-%endif
-
-%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%lang(ja) %{_datadir}/locale/ja/*
-%lang(ja) %{tde_docdir}/HTML/ja/
-%endif
-
-%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%lang(ko) %{_datadir}/locale/ko/*
-%lang(ko) %{tde_docdir}/HTML/ko/
-%endif
-
-%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%lang(ku) %{_datadir}/locale/ku/*
-%lang(ku) %{tde_docdir}/HTML/ku/
-%endif
-
-%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%lang(lo) %{_datadir}/locale/lo/*
-%lang(lo) %{tde_docdir}/HTML/lo/
-%endif
-
-%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%lang(lt) %{_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%lang(mi) %{_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%lang(mk) %{_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%lang(mt) %{_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%lang(nl) %{_datadir}/locale/nl/*
-%lang(nl) %{tde_docdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%lang(nb) %{_datadir}/locale/nb/*
-#%lang(nb) %{tde_docdir}/HTML/nb/
-%endif
-
-%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%lang(nn) %{_datadir}/locale/nn/*
-#%lang(nn) %{tde_docdir}/HTML/nn/
-%endif
-
-%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%lang(oc) %{_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%lang(pa) %{_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%lang(pl) %{_datadir}/locale/pl/*
-%lang(pl) %{tde_docdir}/HTML/pl/
-%endif
-
-%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%lang(pt) %{_datadir}/locale/pt/*
-%lang(pt) %{tde_docdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%lang(pt_BR) %{_datadir}/locale/pt_BR/*
-%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%lang(ro) %{_datadir}/locale/ro/*
-%lang(ro) %{tde_docdir}/HTML/ro/
-%endif
-
-%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%lang(ru) %{_datadir}/locale/ru/*
-%lang(ru) %{tde_docdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%lang(sk) %{_datadir}/locale/sk/*
-%lang(sk) %{tde_docdir}/HTML/sk/
-%endif
-
-%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%lang(sl) %{_datadir}/locale/sl/*
-%lang(sl) %{tde_docdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/*
-%lang(sr) %{tde_docdir}/HTML/sr/
-%endif
-
-%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%lang(sv) %{_datadir}/locale/sv/*
-%lang(sv) %{tde_docdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%lang(ta) %{_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%lang(tg) %{_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%lang(th) %{_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%lang(tr) %{_datadir}/locale/tr/*
-%lang(tr) %{tde_docdir}/HTML/tr/
-%endif
-
-%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%lang(uk) %{tde_docdir}/HTML/uk/
-%lang(uk) %{_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%lang(ven) %{_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%lang(vi) %{_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%lang(wa) %{_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%lang(xh) %{_datadir}/locale/xh/*
-%lang(xh) %{tde_docdir}/HTML/xh/
-%endif
-
-%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%lang(zh_CN) %{_datadir}/locale/zh_CN/*
-%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/
-%endif
-
-%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%lang(zh_TW) %{_datadir}/locale/zh_TW/*
-%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/
-%endif
-
-%changelog
-* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for TDE 3.5.13
-
diff --git a/redhat/applications/koffice/admin-fix-parallel-test.diff b/redhat/applications/koffice/admin-fix-parallel-test.diff
deleted file mode 100644
index 9f6f46ba8..000000000
--- a/redhat/applications/koffice/admin-fix-parallel-test.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113	2013-06-26 22:35:42.000000000 +0200
-+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh	2013-08-29 22:27:18.546349736 +0200
-@@ -123,7 +123,7 @@
- fi
- 
- echo "*** Creating Makefile templates"
--$AUTOMAKE || exit 1
-+$AUTOMAKE --add-missing || exit 1
- 
- if test "$UNSERMAKE" = no; then
-   echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch b/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
deleted file mode 100644
index 0be9764e3..000000000
--- a/redhat/applications/koffice/kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kexi/kexidb/drivers/sqlite/sqlitecursor.cpp	2006/10/26 19:25:03	599352
-+++ kexi/kexidb/drivers/sqlite/sqlitecursor.cpp	2007/10/01 19:29:39	719720
-@@ -324,19 +324,21 @@
- 	}
- 	
- 	//debug
--/*
--	if (m_result == FetchOK && d->curr_coldata) {
-+/*	if (((int)m_result == (int)FetchOK) && d->curr_coldata) {
- 		for (uint i=0;i<m_fieldCount;i++) {
- 			KexiDBDrvDbg<<"col."<< i<<": "<< d->curr_colname[i]<<" "<< d->curr_colname[m_fieldCount+i]
- 			<< " = " << (d->curr_coldata[i] ? TQString::fromLocal8Bit(d->curr_coldata[i]) : "(NULL)") <<endl;
- 		}
--//		KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl;
-+		KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl;
- 	}*/
- }
- 
- void SQLiteCursor::drv_appendCurrentRecordToBuffer()
- {
- //	KexiDBDrvDbg << "SQLiteCursor::drv_appendCurrentRecordToBuffer():" <<endl;
-+	if (!d->curr_coldata)
-+			return;
-+
- 	if (!d->cols_pointers_mem_size)
- 		d->cols_pointers_mem_size = m_fieldCount * sizeof(char*);
- 	const char **record = (const char**)malloc(d->cols_pointers_mem_size);
diff --git a/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch b/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch
deleted file mode 100644
index 7509946b2..000000000
--- a/redhat/applications/koffice/kexi-fix-support-for-boolean-types-in-migration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kexi/migration/pqxx/pqxxmigrate.cpp	2006/12/17 21:08:15	614463
-+++ kexi/migration/pqxx/pqxxmigrate.cpp	2008/04/30 09:54:43	802697
-@@ -538,10 +538,18 @@
-         int index = 0;
-         for ( i = R.begin(); i != end; ++i, index++) {
-              if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::BLOB || fieldsExpanded.at(index)->field->type()==KexiDB::Field::LongText)
-+	     {
-                   vals.append( KexiDB::pgsqlByteaToByteArray((*i).c_str(), (*i).size()) );
--             else
-+	     }
-+	     else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean )
-+	     {
-+	          vals.append(QString((*i).c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1));
-+	     }
-+	     else
-+	     {
-                   vals.append( KexiDB::cstringToVariant((*i).c_str(), 
-                     fieldsExpanded.at(index)->field, (*i).size()) );
-+	     }
-         }
-         if (!destConn->insertRecord(*dstTable, vals))
-              return false;
diff --git a/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch b/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch
deleted file mode 100644
index dd8ee6ae7..000000000
--- a/redhat/applications/koffice/kexi-fix-support-for-boolean-types.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2007/10/25 14:56:36	729302
-+++ kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008/04/30 09:54:43	802697
-@@ -236,12 +236,20 @@
- 		{
- 			return (*m_res)[at()][pos].as(double());
- 		}
-+		else if (f->type() == Field::Boolean )
-+		{
-+			return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1); 
-+		}
- 		else if (f->typeGroup() == Field::BLOBGroup)
- 		{
- //			pqxx::result::field r = (*m_res)[at()][pos];
- //			kdDebug() << r.name() << ", " << r.c_str() << ", " << r.type() << ", " << r.size() << endl;
- 			return ::pgsqlByteaToByteArray((*m_res)[at()][pos]);
- 		}
-+		else
-+		{
-+		  return pgsqlCStrToVariant((*m_res)[at()][pos]);
-+		}
- 	}
- 	else // We probably have a raw type query so use pqxx to determin the column type
- 	{
diff --git a/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch b/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
deleted file mode 100644
index 9147ffad2..000000000
--- a/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: kexi/kexidb/expression.cpp
-===================================================================
---- kexi/kexidb/expression.cpp	(revision 742153)
-+++ kexi/kexidb/expression.cpp	(working copy)
-@@ -400,14 +400,10 @@
- 	if (ltInt && rtInt)
- 		return KexiDB::maximumForIntegerTypes(lt, rt);
- 
--	if (Field::isFPNumericType(lt) && rtInt)
-+	if (Field::isFPNumericType(lt) && (rtInt || lt==rt))
- 		return lt;
--	if (Field::isFPNumericType(rt) && ltInt)
-+	if (Field::isFPNumericType(rt) && (ltInt || lt==rt))
- 		return rt;
--	if ((lt==Field::Double || lt==Field::Float) && rtInt)
--		return lt;
--	if ((rt==Field::Double || rt==Field::Float) && ltInt)
--		return rt;
- 
- 	return Field::Boolean;
- }
diff --git a/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch b/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch
deleted file mode 100644
index eddfc24ce..000000000
--- a/redhat/applications/koffice/kexi-hide_hourglass-1.1.3-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: kexi/kexiutils/utils.cpp
-===================================================================
---- kexi/kexiutils/utils.cpp	(revision 716273)
-+++ kexi/kexiutils/utils.cpp	(working copy)
-@@ -57,7 +57,7 @@
- 	TQApplication::restoreOverrideCursor();
- }
- void DelayedCursorHandler::show() {
--	TQApplication::setOverrideCursor( KCursor::waitCursor() );
-+	TQApplication::setOverrideCursor( KCursor::waitCursor(), true/*replace*/ );
- }
- 
- DelayedCursorHandler _delayedCursorHandler;
-@@ -89,7 +89,8 @@
- 
- WaitCursorRemover::~WaitCursorRemover()
- {
--	_delayedCursorHandler.start(true);
-+	if (m_reactivateCursor)
-+		_delayedCursorHandler.start(true);
- }
- 
- //--------------------------------------------------------------------------------
diff --git a/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch b/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch
deleted file mode 100644
index 70a0bab67..000000000
--- a/redhat/applications/koffice/kexi-mysql_migrate_long_text-1.1.3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: kexi/migration/mysql/mysqlmigrate.cpp
-===================================================================
---- kexi/migration/mysql/mysqlmigrate.cpp	(revision 714726)
-+++ kexi/migration/mysql/mysqlmigrate.cpp	(working copy)
-@@ -420,9 +420,9 @@
- 	if(mysqlType.contains("blob", false) != 0) {
- 		// Doesn't matter how big it is, it's binary
- 		kexiType = KexiDB::Field::BLOB;
--	} else if(mysqlType.contains("text", false) != 0) {
-+/*	} else if(mysqlType.contains("text", false) != 0) {
- 		// All the TEXT types are too big for Kexi text.
--		kexiType = KexiDB::Field::BLOB;
-+		kexiType = KexiDB::Field::BLOB;*/
- 	} else if(fld->length < 200) {
- 		kexiType = KexiDB::Field::Text;
- 	} else {
diff --git a/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch b/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch
deleted file mode 100644
index 37d13523a..000000000
--- a/redhat/applications/koffice/kexi-thoushand_objects_support-1.1.3-2.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Index: kexi/plugins/forms/kexidataprovider.cpp
-===================================================================
---- kexi/plugins/forms/kexidataprovider.cpp	(revision 688747)
-+++ kexi/plugins/forms/kexidataprovider.cpp	(revision 688748)
-@@ -153,7 +153,7 @@
- 				count = it_dup.data();
- 			tmpDuplicatedItems.insert( it.current()->columnInfo()->field, ++count );
- 		}
--		m_duplicatedItems = new TQPtrDict<char>(101);
-+		m_duplicatedItems = new TQPtrDict<char>(1009);
- 		for (it_dup = tmpDuplicatedItems.begin(); it_dup!=tmpDuplicatedItems.end(); ++it_dup) {
- 			if (it_dup.data() > 1) {
- 				m_duplicatedItems->insert( it_dup.key(), (char*)1 );
-@@ -260,7 +260,7 @@
- //	m_fieldNumbersForDataItems = newFieldNumbersForDataItems;
- 
- 	//update data sources set (some of them may be removed)
--	TQDict<char> tmpUsedDataSources(1013);
-+	TQDict<char> tmpUsedDataSources(1009);
- 
- 	if (query)
- 		query->debug();
-Index: kexi/plugins/tables/kexitabledesignerview.cpp
-===================================================================
---- kexi/plugins/tables/kexitabledesignerview.cpp	(revision 688747)
-+++ kexi/plugins/tables/kexitabledesignerview.cpp	(revision 688748)
-@@ -1262,7 +1262,7 @@
- 	KoProperty::Set *b = 0;
- 	bool no_fields = true;
- 	int i;
--	TQDict<char> names(101, false);
-+	TQDict<char> names(1009, false);
- 	char dummy;
- 	for (i=0;i<(int)d->sets->size();i++) {
- 		b = d->sets->at(i);
-Index: kexi/plugins/queries/kexiquerydesignerguieditor.cpp
-===================================================================
---- kexi/plugins/queries/kexiquerydesignerguieditor.cpp	(revision 688747)
-+++ kexi/plugins/queries/kexiquerydesignerguieditor.cpp	(revision 688748)
-@@ -77,7 +77,7 @@
- {
- public:
- 	Private()
--		: fieldColumnIdentifiers(101, false/*case insens.*/)
-+		: fieldColumnIdentifiers(1009, false/*case insens.*/)
- 	{
- 		droppedNewItem = 0;
- 		slotTableAdded_enabled = true;
-@@ -809,7 +809,7 @@
- 	//2. Collect information about criterias
- 	// --this must be top level chain of AND's
- 	// --this will also show joins as: [table1.]field1 = [table2.]field2
--	TQDict<KexiDB::BaseExpr> criterias(101, false);
-+	TQDict<KexiDB::BaseExpr> criterias(1009, false);
- 	KexiDB::BaseExpr* e = query->whereExpression();
- 	KexiDB::BaseExpr* eItem = 0;
- 	while (e) {
-@@ -877,7 +877,7 @@
- 	//3. show fields (including * and table.*)
- 	uint row_num = 0;
- 	KexiDB::Field *field;
--	TQPtrDict<char> usedCriterias(101); // <-- used criterias will be saved here
-+	TQPtrDict<char> usedCriterias(1009); // <-- used criterias will be saved here
- 	                                   //     so in step 4. we will be able to add
- 	                                   //     remaining invisible columns with criterias
- 	for (KexiDB::Field::ListIterator it(*query->fields());
-@@ -1270,7 +1270,7 @@
- 	const TQCString expStr
- 		= i18n("short for 'expression' word (only latin letters, please)", "expr").latin1();
- //TODO: optimization: cache it?
--	TQAsciiDict<char> aliases(101);
-+	TQAsciiDict<char> aliases(1009);
- 	for (int r = 0; r<(int)d->sets->size(); r++) {
- 		KoProperty::Set *set = d->sets->at(r);
- 		if (set) {
-Index: kexi/widget/tableview/kexidataawarepropertyset.cpp
-===================================================================
---- kexi/widget/tableview/kexidataawarepropertyset.cpp	(revision 688747)
-+++ kexi/widget/tableview/kexidataawarepropertyset.cpp	(revision 688748)
-@@ -24,7 +24,7 @@
- #include <koproperty/property.h>
- #include <kexiviewbase.h>
- 
--#define MAX_FIELDS 101 //nice prime number (default prop. set vector size)
-+#define MAX_FIELDS 1009 //nice prime number (default prop. set vector size)
- 
- KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
- 	KexiDataAwareObjectInterface* dataObject)
-Index: kexi/widget/utils/kexisharedactionclient.cpp
-===================================================================
---- kexi/widget/utils/kexisharedactionclient.cpp	(revision 688747)
-+++ kexi/widget/utils/kexisharedactionclient.cpp	(revision 688748)
-@@ -22,7 +22,7 @@
- #include <kaction.h>
- 
- KexiSharedActionClient::KexiSharedActionClient()
-- : m_sharedActions(101, false)
-+ : m_sharedActions(1009, false)
- {
- }
- 
-Index: kexi/main/keximainwindowimpl.cpp
-===================================================================
---- kexi/main/keximainwindowimpl.cpp	(revision 688747)
-+++ kexi/main/keximainwindowimpl.cpp	(revision 688748)
-@@ -4203,8 +4203,10 @@
- 		data = new KexiProjectData(*d->prj->data()); // a copy
- 		drv = d->prj->dbConnection()->driver();
- 		const tristate res = closeProject();
--		if (~res || !res)
-+		if (~res || !res) {
-+			delete data;
- 			return;
-+		}
- 	}
- 
- 	if (!drv->adminTools().vacuum(*data->connectionData(), data->databaseName())) {
-@@ -4212,10 +4214,9 @@
- 		showErrorMessage( &drv->adminTools() );
- 	}
- 
--	if (data && projectWasOpened) {
-+	if (projectWasOpened)
- 		openProject(*data);
--		delete data;
--	}
-+	delete data;
- }
- 
- tristate KexiMainWindowImpl::showProjectMigrationWizard(
-Index: kexi/core/kexidbconnectionset.cpp
-===================================================================
---- kexi/core/kexidbconnectionset.cpp	(revision 688747)
-+++ kexi/core/kexidbconnectionset.cpp	(revision 688748)
-@@ -30,7 +30,7 @@
- {
- public:
- 	KexiDBConnectionSetPrivate()
--	 : dataForFilenames(101)
-+	 : dataForFilenames(1009)
- 	{
- 		list.setAutoDelete(true);
- 		maxid=-1;
-Index: kexi/migration/keximigrate.cpp
-===================================================================
---- kexi/migration/keximigrate.cpp	(revision 688747)
-+++ kexi/migration/keximigrate.cpp	(revision 688748)
-@@ -491,7 +491,6 @@
- // Prompt the user to choose a field type
- KexiDB::Field::Type KexiMigrate::userType(const TQString& fname)
- {
--	KInputDialog *dlg;
- 	TQStringList  types;
- 	TQString res;
- 
-@@ -509,7 +508,7 @@
- 	types << "Long Text";
- 	types << "Binary Large Object";
- 
--	res = dlg->getItem( i18n("Field Type"),
-+	res = KInputDialog::getItem( i18n("Field Type"),
- 	                    i18n("The data type for %1 could not be determined. "
- 				 "Please select one of the following data "
- 				 "types").tqarg(fname),
-Index: kexi/kexidb/connection.cpp
-===================================================================
---- kexi/kexidb/connection.cpp	(revision 688747)
-+++ kexi/kexidb/connection.cpp	(revision 688748)
-@@ -83,10 +83,10 @@
- 		ConnectionPrivate(Connection* const conn, ConnectionData &conn_data)
- 		 : conn(conn)
- 		 , conn_data(&conn_data)
--		 , tableSchemaChangeListeners(101)
-+		 , tableSchemaChangeListeners(1009)
- 		 , m_parser(0)
--		 , tables_byname(101, false)
--		 , queries_byname(101, false)
-+		 , tables_byname(1009, false)
-+		 , queries_byname(1009, false)
- 		 , kexiDBSystemTables(101)
- 		 , dont_remove_transactions(false)
- 		 , skip_databaseExists_check_in_useDatabase(false)
-@@ -104,8 +104,8 @@
- 			queries_byname.setAutoDelete(false);//queries is owner, not me
- 
- 			//reasonable sizes: TODO
--			tables.resize(101);
--			queries.resize(101);
-+			tables.resize(1009);
-+			queries.resize(1009);
- 		}
- 		~ConnectionPrivate()
- 		{
-Index: kexi/kexidb/fieldvalidator.cpp
-===================================================================
---- kexi/kexidb/fieldvalidator.cpp	(revision 688747)
-+++ kexi/kexidb/fieldvalidator.cpp	(revision 688748)
-@@ -36,7 +36,7 @@
- 	if (field.isIntegerType()) {
- 		TQValidator *validator = 0;
- 		const bool u = field.isUnsigned();
--		int bottom, top;
-+		int bottom = 0, top = 0;
- 		if (t==Field::Byte) {
- 			bottom = u ? 0 : -0x80;
- 			top = u ? 0xff : 0x7f;
-Index: kexi/kexidb/alter.cpp
-===================================================================
---- kexi/kexidb/alter.cpp	(revision 688747)
-+++ kexi/kexidb/alter.cpp	(revision 688748)
-@@ -223,7 +223,7 @@
- static AlterTableHandler::ActionDict* createActionDict( 
- 	AlterTableHandler::ActionDictDict &fieldActions, int forFieldUID )
- {
--	AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(101, false);
-+	AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(1009, false);
- 	dict->setAutoDelete(true);
- 	fieldActions.insert( forFieldUID, dict );
- 	return dict;
-Index: kexi/kexidb/queryschema.cpp
-===================================================================
---- kexi/kexidb/queryschema.cpp	(revision 688747)
-+++ kexi/kexidb/queryschema.cpp	(revision 688748)
-@@ -1439,7 +1439,7 @@
- 	}
- 
- 	//remove duplicates for lookup fields
--	TQDict<uint> lookup_dict(101); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue()
-+	TQDict<uint> lookup_dict(1009); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue()
- 	                         // (a mapping from table.name string to uint* lookupFieldIndex
- 	lookup_dict.setAutoDelete(true);
- 	i=0;
-Index: kexi/kexidb/fieldlist.cpp
-===================================================================
---- kexi/kexidb/fieldlist.cpp	(revision 688747)
-+++ kexi/kexidb/fieldlist.cpp	(revision 688748)
-@@ -28,7 +28,7 @@
- 
- FieldList::FieldList(bool owner)
-  //reasonable sizes: TODO
-- : m_fields_by_name(101, false)
-+ : m_fields_by_name(1009, false)
- {
- 	m_fields.setAutoDelete( owner );
- 	m_fields_by_name.setAutoDelete( false );
-Index: kexi/formeditor/widgetlibrary.cpp
-===================================================================
---- kexi/formeditor/widgetlibrary.cpp	(revision 688747)
-+++ kexi/formeditor/widgetlibrary.cpp	(revision 688748)
-@@ -55,7 +55,7 @@
- {
- 	public:
- 		WidgetLibraryPrivate()
--		 : widgets(101)
-+		 : widgets(1009)
- //		 , alternateWidgets(101)
- 		 , services(101, false)
- 		 , supportedFactoryGroups(17, false)
diff --git a/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch b/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch
deleted file mode 100644
index d497a96e7..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-chalk_gmagick.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
-index 5bce37b..eea8000 100644
---- a/filters/chalk/gmagick/kis_image_magick_converter.cc
-+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
-@@ -182,6 +182,7 @@ namespace {
- 
-             image -> addAnnotation(annotation);
-         }
-+#if 0
-         for(int i = 0; i < src->generic_profiles; i++)
-         {
-             TQByteArray rawdata;
-@@ -193,6 +194,7 @@ namespace {
- 
-             image -> addAnnotation(annotation);
-         }
-+#endif
-         
-         const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
-         while(imgAttr)
-@@ -480,7 +482,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-             TQ_UINT8 opacity = OPACITY_OPAQUE;
-             const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]");
-             if (attr != 0) {
--                opacity = TQ_UINT8_MAX - Downscale(TQString(attr->value).toInt());
-+                opacity = TQ_UINT8_MAX - ScaleQuantumToChar(TQString(attr->value).toInt());
-             }
- 
-             KisPaintLayerSP layer = 0;
-@@ -534,17 +536,17 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                         while (!hiter.isDone())
-                         {
-                             TQ_UINT8 *ptr= hiter.rawData();
--                            *(ptr++) = Downscale(pp->red); // cyan
--                            *(ptr++) = Downscale(pp->green); // magenta
--                            *(ptr++) = Downscale(pp->blue); // yellow
--                            *(ptr++) = Downscale(indexes[x]); // Black
-+                            *(ptr++) = ScaleQuantumToChar(pp->red); // cyan
-+                            *(ptr++) = ScaleQuantumToChar(pp->green); // magenta
-+                            *(ptr++) = ScaleQuantumToChar(pp->blue); // yellow
-+                            *(ptr++) = ScaleQuantumToChar(indexes[x]); // Black
- // XXX: Warning! This ifdef messes up the paren matching big-time!
- #ifdef HAVE_MAGICK6
-                             if (image->matte != MagickFalse) {
- #else
-                             if (image->matte == true) {
- #endif
--                                *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
-+                                *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
-                             }
-                             else {
-                                 *(ptr++) = OPACITY_OPAQUE;
-@@ -578,10 +580,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                             {
-                                 TQ_UINT8 *ptr= hiter.rawData();
-                                 // XXX: not colorstrategy and bitdepth independent
--                                *(ptr++) = Downscale(pp->blue);
--                                *(ptr++) = Downscale(pp->green);
--                                *(ptr++) = Downscale(pp->red);
--                                *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
-+                                *(ptr++) = ScaleQuantumToChar(pp->blue);
-+                                *(ptr++) = ScaleQuantumToChar(pp->green);
-+                                *(ptr++) = ScaleQuantumToChar(pp->red);
-+                                *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
- 
-                                 pp++;
-                                 ++hiter;
-@@ -608,8 +610,8 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                             {
-                                 TQ_UINT8 *ptr= hiter.rawData();
-                                 // XXX: not colorstrategy and bitdepth independent
--                                *(ptr++) = Downscale(pp->blue);
--                                *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
-+                                *(ptr++) = ScaleQuantumToChar(pp->blue);
-+                                *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
- 
-                                 pp++;
-                                 ++hiter;
-@@ -812,13 +814,12 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                     while (!it.isDone()) {
- 
-                         TQ_UINT8 * d = it.rawData();
--                        pp -> red = Upscale(d[PIXEL_CYAN]);
--                        pp -> green = Upscale(d[PIXEL_MAGENTA]);
--                        pp -> blue = Upscale(d[PIXEL_YELLOW]);
-+                        pp -> red = ScaleCharToQuantum(d[PIXEL_CYAN]);
-+                        pp -> green = ScaleCharToQuantum(d[PIXEL_MAGENTA]);
-+                        pp -> blue = ScaleCharToQuantum(d[PIXEL_YELLOW]);
-                         if (alpha)
--                            pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
--
--                        indexes[x]= Upscale(d[PIXEL_BLACK]);
-+                            pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
-+                        indexes[x]= ScaleCharToQuantum(d[PIXEL_BLACK]);
- 
-                         x++;
-                         pp++;
-@@ -848,11 +849,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                     while (!it.isDone()) {
- 
-                         TQ_UINT8 * d = it.rawData();
--                        pp -> red = Upscale(d[PIXEL_RED]);
--                        pp -> green = Upscale(d[PIXEL_GREEN]);
--                        pp -> blue = Upscale(d[PIXEL_BLUE]);
-+                        pp -> red = ScaleCharToQuantum(d[PIXEL_RED]);
-+                        pp -> green = ScaleCharToQuantum(d[PIXEL_GREEN]);
-+                        pp -> blue = ScaleCharToQuantum(d[PIXEL_BLUE]);
-                         if (alpha)
--                            pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
-+                            pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
- 
-                         pp++;
-                         ++it;
-@@ -879,11 +880,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
-                 else {
-                     while (!it.isDone()) {
-                         TQ_UINT8 * d = it.rawData();
--                        pp -> red = Upscale(d[PIXEL_GRAY]);
--                        pp -> green = Upscale(d[PIXEL_GRAY]);
--                        pp -> blue = Upscale(d[PIXEL_GRAY]);
-+                        pp -> red = ScaleCharToQuantum(d[PIXEL_GRAY]);
-+                        pp -> green = ScaleCharToQuantum(d[PIXEL_GRAY]);
-+                        pp -> blue = ScaleCharToQuantum(d[PIXEL_GRAY]);
-                         if (alpha)
--                            pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
-+                            pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
- 
-                         pp++;
-                         ++it;
diff --git a/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz b/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz
deleted file mode 100644
index 74196adea..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-damaged_binary_files.tar.gz
+++ /dev/null
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch b/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch
deleted file mode 100644
index 2308e33f4..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_bug_657.patch
+++ /dev/null
@@ -1,2662 +0,0 @@
-commit 5c69fcd39111465de16c933763d3c918703048d8
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   1339569472 +0200
-
-    Fix FTBFS due to missing libraries
-    Clean up lib paths in LDFLAGS - moved to LIBADD
-    For KWord and and KPresenter added linking kspell2
-    For KSpread added linking kutils
-    This closes Bug 657
-
-diff --git a/chalk/Makefile.am b/chalk/Makefile.am
-index e06e155..3a0c3eb 100644
---- a/chalk/Makefile.am
-+++ b/chalk/Makefile.am
-@@ -9,8 +9,8 @@ libchalkcommon_la_LIBADD = sdk/libchalksdk.la core/libchalkimage.la ui/libchalku
- ## The part
- kde_module_LTLIBRARIES = libchalkpart.la
- libchalkpart_la_SOURCES = chalk_part_init.cc
--libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -L../chalk/ui/.libs -lchalkui -module $(KDE_PLUGIN)
--libchalkpart_la_LIBADD = libchalkcommon.la
-+libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN)
-+libchalkpart_la_LIBADD = $(KOFFICE_LIBS) libchalkcommon.la ../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
- 
-diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am
-index b12d3f3..8ad9b0d 100644
---- a/chalk/colorspaces/wet/Makefile.am
-+++ b/chalk/colorspaces/wet/Makefile.am
-@@ -20,9 +20,11 @@ kde_module_LTLIBRARIES = chalkwetplugin.la
- chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui
- noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h
- 
--chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms -L../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../chalk/core/.libs -lchalkimage \
--	-L../../../chalk/ui/.libs -lchalkui
--chalkwetplugin_la_LIBADD =  ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
-+chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms
-+chalkwetplugin_la_LIBADD =  ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la
- 
- chalkwetplugin_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am
-index ac622d7..d54d65b 100644
---- a/chalk/plugins/filters/blur/Makefile.am
-+++ b/chalk/plugins/filters/blur/Makefile.am
-@@ -14,9 +14,11 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.
- kde_module_LTLIBRARIES = chalkblurfilter.la
- noinst_HEADERS = blur.h kis_blur_filter.h
- 
--chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkblurfilter_la_LIBADD = ../../../libchalkcommon.la
-+chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am
-index c783157..156a60a 100644
---- a/chalk/plugins/filters/bumpmap/Makefile.am
-+++ b/chalk/plugins/filters/bumpmap/Makefile.am
-@@ -12,8 +12,10 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
- kde_module_LTLIBRARIES = chalkbumpmap.la
- noinst_HEADERS = bumpmap.h
- 
--chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--	-L../../../../chalk/ui/.libs -lchalkui
--chalkbumpmap_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkbumpmap_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkbumpmap_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am
-index 19e58bd..2553773 100644
---- a/chalk/plugins/filters/cimg/Makefile.am
-+++ b/chalk/plugins/filters/cimg/Makefile.am
-@@ -25,9 +25,11 @@ noinst_HEADERS = \
- 	kis_cimg_plugin.h\
- 	kis_cimgconfig_widget.h
- 
--chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkcimg_la_LIBADD =  ../../../libchalkcommon.la
-+chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkcimg_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkcimg_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am
-index d69de33..65e7243 100644
---- a/chalk/plugins/filters/colorify/Makefile.am
-+++ b/chalk/plugins/filters/colorify/Makefile.am
-@@ -14,9 +14,11 @@ INCLUDES = -I$(srcdir)/../../../sdk \
- kde_module_LTLIBRARIES = chalkcolorify.la
- 
- 
--chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkcolorify_la_LIBADD =  ../../../libchalkcommon.la
-+chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkcolorify_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
- chalkcolorify_la_SOURCES = Colorify.cpp KisWdgColorify.cpp\
-diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am
-index 523915c..0da38c0 100644
---- a/chalk/plugins/filters/colors/Makefile.am
-+++ b/chalk/plugins/filters/colors/Makefile.am
-@@ -14,8 +14,10 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col
- kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la
- noinst_HEADERS = colors.h
- 
--chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la
-+chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am
-index cd4745e..6aeaaee 100644
---- a/chalk/plugins/filters/colorsfilters/Makefile.am
-+++ b/chalk/plugins/filters/colorsfilters/Makefile.am
-@@ -17,9 +17,11 @@ noinst_HEADERS = colorsfilters.h \
- 	kis_perchannel_filter.h \
- 	kis_brightness_contrast_filter.h
- 
--chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkcolorsfilters_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkcolorsfilters_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_module_LTLIBRARIES = chalkcolorsfilters.la
- 
-diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am
-index 133a684..32f5cbd 100644
---- a/chalk/plugins/filters/convolutionfilters/Makefile.am
-+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am
-@@ -21,8 +21,10 @@ noinst_HEADERS = convolutionfilters.h \
- 	kis_custom_convolution_filter_configuration_widget.h \
- 	kis_convolution_filter.h
- 
--chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkconvolutionfilters_la_LIBADD =  ../../../libchalkcommon.la
-+chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkconvolutionfilters_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkconvolutionfilters_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am
-index d0116fe..19b54e4 100644
---- a/chalk/plugins/filters/embossfilter/Makefile.am
-+++ b/chalk/plugins/filters/embossfilter/Makefile.am
-@@ -17,8 +17,10 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
- noinst_HEADERS = kis_emboss_filter_plugin.h \
-         kis_emboss_filter.h
- 
--chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkembossfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkembossfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkembossfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am
-index 33b55da..5dcd349 100644
---- a/chalk/plugins/filters/example/Makefile.am
-+++ b/chalk/plugins/filters/example/Makefile.am
-@@ -15,8 +15,10 @@ chalkexample_la_SOURCES = example.cc
- kde_module_LTLIBRARIES = chalkexample.la
- noinst_HEADERS = example.h
- 
--chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkexample_la_LIBADD =  ../../../libchalkcommon.la
-+chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkexample_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkexample_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am
-index 424231d..24b9f38 100644
---- a/chalk/plugins/filters/fastcolortransfer/Makefile.am
-+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am
-@@ -16,8 +16,10 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc
- kde_module_LTLIBRARIES = chalkfastcolortransfer.la
- noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h
- 
--chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficecore/.libs -lkofficecore
--chalkfastcolortransfer_la_LIBADD = ../../../libchalkcommon.la
-+chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am
-index d2477eb..32b9bd7 100644
---- a/chalk/plugins/filters/imageenhancement/Makefile.am
-+++ b/chalk/plugins/filters/imageenhancement/Makefile.am
-@@ -15,12 +15,14 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \
- 
- kde_module_LTLIBRARIES = chalkimageenhancement.la
- 
--chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
-+chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
- 
- noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h
- 
--chalkimageenhancement_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkimageenhancement_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkimageenhencement_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
-index b853281..c794fee 100644
---- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
-+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
-@@ -16,8 +16,10 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
- kde_module_LTLIBRARIES = chalklenscorrectionfilter.la
- noinst_HEADERS = lenscorrectionfilter.h
- 
--chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalklenscorrectionfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalklenscorrectionfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am
-index 5c04e69..314c442 100644
---- a/chalk/plugins/filters/levelfilter/Makefile.am
-+++ b/chalk/plugins/filters/levelfilter/Makefile.am
-@@ -16,9 +16,11 @@ noinst_HEADERS = levelfilter.h \
- 	kis_level_filter.h \
- 	kgradientslider.h
- 
--chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalklevelfilter_la_LIBADD =  ../../../libchalkcommon.la 
-+chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalklevelfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_module_LTLIBRARIES = chalklevelfilter.la
- 
-diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am
-index 3a085fc..aea0c05 100644
---- a/chalk/plugins/filters/noisefilter/Makefile.am
-+++ b/chalk/plugins/filters/noisefilter/Makefile.am
-@@ -16,8 +16,10 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
- kde_module_LTLIBRARIES = chalknoisefilter.la
- noinst_HEADERS = noisefilter.h kis_wdg_noise.h
- 
--chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalknoisefilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalknoisefilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalknoisefilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am
-index cef2125..60878f6 100644
---- a/chalk/plugins/filters/oilpaintfilter/Makefile.am
-+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am
-@@ -17,8 +17,10 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
- noinst_HEADERS = kis_oilpaint_filter_plugin.h \
- 	kis_oilpaint_filter.h
- 
--chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkoilpaintfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkoilpaintfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkoilpaintfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am
-index cc12358..e46e0ea 100644
---- a/chalk/plugins/filters/pixelizefilter/Makefile.am
-+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am
-@@ -17,8 +17,10 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
- noinst_HEADERS = kis_pixelize_filter_plugin.h \
- 	kis_pixelize_filter.h
- 
--chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkpixelizefilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkpixelizefilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkpixelizefilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am
-index ba88e62..584ef96 100644
---- a/chalk/plugins/filters/raindropsfilter/Makefile.am
-+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am
-@@ -17,8 +17,10 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
- noinst_HEADERS = kis_raindrops_filter_plugin.h \
- 	kis_raindrops_filter.h
- 
--chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkraindropsfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkraindropsfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkraindropsfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am
-index e46dc64..b7a1657 100644
---- a/chalk/plugins/filters/randompickfilter/Makefile.am
-+++ b/chalk/plugins/filters/randompickfilter/Makefile.am
-@@ -16,8 +16,10 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
- kde_module_LTLIBRARIES = chalkrandompickfilter.la
- noinst_HEADERS = randompickfilter.h
- 
--chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkrandompickfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkrandompickfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkrandompickfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am
-index 0b74580..ee9f141 100644
---- a/chalk/plugins/filters/roundcorners/Makefile.am
-+++ b/chalk/plugins/filters/roundcorners/Makefile.am
-@@ -16,8 +16,10 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
- noinst_HEADERS = kis_round_corners_filter_plugin.h \
- 	kis_round_corners_filter.h
- 
--chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkroundcornersfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkroundcornersfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkroundcornersfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am
-index f139c29..ae28ed1 100644
---- a/chalk/plugins/filters/smalltilesfilter/Makefile.am
-+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am
-@@ -16,8 +16,10 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
- noinst_HEADERS = kis_small_tiles_filter_plugin.h \
- 	kis_small_tiles_filter.h
- 
--chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalksmalltilesfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalksmalltilesfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalksmalltilesfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am
-index 9726f4d..da3fd16 100644
---- a/chalk/plugins/filters/sobelfilter/Makefile.am
-+++ b/chalk/plugins/filters/sobelfilter/Makefile.am
-@@ -16,8 +16,10 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
- noinst_HEADERS = kis_sobel_filter_plugin.h \
- 	kis_sobel_filter.h
- 
--chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalksobelfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalksobelfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalksobelfilter_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am
-index 5c6eda7..1c1289f 100644
---- a/chalk/plugins/filters/unsharp/Makefile.am
-+++ b/chalk/plugins/filters/unsharp/Makefile.am
-@@ -13,8 +13,10 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_
- 
- kde_module_LTLIBRARIES = chalkunsharpfilter.la
- 
--chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la
-+chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
-diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am
-index 6d2fec5..65b047c 100644
---- a/chalk/plugins/filters/wavefilter/Makefile.am
-+++ b/chalk/plugins/filters/wavefilter/Makefile.am
-@@ -16,8 +16,10 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
- kde_module_LTLIBRARIES = chalkwavefilter.la
- noinst_HEADERS = wavefilter.h kis_wdg_wave.h
- 
--chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkwavefilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkwavefilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
-diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am
-index ce91e83..186d501 100644
---- a/chalk/plugins/paintops/defaultpaintops/Makefile.am
-+++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am
-@@ -32,8 +32,10 @@ noinst_HEADERS = defaultpaintops_plugin.h 	kis_airbrushop.h 	kis_brushop.h \
- 
- kde_module_LTLIBRARIES = chalkdefaultpaintops.la
- 
--chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkdefaultpaintops_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
-+chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkdefaultpaintops_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkdefaultpaintops_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am
-index 16c4be5..329e9bb 100644
---- a/chalk/plugins/tools/defaulttools/Makefile.am
-+++ b/chalk/plugins/tools/defaulttools/Makefile.am
-@@ -44,9 +44,11 @@ noinst_HEADERS = \
- 	kis_tool_pan.h 
- 
- 
--chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
-+chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkdefaulttools_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
-index cfaa8f3..7f6c089 100644
---- a/chalk/plugins/tools/selectiontools/Makefile.am
-+++ b/chalk/plugins/tools/selectiontools/Makefile.am
-@@ -28,9 +28,11 @@ noinst_HEADERS = \
- 	kis_tool_select_elliptical.h 
- 
- 
--chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la
-+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkselectiontools_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
-index d1d73a7..9091a52 100644
---- a/chalk/plugins/tools/tool_crop/Makefile.am
-+++ b/chalk/plugins/tools/tool_crop/Makefile.am
-@@ -21,9 +21,11 @@ noinst_HEADERS = \
- 	tool_crop.h \
- 	kis_tool_crop.h 
- 
--chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolcrop_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
-index 1f847fe..03d3395 100644
---- a/chalk/plugins/tools/tool_curves/Makefile.am
-+++ b/chalk/plugins/tools/tool_curves/Makefile.am
-@@ -33,9 +33,11 @@ noinst_HEADERS = \
- 	kis_tool_bezier_select.h \
- 	kis_tool_moutline.h
- 
--chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolcurves_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
-index 0f14b70..35c2381 100644
---- a/chalk/plugins/tools/tool_filter/Makefile.am
-+++ b/chalk/plugins/tools/tool_filter/Makefile.am
-@@ -22,9 +22,11 @@ noinst_HEADERS = \
- 	kis_tool_filter.h \
- 	tool_filter.h
- 
--chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolfilter_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
-index 80b6d35..ffa0832 100644
---- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
-+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
-@@ -20,9 +20,11 @@ noinst_HEADERS = \
- 	tool_perspectivegrid.h \
- 	kis_tool_perspectivegrid.h 
- 
--chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
-index 9f6dfb2..2491618 100644
---- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
-+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
-@@ -20,9 +20,11 @@ noinst_HEADERS = \
- 	tool_perspectivetransform.h \
- 	kis_tool_perspectivetransform.h 
- 
--chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolperspectivetransform_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
-index ef2d230..2155322 100644
---- a/chalk/plugins/tools/tool_polygon/Makefile.am
-+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
-@@ -20,9 +20,11 @@ noinst_HEADERS = \
- 	tool_polygon.h \
- 	kis_tool_polygon.h 
- 
--chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolpolygon_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
-index acbe8e6..2beb650 100644
---- a/chalk/plugins/tools/tool_polyline/Makefile.am
-+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
-@@ -20,9 +20,11 @@ noinst_HEADERS = \
- 	tool_polyline.h \
- 	kis_tool_polyline.h 
- 
--chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la 
-+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolpolyline_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
-index 416c9a6..70d5885 100644
---- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
-+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
-@@ -14,9 +14,11 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
- 
- kde_module_LTLIBRARIES = chalktoolselectsimilar.la
- 
--chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolselectsimilar_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
-index e068a62..a6b9a47 100644
---- a/chalk/plugins/tools/tool_star/Makefile.am
-+++ b/chalk/plugins/tools/tool_star/Makefile.am
-@@ -21,9 +21,11 @@ noinst_HEADERS = \
- 	tool_star.h \
- 	kis_tool_star.h 
- 
--chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la
-+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktoolstar_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
-index bb68737..b606e17 100644
---- a/chalk/plugins/tools/tool_transform/Makefile.am
-+++ b/chalk/plugins/tools/tool_transform/Makefile.am
-@@ -21,9 +21,11 @@ noinst_HEADERS = \
- 	tool_transform.h \
- 	kis_tool_transform.h 
- 
--chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui
--chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la
-+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalktooltransform_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am
-index 19fb51e..57abd95 100644
---- a/chalk/plugins/viewplugins/colorrange/Makefile.am
-+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am
-@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkcolorrange.la
- chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui
- noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h
- 
--chalkcolorrange_la_LIBADD =  ../../../libchalkcommon.la
--chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-+chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
-+chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
- 
- chalkrcdir = $(kde_datadir)/chalkplugins
- chalkrc_DATA = colorrange.rc
-diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
-index 5469f41..a6da506 100644
---- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
-+++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
-@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la
- chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc
- noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h
- 
--chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkcolorspaceconversion_la_LIBADD =  ../../../libchalkcommon.la
-+chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkcolorspaceconversion_la_METASOURCES = AUTO
- 
-diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am
-index a09b78e..137b57d 100644
---- a/chalk/plugins/viewplugins/dropshadow/Makefile.am
-+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am
-@@ -20,9 +20,11 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \
- noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \
- 		kis_dropshadow.h dlg_dropshadow.h
- 
--chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkdropshadow_la_LIBADD =  ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la
-+chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalkdropshadow.desktop
- 
-diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
-index b326ddb..b200967 100644
---- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am
-+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
-@@ -19,8 +19,10 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h
- 
- kde_services_DATA = chalkfiltersgallery.desktop
- 
--chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkfiltersgallery_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkfiltersgallery_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am
-index 4b372cf..a5c5e3d 100644
---- a/chalk/plugins/viewplugins/histogram/Makefile.am
-+++ b/chalk/plugins/viewplugins/histogram/Makefile.am
-@@ -18,8 +18,10 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget
- 
- kde_services_DATA = chalkhistogram.desktop
- 
--chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkhistogram_la_LIBADD =  ../../../libchalkcommon.la
-+chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkhistogram_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
-index 02864fc..d63edff 100644
---- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am
-+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
-@@ -15,8 +15,10 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc  kis_imagerasteredcache.cc
- kde_module_LTLIBRARIES = chalkhistogramdocker.la
- noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h
- 
--chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkhistogramdocker_la_LIBADD =  ../../../libchalkcommon.la
-+chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkhistogramdocker_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am
-index 11da5c9..73a096b 100644
---- a/chalk/plugins/viewplugins/imagesize/Makefile.am
-+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am
-@@ -18,8 +18,10 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h
- 
- kde_module_LTLIBRARIES = chalkimagesize.la
- 
--chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkimagesize_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkimagesize_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am
-index 0346768..c19b298 100644
---- a/chalk/plugins/viewplugins/modify_selection/Makefile.am
-+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am
-@@ -20,8 +20,10 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h
- 
- kde_module_LTLIBRARIES = chalkmodifyselection.la
- 
--chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkmodifyselection_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkmodifyselection_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am
-index 52cafd7..32da2ec 100644
---- a/chalk/plugins/viewplugins/performancetest/Makefile.am
-+++ b/chalk/plugins/viewplugins/performancetest/Makefile.am
-@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkperftest.la
- chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc
- noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h
- 
--chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkperftest_la_LIBADD =  ../../../libchalkcommon.la
-+chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalkperftest.desktop
- 
-diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am
-index 25d48e3..61d729b 100644
---- a/chalk/plugins/viewplugins/rotateimage/Makefile.am
-+++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am
-@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkrotateimage.la
- chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc
- noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h
- 
--chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkrotateimage_la_LIBADD =  ../../../libchalkcommon.la
-+chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalkrotateimage.desktop
- 
-diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am
-index 7bde056..5394cf7 100644
---- a/chalk/plugins/viewplugins/screenshot/Makefile.am
-+++ b/chalk/plugins/viewplugins/screenshot/Makefile.am
-@@ -15,9 +15,11 @@ kde_module_LTLIBRARIES = chalkscreenshot.la
- chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui
- noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h
- 
--chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -lkdeprint
--chalkscreenshot_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -lkdeprint
-+chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalkscreenshot.desktop
- 
-diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
-index eec3697..5757c06 100644
---- a/chalk/plugins/viewplugins/scripting/Makefile.am
-+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
-@@ -20,9 +20,11 @@ chalkscripting_la_SOURCES = scripting.cc
- kde_module_LTLIBRARIES = chalkscripting.la
- noinst_HEADERS = scripting.h
- 
--chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkscripting_la_LIBADD =  $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la
-+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- KDE_CXXFLAGS = $(USE_EXCEPTIONS)
- 
-diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
-index ac4a959..e3eee89 100644
---- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
-+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
-@@ -11,15 +11,18 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
- 	krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
- 	krs_wavelet.cpp
- 
--krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore
-+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
- krosschalkcore_la_LIBADD = \
-+    $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \
-     $(LIB_QT) \
-     $(LIB_KDECORE) \
-     $(top_builddir)/lib/kross/api/libkrossapi.la \
-     $(top_builddir)/lib/kross/main/libkrossmain.la \
-     $(top_builddir)/chalk/libchalkcommon.la \
--    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la
-+    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \
-+    ../../../../../chalk/chalkcolor/libchalkcolor.la \
-+    ../../../../../chalk/core/libchalkimage.la \
-+    ../../../../../chalk/ui/libchalkui.la
- 
- METASOURCES = AUTO
- SUBDIRS = .
-diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
-index 0682311..80ef392 100644
---- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
-+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
-@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkselectopaque.la
- chalkselectopaque_la_SOURCES = selectopaque.cc 
- noinst_HEADERS = selectopaque.h
- 
--chalkselectopaque_la_LIBADD =  ../../../libchalkcommon.la
--chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-+chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
-+chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
- 
- chalkrcdir = $(kde_datadir)/chalkplugins
- chalkrc_DATA = selectopaque.rc
-diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am
-index 130a5ff..ce279a1 100644
---- a/chalk/plugins/viewplugins/separate_channels/Makefile.am
-+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am
-@@ -20,8 +20,10 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \
- 
- kde_services_DATA = chalkseparatechannels.desktop
- 
--chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -L../../../../lib/kofficecore/.libs -lkofficecore
--chalkseparatechannels_la_LIBADD =  ../../../libchalkcommon.la 
-+chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkseparatechannels_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am
-index 937088b..5d3bd01 100644
---- a/chalk/plugins/viewplugins/shearimage/Makefile.am
-+++ b/chalk/plugins/viewplugins/shearimage/Makefile.am
-@@ -18,8 +18,10 @@ kde_services_DATA = chalkshearimage.desktop
- chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc
- noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h
- 
--chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkshearimage_la_LIBADD =  ../../../libchalkcommon.la
-+chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- chalkshearimage_la_METASOURCES = AUTO
-diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am
-index 5e0fe4c..0d5e275 100644
---- a/chalk/plugins/viewplugins/substrate/Makefile.am
-+++ b/chalk/plugins/viewplugins/substrate/Makefile.am
-@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalksubstrate.la
- chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc
- noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h
- 
--chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalksubstrate_la_LIBADD =  ../../../libchalkcommon.la
-+chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalksubstrate.desktop
- 
-diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am
-index df07a2a..26b01aa 100644
---- a/chalk/plugins/viewplugins/variations/Makefile.am
-+++ b/chalk/plugins/viewplugins/variations/Makefile.am
-@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkvariations.la
- chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui 
- noinst_HEADERS = wdg_variations.h
- 
--chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
--        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
--chalkvariations_la_LIBADD =  ../../../libchalkcommon.la
-+chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts
-+chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
-+	../../../../chalk/chalkcolor/libchalkcolor.la \
-+	../../../../chalk/core/libchalkimage.la \
-+	../../../../chalk/ui/libchalkui.la
- 
- kde_services_DATA = chalkvariations.desktop
- 
-diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am
-index 99f468e..dc56704 100644
---- a/filters/chalk/gmagick/Makefile.am
-+++ b/filters/chalk/gmagick/Makefile.am
-@@ -1,20 +1,24 @@
- kde_module_LTLIBRARIES = libchalkgmagickimport.la libchalkgmagickexport.la
- 
- libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkgmagickexport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBGMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkgmagickimport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBGMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- INCLUDES= \
- 	-I$(srcdir) \
-diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am
-index 780a3e2..7cefb8a 100644
---- a/filters/chalk/jpeg/Makefile.am
-+++ b/filters/chalk/jpeg/Makefile.am
-@@ -2,24 +2,32 @@ noinst_LTLIBRARIES = libchalkconverter.la
- kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la
- 
- libchalkconverter_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c
--libchalkconverter_la_LIBADD = $(top_builddir)/filters/chalk/libkisexif/libkisexif.la
-+libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \
- 	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
--	libchalkconverter.la $(KOFFICE_LIBS) -ljpeg -lexif
-+	libchalkconverter.la $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
-+	-ljpeg -lexif
- 
- libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \
- 	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
--	libchalkconverter.la $(KOFFICE_LIBS) -ljpeg -lexif
-+	libchalkconverter.la $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
-+	-ljpeg -lexif
- 
- INCLUDES= \
- 	-I$(srcdir) \
-diff --git a/filters/chalk/libkisexif/Makefile.am b/filters/chalk/libkisexif/Makefile.am
-index d46bf3f..d8f40fa 100644
---- a/filters/chalk/libkisexif/Makefile.am
-+++ b/filters/chalk/libkisexif/Makefile.am
-@@ -12,8 +12,11 @@ INCLUDES = \
-         $(all_includes) 
- METASOURCES = AUTO
- libkisexif_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
-+libkisexif_la_LIBADD = $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- noinst_LTLIBRARIES = libkisexif.la
- 
- 
-diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am
-index 129f69a..745ad6b 100644
---- a/filters/chalk/magick/Makefile.am
-+++ b/filters/chalk/magick/Makefile.am
-@@ -1,20 +1,24 @@
- kde_module_LTLIBRARIES = libchalkmagickimport.la libchalkmagickexport.la
- 
- libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkmagickexport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkmagickimport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- INCLUDES= \
- 	-I$(srcdir) \
-diff --git a/filters/chalk/openexr/Makefile.am b/filters/chalk/openexr/Makefile.am
-index e186036..4c3ff9e 100644
---- a/filters/chalk/openexr/Makefile.am
-+++ b/filters/chalk/openexr/Makefile.am
-@@ -15,25 +15,28 @@ AM_CPPFLAGS= \
- 
- kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la
- 
--libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--	-L../../../lib/kofficecore/.libs/ -lkofficecore \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libchalk_openexr_export_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(OPENEXR_LIBS) \
- 	$(top_builddir)/chalk/libchalkcommon.la \
- 	$(top_builddir)/chalk/colorspaces/rgb_f32/libchalk_rgb_f32.la \
--	$(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la
-+	$(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- 
--libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libchalk_openexr_import_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(OPENEXR_LIBS) \
- 	$(top_builddir)/chalk/libchalkcommon.la \
- 	$(top_builddir)/chalk/colorspaces/rgb_f32/libchalk_rgb_f32.la \
--	$(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la
-+	$(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- 
- service_DATA = chalk_openexr_import.desktop chalk_openexr_export.desktop
-diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am
-index e1c7c65..89d0281 100644
---- a/filters/chalk/pdf/Makefile.am
-+++ b/filters/chalk/pdf/Makefile.am
-@@ -18,10 +18,12 @@ kdelnkdir = $(kde_appsdir)/.hidden
- METASOURCES = AUTO
- kde_module_LTLIBRARIES = libchalkpdfimport.la
- libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
--	-lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS)
-+	-lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- noinst_HEADERS = kis_pdf_import.h kis_pdf_import_widget.h
- libchalkpdfimport_la_SOURCES = kis_pdf_import.cpp pdfimportwidgetbase.ui \
-diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am
-index 929fbc7..857c368 100644
---- a/filters/chalk/png/Makefile.am
-+++ b/filters/chalk/png/Makefile.am
-@@ -1,19 +1,23 @@
- kde_module_LTLIBRARIES = libchalkpngimport.la libchalkpngexport.la
- 
- libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkpngexport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
- 	-lpng
- 
- libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkpngimport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
- 	-lpng
- 
- INCLUDES= \
-diff --git a/filters/chalk/raw/Makefile.am b/filters/chalk/raw/Makefile.am
-index dffd88c..f48bb94 100644
---- a/filters/chalk/raw/Makefile.am
-+++ b/filters/chalk/raw/Makefile.am
-@@ -12,12 +12,14 @@ AM_CPPFLAGS= \
- kde_module_LTLIBRARIES = libchalk_raw_import.la 
- 
- libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalk_raw_import_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(raw_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la 
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- 
- service_DATA = chalk_raw_import.desktop
-diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am
-index 3275055..c16e7f1 100644
---- a/filters/chalk/tiff/Makefile.am
-+++ b/filters/chalk/tiff/Makefile.am
-@@ -2,17 +2,23 @@ kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la
- 
- libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \
- 	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
--	libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff
-+	libchalktiffconverter.la $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
-+	-ltiff
- 
- libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \
- 	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
--	libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff
-+	libchalktiffconverter.la $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la \
-+	-ltiff
- 
- INCLUDES= \
- 	-I$(srcdir) \
-@@ -48,8 +54,11 @@ kdelnk_DATA = chalk_tiff.desktop
- noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \
- 	kis_tiff_ycbcr_reader.h
- libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
-+libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- noinst_LTLIBRARIES = libchalktiffconverter.la
- libchalktiffconverter_la_SOURCES = kis_tiff_converter.cc kis_tiff_stream.cc \
- 	kis_tiff_writer_visitor.cpp kis_tiff_reader.cc kis_tiff_ycbcr_reader.cc
-diff --git a/filters/chalk/xcf/Makefile.am b/filters/chalk/xcf/Makefile.am
-index 6f163b4..5415f09 100644
---- a/filters/chalk/xcf/Makefile.am
-+++ b/filters/chalk/xcf/Makefile.am
-@@ -1,20 +1,24 @@
- kde_module_LTLIBRARIES = libchalkxcfimport.la libchalkxcfexport.la
- 
- libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkxcfexport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \
--        -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
--        -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
-+        -llcms
- libchalkxcfimport_la_LIBADD = \
- 	$(KOFFICE_LIBS) \
- 	$(LIBMAGICK_LIBS) \
--	$(top_builddir)/chalk/libchalkcommon.la
-+	$(top_builddir)/chalk/libchalkcommon.la \
-+	../../../chalk/core/libchalkimage.la \
-+	../../../chalk/ui/libchalkui.la \
-+	../../../chalk/chalkcolor/libchalkcolor.la
- 
- INCLUDES= \
- 	-I$(srcdir) \
-diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am
-index b0ad08c..47b0135 100644
---- a/filters/karbon/eps/Makefile.am
-+++ b/filters/karbon/eps/Makefile.am
-@@ -6,12 +6,12 @@ libkarbonepsexport_la_SOURCES = \
- 	epsexport.cc \
- 	epsexportdlg.cc
- 
--libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--libkarbonepsexport_la_LIBADD  = $(LIB_KOFFICEUI) ../../../karbon/libkarboncommon.la
-+libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkarbonepsexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la
- 
- libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc
--libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--libkarbonepsimport_la_LIBADD  = $(LIB_KOFFICEUI)
-+libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkarbonepsimport_la_LIBADD  = $(KOFFICE_LIBS)
- 
- INCLUDES = \
- 	$(KOFFICE_INCLUDES) \
-diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am
-index ff24495..29202e8 100644
---- a/filters/karbon/kontour/Makefile.am
-+++ b/filters/karbon/kontour/Makefile.am
-@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/
- kde_module_LTLIBRARIES = libkarbonkontourimport.la
- 
- libkarbonkontourimport_la_SOURCES = kontourimport.cpp
--libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la
- 
- METASOURCES = AUTO
-diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am
-index 3439b12..d997484 100644
---- a/filters/karbon/png/Makefile.am
-+++ b/filters/karbon/png/Makefile.am
-@@ -1,8 +1,8 @@
- kde_module_LTLIBRARIES = libkarbonpngexport.la
- 
--libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkarbonpngexport_la_LIBADD = \
--	$(LIB_KOFFICEUI) \
-+	$(KOFFICE_LIBS) \
- 	../../../karbon/libkarboncommon.la
- 
- INCLUDES = \
-diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am
-index 0f2e80f..72eaf15 100644
---- a/filters/karbon/svg/Makefile.am
-+++ b/filters/karbon/svg/Makefile.am
-@@ -1,13 +1,13 @@
- kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la
- 
--libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkarbonsvgexport_la_LIBADD = \
--	$(LIB_KOFFICEUI) \
-+	$(KOFFICE_LIBS) \
- 	../../../karbon/libkarboncommon.la
- 
--libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkarbonsvgimport_la_LIBADD = \
--	$(LIB_KOFFICEUI) \
-+	$(KOFFICE_LIBS) \
- 	../../../karbon/libkarboncommon.la
- 
- INCLUDES = \
-diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am
-index df310c4..82d0c0a 100644
---- a/filters/karbon/wmf/Makefile.am
-+++ b/filters/karbon/wmf/Makefile.am
-@@ -11,11 +11,11 @@ INCLUDES= \
- 
- kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la
- 
--libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
- libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc
- 
--libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
- libwmfexport_la_SOURCES = wmfexport.cc
- 
-diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am
-index cd35667..49e5193 100644
---- a/filters/karbon/xcf/Makefile.am
-+++ b/filters/karbon/xcf/Makefile.am
-@@ -1,8 +1,8 @@
- kde_module_LTLIBRARIES = libkarbonxcfexport.la
- 
--libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkarbonxcfexport_la_LIBADD = \
--	$(LIB_KOFFICEUI) \
-+	$(KOFFICE_LIBS) \
- 	../../../karbon/libkarboncommon.la
- 
- INCLUDES = \
-diff --git a/filters/kchart/bmp/Makefile.am b/filters/kchart/bmp/Makefile.am
-index 63e6ff2..260601f 100644
---- a/filters/kchart/bmp/Makefile.am
-+++ b/filters/kchart/bmp/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartbmpexport.la
- 
- libkchartbmpexport_la_SOURCES = bmpexport.cpp
--libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	bmpexport.h
-diff --git a/filters/kchart/jpeg/Makefile.am b/filters/kchart/jpeg/Makefile.am
-index f00a9ba..3907a5d 100644
---- a/filters/kchart/jpeg/Makefile.am
-+++ b/filters/kchart/jpeg/Makefile.am
-@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartjpegexport.la
- 
- libkchartjpegexport_la_SOURCES = jpegexport.cpp
--libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
-  
- noinst_HEADERS = \
-diff --git a/filters/kchart/mng/Makefile.am b/filters/kchart/mng/Makefile.am
-index d46a9e0..22d611f 100644
---- a/filters/kchart/mng/Makefile.am
-+++ b/filters/kchart/mng/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartmngexport.la
- 
- libkchartmngexport_la_SOURCES = mngexport.cpp
--libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	mngexport.h
-diff --git a/filters/kchart/png/Makefile.am b/filters/kchart/png/Makefile.am
-index a2455ef..7af0f16 100644
---- a/filters/kchart/png/Makefile.am
-+++ b/filters/kchart/png/Makefile.am
-@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartpngexport.la
- 
- libkchartpngexport_la_SOURCES = pngexport.cpp
--libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	pngexport.h 
-diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am
-index a85cfd0..c5025f3 100644
---- a/filters/kchart/svg/Makefile.am
-+++ b/filters/kchart/svg/Makefile.am
-@@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartsvgexport.la
- 
- libkchartsvgexport_la_SOURCES = svgexport.cc
--libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	svgexport.h
-diff --git a/filters/kchart/xbm/Makefile.am b/filters/kchart/xbm/Makefile.am
-index 5c21b89..7a1a859 100644
---- a/filters/kchart/xbm/Makefile.am
-+++ b/filters/kchart/xbm/Makefile.am
-@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartxbmexport.la
- 
- libkchartxbmexport_la_SOURCES = xbmexport.cpp
--libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	xbmexport.h
-diff --git a/filters/kchart/xpm/Makefile.am b/filters/kchart/xpm/Makefile.am
-index 387dbee..3cb421d 100644
---- a/filters/kchart/xpm/Makefile.am
-+++ b/filters/kchart/xpm/Makefile.am
-@@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkchartxpmexport.la
- 
- libkchartxpmexport_la_SOURCES = xpmexport.cpp
--libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	xpmexport.h
-diff --git a/filters/kivio/imageexport/Makefile.am b/filters/kivio/imageexport/Makefile.am
-index 9e5fae9..04d03c5 100644
---- a/filters/kivio/imageexport/Makefile.am
-+++ b/filters/kivio/imageexport/Makefile.am
-@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la
- 
- libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \
- 	kivio_imageexportwidget.ui kivio_imageexportdialog.cpp
--libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS)
- 
- service_DATA = kivio_image_export.desktop
-diff --git a/filters/kpresenter/bmp/Makefile.am b/filters/kpresenter/bmp/Makefile.am
-index 9574baa..2d85478 100644
---- a/filters/kpresenter/bmp/Makefile.am
-+++ b/filters/kpresenter/bmp/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresenterbmpexport.la
- 
- libkpresenterbmpexport_la_SOURCES = bmpexport.cpp
--libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	bmpexport.h
-diff --git a/filters/kpresenter/jpeg/Makefile.am b/filters/kpresenter/jpeg/Makefile.am
-index 34540bb..40a3109 100644
---- a/filters/kpresenter/jpeg/Makefile.am
-+++ b/filters/kpresenter/jpeg/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresenterjpegexport.la
- 
- libkpresenterjpegexport_la_SOURCES = jpegexport.cpp
--libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	jpegexport.h
-diff --git a/filters/kpresenter/mng/Makefile.am b/filters/kpresenter/mng/Makefile.am
-index 966197c..e51e800 100644
---- a/filters/kpresenter/mng/Makefile.am
-+++ b/filters/kpresenter/mng/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresentermngexport.la
- 
- libkpresentermngexport_la_SOURCES = mngexport.cpp
--libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	mngexport.h
-diff --git a/filters/kpresenter/png/Makefile.am b/filters/kpresenter/png/Makefile.am
-index 9a05d53..0872168 100644
---- a/filters/kpresenter/png/Makefile.am
-+++ b/filters/kpresenter/png/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresenterpngexport.la
- 
- libkpresenterpngexport_la_SOURCES = pngexport.cpp
--libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	pngexport.h
-diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am
-index 764bd30..d4b0b85 100644
---- a/filters/kpresenter/svg/Makefile.am
-+++ b/filters/kpresenter/svg/Makefile.am
-@@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresentersvgexport.la
- 
- libkpresentersvgexport_la_SOURCES = svgexport.cc
--libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	svgexport.h
-diff --git a/filters/kpresenter/xbm/Makefile.am b/filters/kpresenter/xbm/Makefile.am
-index 7cdb0e8..b57ad5f 100644
---- a/filters/kpresenter/xbm/Makefile.am
-+++ b/filters/kpresenter/xbm/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresenterxbmexport.la
- 
- libkpresenterxbmexport_la_SOURCES = xbmexport.cpp
--libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	xbmexport.h
-diff --git a/filters/kpresenter/xpm/Makefile.am b/filters/kpresenter/xpm/Makefile.am
-index 188027b..5ce1efa 100644
---- a/filters/kpresenter/xpm/Makefile.am
-+++ b/filters/kpresenter/xpm/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
- kde_module_LTLIBRARIES = libkpresenterxpmexport.la
- 
- libkpresenterxpmexport_la_SOURCES = xpmexport.cpp
--libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS)
- noinst_HEADERS = \
- 	xpmexport.h
-diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am
-index eac8fb4..f85c2ac 100644
---- a/filters/kspread/applixspread/Makefile.am
-+++ b/filters/kspread/applixspread/Makefile.am
-@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la
- 
- libapplixspreadimport_la_SOURCES = applixspreadimport.cc
- libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS)
--libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- noinst_HEADERS = applixspreadimport.h
- 
- METASOURCES = AUTO
-diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am
-index c1e6049..cea95e5 100644
---- a/filters/kspread/dbase/Makefile.am
-+++ b/filters/kspread/dbase/Makefile.am
-@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la
- 
- libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp
- libdbaseimport_la_LIBADD = $(KOFFICE_LIBS)
--libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- noinst_HEADERS = dbaseimport.h dbase.h
- 
- METASOURCES = AUTO
-diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am
-index 34adf0c..fffd45e 100644
---- a/filters/kspread/excel/import/Makefile.am
-+++ b/filters/kspread/excel/import/Makefile.am
-@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la
- 
- libexcelimport_la_SOURCES = excelimport.cc 
- libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la
--libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
-+libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- noinst_HEADERS = excelimport.h
- 
- METASOURCES = AUTO
-diff --git a/filters/kugar/kugarnop/Makefile.am b/filters/kugar/kugarnop/Makefile.am
-index fa2e3d4..bf5bac0 100644
---- a/filters/kugar/kugarnop/Makefile.am
-+++ b/filters/kugar/kugarnop/Makefile.am
-@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
- kde_module_LTLIBRARIES = libkugarnopimport.la
- 
- libkugarnopimport_la_SOURCES = kugarnopimport.cpp
--libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS)
- 
- noinst_HEADERS = kugarnopimport.h 
-diff --git a/filters/kword/hancomword/Makefile.am b/filters/kword/hancomword/Makefile.am
-index 55f6a99..535abf0 100644
---- a/filters/kword/hancomword/Makefile.am
-+++ b/filters/kword/hancomword/Makefile.am
-@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la
- 
- libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp
- libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) 
--libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- noinst_HEADERS = pole.h hancomwordimport.h
- 
- METASOURCES = AUTO
-diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am
-index 7de039c..deb8887 100644
---- a/filters/kword/msword/Makefile.am
-+++ b/filters/kword/msword/Makefile.am
-@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libmswordimport.la
- 
- libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \
- 	texthandler.cpp tablehandler.cpp graphicshandler.cpp
--libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS)
- 
- METASOURCES = AUTO
-diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am
-index 423261e..596315f 100644
---- a/filters/kword/mswrite/Makefile.am
-+++ b/filters/kword/mswrite/Makefile.am
-@@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la
- libmswriteimport_la_SOURCES = mswriteimport.cc \
- 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc
- 
--libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libmswriteimport_la_LIBADD = $(KOFFICE_LIBS)
- 
- libmswriteexport_la_SOURCES = mswriteexport.cc	\
- 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp
--libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la
- 
- noinst_HEADERS = mswriteimport.h mswriteexport.h \
-diff --git a/filters/kword/pdf/Makefile.am b/filters/kword/pdf/Makefile.am
-index 2a063f0..afcf443 100644
---- a/filters/kword/pdf/Makefile.am
-+++ b/filters/kword/pdf/Makefile.am
-@@ -9,8 +9,8 @@ kde_module_LTLIBRARIES = libpdfimport.la
- libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \
-                           FilterPage.cpp FilterDevice.cpp \
-                           pdfdocument.cpp dialog.cpp pdfimport.cpp
--libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--libpdfimport_la_LIBADD = $(LIB_KOFFICECORE) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la
-+libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libpdfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la
- 
- METASOURCES = dialog.moc pdfimport.moc
- 
-diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am
-index fdf7466..d5bb41e 100644
---- a/filters/xsltfilter/export/Makefile.am
-+++ b/filters/xsltfilter/export/Makefile.am
-@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIB
- kde_module_LTLIBRARIES = libxsltexport.la
- 
- libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui
--libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libxsltexport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
- 
- noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h
-diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am
-index e72b85a..c1e58a4 100644
---- a/filters/xsltfilter/import/Makefile.am
-+++ b/filters/xsltfilter/import/Makefile.am
-@@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES)  $(all_includes) $(LIBXML_CFLAGS) $(LI
- kde_module_LTLIBRARIES = libxsltimport.la
- 
- libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui
--libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-+libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- libxsltimport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
- 
- noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h
-diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am
-index a61e0e6..da55ebc 100644
---- a/karbon/plugins/flattenpath/Makefile.am
-+++ b/karbon/plugins/flattenpath/Makefile.am
-@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
- kde_module_LTLIBRARIES = karbon_flattenpathplugin.la
- 
- karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc
--karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
--				../../libkarboncommon.la
-+karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+				$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
- partplugins_DATA = flattenpathplugin.rc
-diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am
-index f476cc2..4459522 100644
---- a/karbon/plugins/imagetool/Makefile.am
-+++ b/karbon/plugins/imagetool/Makefile.am
-@@ -5,10 +5,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
- kde_module_LTLIBRARIES = karbon_imagetoolplugin.la
- 
- karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc
--karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
--				../../libkarboncommon.la
-+karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+				$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
- 
-diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am
-index 1e01481..46f350c 100644
---- a/karbon/plugins/insertknots/Makefile.am
-+++ b/karbon/plugins/insertknots/Makefile.am
-@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
- kde_module_LTLIBRARIES = karbon_insertknotsplugin.la
- 
- karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc
--karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) \
--					../../libkarboncommon.la
-+karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+					$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
- partplugins_DATA = insertknotsplugin.rc
-diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am
-index 7a3ee55..a4c6ac2 100644
---- a/karbon/plugins/roundcorners/Makefile.am
-+++ b/karbon/plugins/roundcorners/Makefile.am
-@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
- kde_module_LTLIBRARIES = karbon_roundcornersplugin.la
- 
- karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc
--karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) \
--					../../libkarboncommon.la
-+karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+					$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
- partplugins_DATA = roundcornersplugin.rc
-diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am
-index 8a534c8..23ba030 100644
---- a/karbon/plugins/shadoweffect/Makefile.am
-+++ b/karbon/plugins/shadoweffect/Makefile.am
-@@ -3,10 +3,10 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/karbon  -I$
- kde_module_LTLIBRARIES = karbon_shadoweffectplugin.la
- 
- karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc 
--karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
--					../../libkarboncommon.la
-+karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+					$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
- partplugins_DATA = shadoweffectplugin.rc
-diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am
-index 600ccc6..cd8223d 100644
---- a/karbon/plugins/whirlpinch/Makefile.am
-+++ b/karbon/plugins/whirlpinch/Makefile.am
-@@ -3,11 +3,11 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/cor
- kde_module_LTLIBRARIES = karbon_whirlpinchplugin.la
- 
- karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cc
--karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) \
-+karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
- 				../../libkarboncommon.la
- 
- 
--karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- partpluginsdir   = $(kde_datadir)/karbon/kpartplugins
- partplugins_DATA = whirlpinchplugin.rc
-diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am
-index ef50f24..74dcf60 100644
---- a/karbon/plugins/zoomtool/Makefile.am
-+++ b/karbon/plugins/zoomtool/Makefile.am
-@@ -5,10 +5,10 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
- kde_module_LTLIBRARIES = karbon_zoomtoolplugin.la
- 
- karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc
--karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \
--				../../libkarboncommon.la
-+karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-+				$(LIB_KOPAINTER) ../../libkarboncommon.la
- 
--karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN)
-+karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(all_libraries) -module $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
- 
-diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am
-index ef666c1..f90ebb6 100644
---- a/karbon/tools/Makefile.am
-+++ b/karbon/tools/Makefile.am
-@@ -56,8 +56,8 @@ karbon_defaulttools_la_SOURCES = \
- 	vtexttool.cc \
- 	vdefaulttools.cc
- 
--karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) ../libkarboncommon.la
--karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kopainter/.libs/ -lkopainter
-+karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la
-+karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio
- 
- karbon_defaulttools_la_METASOURCES = \
- 	AUTO
-diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am
-index 72571e4..dd87e8b 100644
---- a/kexi/formeditor/factories/Makefile.am
-+++ b/kexi/formeditor/factories/Makefile.am
-@@ -4,13 +4,15 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
- 	-I$(top_srcdir)/kexi/core \
- 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
- kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la
--kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
-+kformdesigner_containers_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- kformdesigner_containers_la_SOURCES =  containerfactory.cpp
--kformdesigner_containers_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
-+kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	../../../lib/koproperty/libkoproperty.la
- 
--kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty
-+kformdesigner_stdwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- kformdesigner_stdwidgets_la_SOURCES =  stdwidgetfactory.cpp
--kformdesigner_stdwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
-+kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+	../../../lib/koproperty/libkoproperty.la
- 
- 
- servicesdir=$(kde_servicesdir)/kformdesigner
-diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am
-index 2892bed..1678d52 100644
---- a/kexi/kexidb/drivers/mySQL/Makefile.am
-+++ b/kexi/kexidb/drivers/mySQL/Makefile.am
-@@ -16,13 +16,13 @@ kexidb_mysqldriver_la_SOURCES = \
-   mysqlkeywords.cpp \
-   mysqlpreparedstatement.cpp
- 
--kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \
-+kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \
-   $(LIB_QT) \
-   $(MYSQL_LIBS) \
-   -lmysqlclient \
-   ../../libkexidb.la
- 
--kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
-+kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- 
- kde_services_DATA = kexidb_mysqldriver.desktop
-diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am
-index 03dccbc..38fef64 100644
---- a/kexi/kexidb/drivers/pqxx/Makefile.am
-+++ b/kexi/kexidb/drivers/pqxx/Makefile.am
-@@ -9,11 +9,11 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO
- kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
- 	pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp
- 
--kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
-+kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
- 
- kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
- 	-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \
--	-lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore
-+	-lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- kde_services_DATA = kexidb_pqxxsqldriver.desktop
- 
-diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am
-index 9d124bc..2722ea1 100644
---- a/kexi/kexidb/drivers/sqlite/Makefile.am
-+++ b/kexi/kexidb/drivers/sqlite/Makefile.am
-@@ -11,12 +11,13 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu
- sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \
- sqlitealter.cpp
- 
--kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
-+kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
-  $(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \
-  $(top_builddir)/kexi/kexidb/libkexidb.la \
-- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
-+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
-+ ../../../../kexi/kexiutils/libkexiutils.la
- 
--kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
-+kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- 
- kde_services_DATA = kexidb_sqlite3driver.desktop
-diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am
-index bd07f28..7484a27 100644
---- a/kexi/kexidb/drivers/sqlite2/Makefile.am
-+++ b/kexi/kexidb/drivers/sqlite2/Makefile.am
-@@ -15,12 +15,13 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO
- kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \
- 	sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp
- 
--kexidb_sqlite2driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
-+kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
-  $(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \
-  $(top_builddir)/kexi/kexidb/libkexidb.la \
-- $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
-+ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
-+ ../../../../kexi/kexiutils/libkexiutils.la
- 
--kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils
-+kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- 
- kde_services_DATA = kexidb_sqlite2driver.desktop
-diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am
-index 9423931..63b9626 100644
---- a/kexi/migration/mysql/Makefile.am
-+++ b/kexi/migration/mysql/Makefile.am
-@@ -8,9 +8,11 @@ keximigrate_mysql_la_METASOURCES = AUTO
- 
- keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
- 
--keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient
-+keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la
- 
--keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
-+keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- kde_services_DATA = keximigrate_mysql.desktop
- 
-diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am
-index 8405de9..bdf7630 100644
---- a/kexi/migration/pqxx/Makefile.am
-+++ b/kexi/migration/pqxx/Makefile.am
-@@ -10,9 +10,11 @@ keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp
- 
- #TODO share -libs with pqxx kexidb drv!
- #keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
--keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la
-+keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la
- 
--keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
-+keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- kde_services_DATA = keximigrate_pqxx.desktop
- 
-diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am
-index 2cc9688..7d6d077 100644
---- a/kexi/plugins/forms/Makefile.am
-+++ b/kexi/plugins/forms/Makefile.am
-@@ -4,31 +4,45 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la
- 
- kexihandler_form_la_SOURCES = kexiforms.cpp
- 
--kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
--kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
- 	$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
- 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
- 	$(top_builddir)/lib/koproperty/libkoproperty.la \
--	./libkexiformutils.la
-+	./libkexiformutils.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la \
-+	../../../kexi/widget/libkexiextendedwidgets.la \
-+	../../../kexi/widget/utils/libkexiguiutils.la
- 
--kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
-+
-+kformdesigner_kexidbwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
--kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
-+kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--	./libkexiformutils.la
-+	./libkexiformutils.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la \
-+	../../../kexi/widget/libkexiextendedwidgets.la \
-+	../../../kexi/widget/utils/libkexiguiutils.la
-+
- 
- lib_LTLIBRARIES = libkexiformutils.la
- libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgetinfo.cpp \
- 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
- 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
- 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
--libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils
--libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
--	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
-+	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la \
-+	../../../kexi/widget/libkexiextendedwidgets.la \
-+	../../../kexi/widget/utils/libkexiguiutils.la
- 
- kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
- kformdesignerservices_DATA=kformdesigner_kexidbfactory.desktop
-diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am
-index 5249d93..dba9018 100644
---- a/kexi/plugins/importexport/csv/Makefile.am
-+++ b/kexi/plugins/importexport/csv/Makefile.am
-@@ -5,10 +5,13 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la
- kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \
- 	kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp
- 
--kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
--	-L../../../../kexi/main/.libs/ -lkeximain -L../../../../kexi/widget/.libs/ -lkexiextendedwidgets
--kexihandler_csv_importexport_la_LIBADD = ../../../core/libkexicore.la \
--	../../../migration/libkeximigrate.la
-+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \
-+	../../../migration/libkeximigrate.la \
-+	../../../../kexi/kexidb/libkexidb.la \
-+	../../../../kexi/kexiutils/libkexiutils.la \
-+	../../../../kexi/main/libkeximain.la \
-+	../../../../kexi/widget/libkexiextendedwidgets.la
- 
- INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
- 		-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \
-diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am
-index 3c15d37..2d92873 100644
---- a/kexi/plugins/migration/Makefile.am
-+++ b/kexi/plugins/migration/Makefile.am
-@@ -4,9 +4,11 @@ kde_module_LTLIBRARIES = kexihandler_migration.la
- 
- kexihandler_migration_la_SOURCES = keximigrationpart.cpp
- 
--kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
--kexihandler_migration_la_LIBADD = ../../core/libkexicore.la \
--	../../migration/libkeximigrate.la
-+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
-+	../../migration/libkeximigrate.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la
- 
- INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
- 		-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/migration \
-diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am
-index 1b1052d..5dbb14f 100644
---- a/kexi/plugins/queries/Makefile.am
-+++ b/kexi/plugins/queries/Makefile.am
-@@ -5,13 +5,16 @@ kde_module_LTLIBRARIES = kexihandler_query.la
- kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \
- 				kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \
- 				kexiqueryview.cpp
--kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/kexidb/parser/.libs/ -lkexidbparser
--kexihandler_query_la_LIBADD = ../../core/libkexicore.la \
-+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
-   $(top_builddir)/kexi/kexidb/libkexidb.la \
-   $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-   $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
-   $(top_builddir)/kexi/widget/relations/libkexirelationsview.la \
--  $(top_builddir)/lib/koproperty/libkoproperty.la
-+  $(top_builddir)/lib/koproperty/libkoproperty.la \
-+  ../../../kexi/kexidb/libkexidb.la \
-+  ../../../kexi/kexiutils/libkexiutils.la \
-+  ../../../kexi/kexidb/parser/libkexidbparser.la
- 
- INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
- 	-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/tableview \
-diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am
-index 47a263a..779b47e 100644
---- a/kexi/plugins/relations/Makefile.am
-+++ b/kexi/plugins/relations/Makefile.am
-@@ -8,9 +8,11 @@ kde_module_LTLIBRARIES = kexihandler_relation.la
- kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \
- 				kexirelationmaindlg.cpp
- 
--kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils
--kexihandler_relation_la_LIBADD = ../../core/libkexicore.la \
--	../../widget/relations/libkexirelationsview.la
-+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
-+	../../widget/relations/libkexirelationsview.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la
- 
- INCLUDES= -I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
- 		-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/widget/relations \
-diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am
-index e9d0889..6b857e7 100644
---- a/kexi/plugins/scripting/kexiscripting/Makefile.am
-+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am
-@@ -7,14 +7,16 @@ kexihandler_script_la_SOURCES = \
- 
- kexihandler_script_la_LDFLAGS = \
-     $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \
--    -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexidb/.libs/ -lkexidb -L../../../../kexi/kexiutils/.libs/ -lkexiutils \
--    -L../../../../lib/kross/api/.libs/ -lkrossapi
-+    -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
--kexihandler_script_la_LIBADD = \
-+kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \
-     $(top_builddir)/lib/kross/main/libkrossmain.la \
-     $(top_builddir)/kexi/core/libkexicore.la \
-     $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--    $(top_builddir)/lib/koproperty/libkoproperty.la
-+    $(top_builddir)/lib/koproperty/libkoproperty.la \
-+    ../../../../kexi/kexidb/libkexidb.la \
-+    ../../../../kexi/kexiutils/libkexiutils.la \
-+    ../../../../lib/kross/api/libkrossapi.la
- 
- INCLUDES = \
-     $(KOFFICE_INCLUDES) \
-diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am
-index 2ee5a4a..eb38839 100644
---- a/kexi/plugins/tables/Makefile.am
-+++ b/kexi/plugins/tables/Makefile.am
-@@ -5,12 +5,14 @@ kde_module_LTLIBRARIES = kexihandler_table.la
- kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \
- 	kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp
- 
--kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -lkmdi
--kexihandler_table_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
-+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkmdi
-+kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
- 	$(top_builddir)/kexi/kexidb/libkexidb.la \
- 	$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
- 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
--	$(top_builddir)/lib/koproperty/libkoproperty.la
-+	$(top_builddir)/lib/koproperty/libkoproperty.la \
-+	../../../kexi/kexidb/libkexidb.la \
-+	../../../kexi/kexiutils/libkexiutils.la
- 
- INCLUDES= $(KOFFICE_INCLUDES) \
- 	-I$(top_srcdir)/kexi/core -I$(top_srcdir)/kexi \
-diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am
-index 940e7c1..85eeab3 100644
---- a/kexi/tests/newapi/Makefile.am
-+++ b/kexi/tests/newapi/Makefile.am
-@@ -18,8 +18,9 @@ METASOURCES = AUTO
- kexidbtest_SOURCES = main.cpp
- kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
-  ../../kexidb/parser/libkexidbparser.la \
-- $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
--kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable
-+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-+ ../../widget/tableview/libkexidatatable.la
-+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
- 
- #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
- #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
-diff --git a/kformula/Makefile.am b/kformula/Makefile.am
-index e5b882a..fa49a75 100644
---- a/kformula/Makefile.am
-+++ b/kformula/Makefile.am
-@@ -6,8 +6,8 @@ kde_module_LTLIBRARIES = libkformulapart.la
- libkformulapart_la_SOURCES = kformula_doc.cc \
- 	kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \
- 	kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc
--libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
--libkformulapart_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KFORMULA) $(LIB_KOTEXT)
-+libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts
-+libkformulapart_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIB_KOTEXT)
- libkformulapart_la_METASOURCES = AUTO
- 
- ## The kdeinit loadable module
-diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am
-index 45af1cb..d5ca3fe 100644
---- a/kivio/plugins/kivioconnectortool/Makefile.am
-+++ b/kivio/plugins/kivioconnectortool/Makefile.am
-@@ -25,8 +25,8 @@ EXTRA_DIST = \
- 		kivio_connector_cursor2.xpm\
- 		kivio_connector_cursor1.xpm
- 
--libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui
--libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
-+libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
- 
- rc_DATA = kivioconnectortool.rc
- rcdir = $(kde_datadir)/kivio/kpartplugins
-diff --git a/kivio/plugins/kivioselecttool/Makefile.am b/kivio/plugins/kivioselecttool/Makefile.am
-index 56bddbc..3cbe78a 100644
---- a/kivio/plugins/kivioselecttool/Makefile.am
-+++ b/kivio/plugins/kivioselecttool/Makefile.am
-@@ -19,8 +19,8 @@ EXTRA_DIST = \
- 		tool_select.cpp\
- 		tool_select.h\
- 		kivioselecttool.rc
--libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui
--libkivioselecttool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
-+libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkivioselecttool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
- 
- rc_DATA = kivioselecttool.rc
- rcdir = $(kde_datadir)/kivio/kpartplugins
-diff --git a/kivio/plugins/kiviotargettool/Makefile.am b/kivio/plugins/kiviotargettool/Makefile.am
-index c3335a1..888b11f 100644
---- a/kivio/plugins/kiviotargettool/Makefile.am
-+++ b/kivio/plugins/kiviotargettool/Makefile.am
-@@ -8,8 +8,8 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
- METASOURCES = AUTO
- 
- kde_module_LTLIBRARIES =  libkiviotargettool.la
--libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui
--libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
-+libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkiviotargettool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
- libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp
- 
- noinst_HEADERS =  kiviotargettool.h kiviotargettoolfactory.h
-diff --git a/kivio/plugins/kiviotexttool/Makefile.am b/kivio/plugins/kiviotexttool/Makefile.am
-index d250466..8b3183f 100644
---- a/kivio/plugins/kiviotexttool/Makefile.am
-+++ b/kivio/plugins/kiviotexttool/Makefile.am
-@@ -22,8 +22,8 @@ EXTRA_DIST = \
- 		kivio_text_cursor.xpm\
- 		Text.sml\
- 		Text.xpm
--libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui
--libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
-+libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(LIB_KOFFICEUI) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
- 
- rc_DATA = kiviotexttool.rc
- rcdir = $(kde_datadir)/kivio/kpartplugins
-diff --git a/kivio/plugins/kiviozoomtool/Makefile.am b/kivio/plugins/kiviozoomtool/Makefile.am
-index bcb513c..5ff1c22 100644
---- a/kivio/plugins/kiviozoomtool/Makefile.am
-+++ b/kivio/plugins/kiviozoomtool/Makefile.am
-@@ -18,8 +18,8 @@ EXTRA_DIST = \
- 		kiviozoomtool.rc\
- 		tool_zoom.cpp\
- 		tool_zoom.h
--libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui
--libkiviozoomtool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
-+libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkiviozoomtool_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
- 
- rc_DATA = kiviozoomtool.rc
- rcdir = $(kde_datadir)/kivio/kpartplugins
-diff --git a/kplato/Makefile.am b/kplato/Makefile.am
-index 6ccd319..865920a 100644
---- a/kplato/Makefile.am
-+++ b/kplato/Makefile.am
-@@ -102,8 +102,8 @@ noinst_HEADERS = \
- ## The part
- lib_LTLIBRARIES = 
- kde_module_LTLIBRARIES = libkplatopart.la
--libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint
--libkplatopart_la_LIBADD = $(LIB_KABC) $(LIB_KOFFICEUI) -lDCOP \
-+libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkdeprint
-+libkplatopart_la_LIBADD = $(LIB_KABC) $(KOFFICE_LIBS) -lDCOP \
-                           $(top_builddir)/kdgantt/libkdgantt.la
- ##                          $(top_builddir)/kugar/lib/libkugarlib.la
- 
-@@ -113,8 +113,8 @@ libkplatopart_la_METASOURCES = AUTO
- kdeinit_LTLIBRARIES = kplato.la
- bin_PROGRAMS =
- kplato_la_SOURCES = main.cc
--kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint
--kplato_la_LIBADD = $(LIB_KOFFICECORE)
-+kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkdeprint
-+kplato_la_LIBADD = $(KOFFICE_LIBS)
- 
- xdg_apps_DATA = kplato.desktop
- 
-diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am
-index 401160c..69f5b18 100644
---- a/kpresenter/Makefile.am
-+++ b/kpresenter/Makefile.am
-@@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \
- 	slidetransitionwidget.ui KPrSlideTransitionDia.cpp \
- 	KPrPrinterDlg.cpp
- 
--libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts $(LIBKSPELL2)
- if include_ARTS
- ARTSKDE = -lartskde
- endif
-diff --git a/kspread/Makefile.am b/kspread/Makefile.am
-index 63bc28a..d65764f 100644
---- a/kspread/Makefile.am
-+++ b/kspread/Makefile.am
-@@ -28,7 +28,7 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \
- 		kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \
- 	kspread_generalProperty.cpp kspread_propertyEditor.cpp 
- 
--libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lkutils
- libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
- 	dialogs/libdialogs.la tests/libtests.la \
- 	$(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell
-diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am
-index 6bfe86f..c9f1f55 100644
---- a/kspread/plugins/scripting/kspreadcore/Makefile.am
-+++ b/kspread/plugins/scripting/kspreadcore/Makefile.am
-@@ -7,8 +7,9 @@ kde_module_LTLIBRARIES = krosskspreadcore.la
- 
- krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp
- 
--krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui
-+krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- krosskspreadcore_la_LIBADD = \
-+    $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
-     $(LIB_QT) \
-     $(LIB_KDECORE) \
-     $(top_builddir)/lib/kross/api/libkrossapi.la \
-diff --git a/kword/Makefile.am b/kword/Makefile.am
-index 523c2d9..1b89a71 100644
---- a/kword/Makefile.am
-+++ b/kword/Makefile.am
-@@ -9,8 +9,8 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la
- 
- ## The part
- libkwordpart_la_SOURCES = KWFactoryInit.cpp
--libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
--libkwordpart_la_LIBADD = libkwordprivate.la
-+libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la
- 
- ## A lib with all the code
- libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWFormulaFrameSet.cpp \
-@@ -54,15 +54,15 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm
- 		KWLoadingInfo.cpp
- 
- 
--libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
--libkwordprivate_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la 
-+libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts $(LIBKSPELL2)
-+libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la 
- 
- METASOURCES = AUTO
- 
- ## The mailmerge interface library
- libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel
--libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
--libkwmailmerge_interface_la_LIBADD = $(LIB_QT) -lDCOP
-+libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP
- kwincludedir = $(includedir)/kword
- kwinclude_HEADERS = KWMailMergeDataSource.h
- 
-@@ -73,8 +73,8 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir)
- kdeinit_LTLIBRARIES = kword.la
- bin_PROGRAMS =
- kword_la_SOURCES = main.cpp
--kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore
--kword_la_LIBADD = $(LIB_KOFFICECORE)
-+kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kword_la_LIBADD = $(KOFFICE_LIBS)
- 
- xdg_apps_DATA = kword.desktop
- 
-diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am
-index 497897c..ccc86c5 100644
---- a/kword/mailmerge/Makefile.am
-+++ b/kword/mailmerge/Makefile.am
-@@ -6,8 +6,8 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la
- 
- ## Plugin encapsulating the (old) internally stored style
- kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp
--kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore
--kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT)
-+kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT)
- 
- METASOURCES = AUTO
- 
-diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am
-index de7f026..d5a8535 100644
---- a/kword/mailmerge/kabc/Makefile.am
-+++ b/kword/mailmerge/kabc/Makefile.am
-@@ -7,8 +7,8 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la
- 
- ## Plugin encapsulating the QT SQL database interface
- kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui
--kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC)
-+kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC)
- 
- METASOURCES = AUTO
- 
-diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am
-index dfb5e2d..04bb0b1 100644
---- a/kword/mailmerge/kspread/Makefile.am
-+++ b/kword/mailmerge/kspread/Makefile.am
-@@ -6,8 +6,8 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES)  \
- kde_module_LTLIBRARIES = kwmailmerge_kspread.la
- 
- kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp
--kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kwmailmerge_kspread_la_LIBADD = ../../libkwmailmerge_interface.la \
-+kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \
-                                 $(top_builddir)/kspread/libkspreadcommon.la $(LIB_KDEUI)
- 
- METASOURCES = AUTO
-diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am
-index 4dd4816..082ddc3 100644
---- a/kword/mailmerge/sql/Makefile.am
-+++ b/kword/mailmerge/sql/Makefile.am
-@@ -6,14 +6,14 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la
- ## Plugin encapsulating the QT SQL database interface
- kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \
- 				 KWQtSqlEasyFilter.cpp
--kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
-+kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
- kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h
- 
- ## 2. Plugin encapsulating the QT SQL database interface
- kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel
--kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
-+kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
- kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h
- 
- # Common files
-diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am
-index efeee86..81e8a65 100644
---- a/tools/kfile-plugins/abiword/Makefile.am
-+++ b/tools/kfile-plugins/abiword/Makefile.am
-@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_abiword.h
- kde_module_LTLIBRARIES = kfile_abiword.la
- 
- kfile_abiword_la_SOURCES = kfile_abiword.cpp
--kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kfile_abiword_la_LIBADD = $(LIB_KOFFICECORE)
-+kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kfile_abiword_la_LIBADD = $(KOFFICE_LIBS)
- 
- # let automoc handle all of the meta source files (moc)
- METASOURCES = AUTO
-diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am
-index 94c90e9..c5d9704 100644
---- a/tools/kfile-plugins/gnumeric/Makefile.am
-+++ b/tools/kfile-plugins/gnumeric/Makefile.am
-@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_gnumeric.h
- kde_module_LTLIBRARIES = kfile_gnumeric.la
- 
- kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp
--kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kfile_gnumeric_la_LIBADD = $(LIB_KOFFICECORE)
-+kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS)
- 
- # let automoc handle all of the meta source files (moc)
- METASOURCES = AUTO
-diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am
-index a4770ce..6d81afa 100644
---- a/tools/kfile-plugins/koffice/Makefile.am
-+++ b/tools/kfile-plugins/koffice/Makefile.am
-@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_koffice.h
- kde_module_LTLIBRARIES = kfile_koffice.la
- 
- kfile_koffice_la_SOURCES = kfile_koffice.cpp
--kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kfile_koffice_la_LIBADD = $(LIB_KOFFICECORE)
-+kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kfile_koffice_la_LIBADD = $(KOFFICE_LIBS)
- 
- # let automoc handle all of the meta source files (moc)
- METASOURCES = AUTO
-diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am
-index 8c785ef..1e47978 100644
---- a/tools/kfile-plugins/ooo/Makefile.am
-+++ b/tools/kfile-plugins/ooo/Makefile.am
-@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_ooo.h
- kde_module_LTLIBRARIES = kfile_ooo.la
- 
- kfile_ooo_la_SOURCES = kfile_ooo.cpp
--kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
--kfile_ooo_la_LIBADD = $(LIB_KOFFICECORE)
-+kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
-+kfile_ooo_la_LIBADD = $(KOFFICE_LIBS)
- 
- # let automoc handle all of the meta source files (moc)
- METASOURCES = AUTO
-diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am
-index f63fd83..cf41afd 100644
---- a/tools/thumbnail/Makefile.am
-+++ b/tools/thumbnail/Makefile.am
-@@ -4,12 +4,12 @@ METASOURCES = AUTO
- kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la
- 
- clipartthumbnail_la_SOURCES = clipartcreator.cpp
--clipartthumbnail_la_LIBADD = $(LIB_KOFFICECORE) # for KoClipartCollection
--clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore
-+clipartthumbnail_la_LIBADD = $(KOFFICE_LIBS) # for KoClipartCollection
-+clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- kofficethumbnail_la_SOURCES = kofficecreator.cpp
--kofficethumbnail_la_LIBADD = $(LIB_KOFFICECORE)
--kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore
-+kofficethumbnail_la_LIBADD = $(KOFFICE_LIBS)
-+kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts
- 
- # otherofficethumbnail.desktop is currently not installed, as it gives too many problems
- kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 909107727..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h.ORI	2012-04-26 20:22:29.322777779 +0200
-+++ koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h	2012-04-26 20:23:21.216311169 +0200
-@@ -137,12 +137,12 @@
-             }
-             initiales = initiales.upper();
-             // set/get general
--            addFunction("set" + initiales, &Iterator::setPixel);
--            addFunction("get" + initiales, &Iterator::getPixel);
-+            this->addFunction("set" + initiales, &Iterator::setPixel);
-+            this->addFunction("get" + initiales, &Iterator::getPixel);
-             kdDebug(41011) << ( "get" + initiales ) << endl;
-             // Various colorSpace
--            addFunction("invertColor", &Iterator::invertColor);
--            addFunction("darken", &Iterator::darken);
-+            this->addFunction("invertColor", &Iterator::invertColor);
-+            this->addFunction("darken", &Iterator::darken);
-         }
-     
-         ~Iterator()
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch b/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch
deleted file mode 100644
index bf714ab8a..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_lcms_detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- koffice/chalk/configure.in.in.ORI	2012-08-05 22:30:11.362533703 +0200
-+++ koffice/chalk/configure.in.in	2012-08-05 22:30:31.456987824 +0200
-@@ -48,7 +48,7 @@
- fi
- 
- 
--ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
-+ac_link='$LIBTOOL_SHELL --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
- 
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
-     	AC_MSG_RESULT(yes)
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch b/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
deleted file mode 100644
index 004bb0225..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_libpng.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- koffice/filters/chalk/png/kis_png_converter.cc	2011-06-27 13:54:18.000000000 -0500
-+++ koffice/filters/chalk/png/kis_png_converter.cc.new	2011-11-07 15:38:47.918508855 -0600
-@@ -785,7 +785,7 @@
- 
- void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
- {
--    if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return;
-+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
- //     setProgress(row_number);
- }
- 
---- koffice/filters/chalk/png/kis_png_converter.cc.gcc47	2012-04-26 16:38:35.805156927 -0400
-+++ koffice/filters/chalk/png/kis_png_converter.cc	2012-04-26 16:49:27.179323394 -0400
-@@ -43,6 +43,8 @@
- #include <kis_paint_layer.h>
- #include <kis_group_layer.h>
- 
-+#include <zlib.h>
-+
- namespace {
- 
-     const TQ_UINT8 PIXEL_BLUE = 0;
-@@ -222,6 +224,7 @@
-     
-     // Read image profile
-     png_charp profile_name, profile_data;
-+    unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
-     int compression_type;
-     png_uint_32 proflen;
-     int number_of_passes = 1;
-@@ -230,7 +233,7 @@
-         number_of_passes = png_set_interlace_handling(png_ptr);
- 
-     KisProfile* profile = 0;
--    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
-+    if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
-     {
-         TQByteArray profile_rawdata;
-         // XXX: Hardcoded for icc type -- is that correct for us?
-@@ -627,7 +630,7 @@
-         } else { // Profile
-             char* name = new char[(*it)->type().length()+1];
-             strcpy(name, (*it)->type().ascii());
--            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-+            png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
-         }
-         ++it;
-     }
diff --git a/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch b/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch
deleted file mode 100644
index 9802009fa..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-fix_ruby_1.9.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urN koffice/configure.in koffice.new/configure.in
---- koffice/configure.in	2011-08-21 18:30:53.000000000 -0500
-+++ koffice.new/configure.in	2011-12-08 17:56:31.000000000 -0600
-@@ -1539,14 +1539,22 @@
- # Check for Ruby
- 
- if test "x$compile_kross" = "xyes" ; then
--  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
-+  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
- 
-   if test -n "$RUBY"; then
-     AC_MSG_CHECKING(for Ruby dirs)
-     RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-     RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
--    RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
-+    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
-+      # Ruby 1.9
-+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
-+      RUBY_VERSION_H=ruby/version.h
-+    else
-+      # not Ruby 1.9
-+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
-+      RUBY_VERSION_H=version.h
-+    fi
-     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-     RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
-@@ -1599,7 +1607,7 @@
-           [
-             AC_TRY_COMPILE([
-                 #include <ruby.h>
--                #include <version.h>
-+                #include <$RUBY_VERSION_H>
-             ],[
-             
- #if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
-diff -urN koffice/lib/kross/configure.in.in koffice.new/lib/kross/configure.in.in
---- koffice/lib/kross/configure.in.in	2010-08-11 22:16:27.000000000 -0500
-+++ koffice.new/lib/kross/configure.in.in	2011-12-08 17:56:28.000000000 -0600
-@@ -21,14 +21,22 @@
- # Check for Ruby
- 
- if test "x$compile_kross" = "xyes" ; then
--  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
-+  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
- 
-   if test -n "$RUBY"; then
-     AC_MSG_CHECKING(for Ruby dirs)
-     RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-     RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
--    RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
-+    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
-+      # Ruby 1.9
-+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
-+      RUBY_VERSION_H=ruby/version.h
-+    else
-+      # not Ruby 1.9
-+      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
-+      RUBY_VERSION_H=version.h
-+    fi
-     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-     RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
-@@ -81,7 +89,7 @@
-           [
-             AC_TRY_COMPILE([
-                 #include <ruby.h>
--                #include <version.h>
-+                #include <$RUBY_VERSION_H>
-             ],[
-             
- #if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
-diff -urN koffice/lib/kross/ruby/rubyextension.cpp koffice.new/lib/kross/ruby/rubyextension.cpp
---- koffice/lib/kross/ruby/rubyextension.cpp	2011-08-17 20:25:04.000000000 -0500
-+++ koffice.new/lib/kross/ruby/rubyextension.cpp	2011-12-08 21:18:42.000000000 -0600
-@@ -18,7 +18,7 @@
-  ***************************************************************************/
- #include "rubyextension.h"
- 
--#include <st.h>
-+#include <ruby/st.h>
- 
- #include <tqmap.h>
- #include <tqstring.h>
-@@ -211,7 +211,7 @@
-         case T_ARRAY:
-         {
-             TQValueList<Kross::Api::Object::Ptr> l;
--            for(int i = 0; i < RARRAY(value)->len; i++)
-+            for(int i = 0; i < RARRAY_LEN(value); i++)
-             {
-                 Kross::Api::Object::Ptr o = toObject( rb_ary_entry( value , i ) );
-                 if(o) l.append(o);
-diff -urN koffice/lib/kross/ruby/rubyscript.cpp koffice.new/lib/kross/ruby/rubyscript.cpp
---- koffice/lib/kross/ruby/rubyscript.cpp	2011-06-25 13:42:29.000000000 -0500
-+++ koffice.new/lib/kross/ruby/rubyscript.cpp	2011-12-08 21:45:36.000000000 -0600
-@@ -21,8 +21,8 @@
- 
- #include <ruby.h>
- #include <env.h>
--#include <rubysig.h>
--#include <node.h>
-+#include <ruby/backward/rubysig.h>
-+#include <ruby/node.h>
- 
- #include <main/scriptcontainer.h>
- 
-@@ -70,6 +70,8 @@
-     krossdebug("RubyScript::compile()");
- #endif
-     int critical;
-+    int ruby_nerrs;
-+    int ruby_in_eval;
- 
-     ruby_nerrs = 0;
-     ruby_errinfo = Qnil;
diff --git a/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch b/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch
deleted file mode 100644
index db24095b3..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-kross_utilities_syntax.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py.ORI	2011-11-25 00:13:38.356036607 +0100
-+++ koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py	2011-11-25 00:14:16.794035577 +0100
-@@ -46,11 +46,11 @@
-     if l%2: return args[-1]
- utility_builtins['test'] = test
- 
--def reorder(s, with=None, without=()):
--    # s, with, and without are sequences treated as sets.
--    # The result is subtract(intersect(s, with), without),
--    # unless with is None, in which case it is subtract(s, without).
--    if with is None: with=s
-+def reorder(s, swith=None, swithout=()):
-+    # s, swith, and swithout are sequences treated as sets.
-+    # The result is subtract(intersect(s, swith), swithout),
-+    # unless swith is None, in which case it is subtract(s, swithout).
-+    if swith is None: swith=s
-     d={}
-     tt=type(())
-     for i in s:
-@@ -61,12 +61,12 @@
-     a=r.append
-     h=d.has_key
- 
--    for i in without:
-+    for i in swithout:
-         if type(i) is tt and len(i)==2: k, v = i
-         else:                           k= v = i
-         if h(k): del d[k]
- 
--    for i in with:
-+    for i in swith:
-         if type(i) is tt and len(i)==2: k, v = i
-         else:                           k= v = i
-         if h(k):
diff --git a/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch b/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch
deleted file mode 100644
index e6c683dc9..000000000
--- a/redhat/applications/koffice/koffice-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- koffice/lib/store/Makefile.am.ORI	2012-08-05 21:05:16.181010835 +0200
-+++ koffice/lib/store/Makefile.am	2012-08-05 21:05:25.027837330 +0200
-@@ -7,7 +7,7 @@
- 
- ####### Files
- 
--libkstore_la_LIBADD = $(LIB_KIO)
-+libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
- libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
- libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
- include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h
---- koffice/lib/kwmf/Makefile.am.ORI	2012-08-05 21:09:16.183303850 +0200
-+++ koffice/lib/kwmf/Makefile.am	2012-08-05 21:09:35.742920240 +0200
-@@ -3,7 +3,7 @@
- INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
- libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
- # We use kdecore for kdDebug :)
--libkwmf_la_LIBADD = $(LIB_KDECORE)
-+libkwmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
- 
- ####### Files
- 
-@@ -16,4 +16,4 @@
- 
- libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
- libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
--libkowmf_la_LIBADD = $(LIB_KDECORE)
-+libkowmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
---- koffice/lib/kofficecore/Makefile.am.ORI	2012-08-05 21:12:34.924406087 +0200
-+++ koffice/lib/kofficecore/Makefile.am	2012-08-05 21:12:47.700155525 +0200
-@@ -4,7 +4,7 @@
- KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
- INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
- libkofficecore_la_LIBADD  = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
--	$(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF)
-+	$(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) -lDCOP
- 
- ####### Files
- 
---- koffice/lib/koproperty/Makefile.am.ORI	2012-08-05 21:16:10.320181691 +0200
-+++ koffice/lib/koproperty/Makefile.am	2012-08-05 21:16:17.135048036 +0200
-@@ -2,7 +2,7 @@
- 
- lib_LTLIBRARIES =  libkoproperty.la
- 
--libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la
-+libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_KDECORE)
- libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0
- libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \
- 	editoritem.cpp factory.cpp widget.cpp
---- koffice/kpresenter/Makefile.am.ORI	2012-08-05 21:41:53.120199863 +0200
-+++ koffice/kpresenter/Makefile.am	2012-08-05 21:42:03.358832558 +0200
-@@ -72,7 +72,7 @@
- if include_ARTS
- ARTSKDE = -lartskde
- endif
--libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE)
-+libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -lsoundserver_idl -lmcop
- 
- ## The part
- kde_module_LTLIBRARIES = libkpresenterpart.la
diff --git a/redhat/applications/koffice/koffice-3.5.13.1.spec b/redhat/applications/koffice/koffice-3.5.13.1.spec
deleted file mode 100644
index b2b002f1c..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.1.spec
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Default version for this component
-%define kdecomp koffice
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_kross 1
-%endif
-
-%if 0%{?fedora} >= 17
-%define with_ruby 0
-%else
-%define with_ruby 1
-%endif
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-
-Name:		trinity-%{kdecomp}
-Summary:	An integrated office suite
-Version:	1.6.3
-Release:	6%{?dist}%{?_variant}
-
-Group:          Applications/Productivity
-License:        GPLv2+
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [koffice] Fix compilation with Ruby 1.9 [Bug #735]
-Patch13:	koffice-3.5.13-fix_ruby_1.9.patch 
-
-# BuildRequires: world-devel ;)
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:  trinity-tdegraphics-devel >= 3.5.13.1
-BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel >= 3.5.13.1
-BuildRequires:  automake libtool
-BuildRequires:  freetype-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  libart_lgpl-devel
-%if ( 0%{?mdkversion} || 0%{?mgaversion} ) && 0%{?pclinuxos} == 0
-BuildRequires:  %{_lib}png15-devel
-%else
-BuildRequires:  libpng-devel
-%endif
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  ImageMagick-devel
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  pcre-devel
-BuildRequires:  gettext-devel
-BuildRequires:  mysql-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  doxygen
-BuildRequires:  aspell-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  libexif-devel
-BuildRequires:  readline-devel
-%if 0%{?with_ruby}
-BuildRequires:  ruby ruby-devel >= 1.8.2
-%endif
-%if 0%{?suse_version}
-BuildRequires:	GraphicsMagick >= 1.1.0
-%endif
-BuildRequires:	GraphicsMagick-devel >= 1.1.0
-
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-BuildRequires:  liblcms-devel
-BuildRequires:	utempter-devel
-%else
-BuildRequires:  bzip2-devel
-BuildRequires:  lcms-devel
-BuildRequires:	libutempter-devel
-
-BuildRequires:  libpaper-devel
-%endif
-
-
-# These libraries are either too old or too recent on distributions !
-# We always provide our versions with TDE...
-BuildRequires:	trinity-libwpd-devel
-BuildRequires:  trinity-libpqxx-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-BuildRequires:	%{_lib}xi-devel
-BuildRequires:  wv2-devel
-BuildRequires:	%{_lib}openjpeg-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:  libGL-devel
-BuildRequires:	libGLU-devel
-BuildRequires:  libXi-devel
-BuildRequires:  trinity-wv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:  Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
-BuildRequires:  libXi-devel
-BuildRequires:  wv2-devel
-%endif
-
-%description
-KOffice is an integrated office suite.
-
-%package suite
-Summary:        An integrated office suite
-Group:          Applications/Productivity
-Obsoletes:      %{name} <= %{version}-%{release}
-Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:       %{name}-core = %{version}-%{release} 
-Requires:       %{name}-kword = %{version}-%{release} 
-Requires:       %{name}-kspread = %{version}-%{release} 
-Requires:       %{name}-kpresenter = %{version}-%{release}
-Requires:       %{name}-kivio = %{version}-%{release}
-Requires:       %{name}-karbon = %{version}-%{release}
-Requires:       %{name}-kugar = %{version}-%{release}
-Requires:       %{name}-kexi = %{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
-Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}
-Requires:       %{name}-kchart = %{version}-%{release}
-Requires:       %{name}-kformula = %{version}-%{release}
-Requires:       %{name}-filters = %{version}-%{release}
-Requires:       %{name}-kplato = %{version}-%{release}
-Requires:       %{name}-chalk = %{version}-%{release}
-
-%description suite
-KOffice is an integrated office suite.
-
-%package core
-Summary:        Core support files for %{name} 
-Group:          Applications/Productivity
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       perl
-Conflicts:      koffice-i18n < %{version}
-%description core
-%{summary}.
-
-%package libs
-Summary:        Runtime libraries for %{name} 
-Group:          System Environment/Libraries
-Conflicts:      %{name} <= %{version}-%{release}
-Requires:       trinity-kdelibs
-License:        LGPLv2+
-%description libs
-%{summary}.
-
-%package devel
-Summary:        Development files for %{name} 
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-License:        LGPLv2+
-%description devel
-%{summary}.
-
-%package kword
-Summary:	A frame-based word processor capable of professional standard documents
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kword
-%{summary}.
-
-%package kspread
-Summary:        A powerful spreadsheet application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kspread
-%{summary}.
-
-%package kpresenter
-Summary:        A full-featured presentation program
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kpresenter
-%{summary}.
-
-%package kivio
-Summary:        A flowcharting application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
-%description kivio
-%{summary}.
-
-%package karbon
-Summary:        A vector drawing application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description karbon
-%{summary}.
-
-%package kugar
-Summary:        A tool for generating business quality reports
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kugar
-%{summary}.
-
-%package kexi
-Summary:        An integrated environment for managing data
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kexi
-%{summary}.
-For additional database drivers take a look at %{name}-kexi-driver-*
-
-%package kexi-driver-mysql
-Summary:        Mysql-driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-mysql
-%{summary}.
-
-%package kexi-driver-pgsql
-Summary:        Postgresql driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-pgsql
-%{summary}.
-
-%package kchart
-Summary:        An integrated graph and chart drawing tool
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kchart
-%{summary}.
-
-%package kformula
-Summary:        A powerful formula editor
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		fonts-ttf-dejavu
-%else
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires:       dejavu-lgc-sans-fonts
-Requires:       lyx-cmex10-fonts
-%endif
-%if 0%{?rhel} == 5
-Requires:       dejavu-lgc-fonts 
-Requires:       lyx-cmex10-fonts
-%endif
-%if 0%{?suse_version}
-Requires:       dejavu-fonts 
-%endif
-%endif
-
-%description kformula
-%{summary}.
-
-%package filters
-Summary:        Import and Export Filters for KOffice
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description filters
-%{summary}.
-
-%package kplato
-Summary:         An integrated project management and planning tool
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-%description kplato
-%{summary}.
-
-%package chalk
-Summary:		 pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-Requires:        %{name}-chalk-data = %{version}-%{release}
-Requires:        %{name}-filters
-%description chalk
-Chalk is a painting and image editing application for KOffice. Chalk contains
-both ease-of-use and fun features like guided painting.
-
-This package is part of the TDE Office Suite.
-
-%package chalk-data
-Summary:		data files for Chalk painting program [Trinity]
-Group:           Applications/Productivity
-%description chalk-data
-This package contains architecture-independent data files for Chalk,
-the painting program shipped with the TDE Office Suite.
-
-See the chalk package for further information.
-
-This package is part of the TDE Office Suite.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220
-%patch13 -p1 -b .ruby
-%endif
-
-# use LGC variant instead
-%__sed -i.dejavu-lgc \
-  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
-  -e 's|dejavu sans|dejavu lgc sans|' \
-  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?suse_version} == 1220
-RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
-export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --with-pic --enable-shared --disable-static \
-  --with-extra-libs=%{tde_libdir} \
-  --enable-final \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \
-  --enable-closure \
-  --disable-kexi-macros \
-  --with-pqxx-includes=%{tde_includedir} \
-  --with-pqxx-libraries=%{tde_libdir} \
-%if 0%{?with_kross}
-  --enable-scripting \
-%else
-  --disable-scripting \
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-# Replace absolute symlinks with relative ones
-pushd %{buildroot}%{tde_tdedocdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
-  fi
-done
-popd
-
-desktop-file-install \
-  --dir=%{buildroot}%{tde_tdeappdir} \
-  --vendor="" \
-  --delete-original \
-  %{buildroot}%{tde_datadir}/applnk/Office/*.desktop
-
-## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
-## until http://bugzilla.redhat.com/245190 is fixed
-%if 0%{?rhel} || 0%{?fedora}
-for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do
-  grep "^NoDisplay=" ${desktop_file} || \
-    echo "NoDisplay=True" >> ${desktop_file}
-done
-%endif
-
-## unpackaged files
-# fonts
-rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
-# libtool archives
-rm -f %{buildroot}%{tde_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-# -devel symlinks to nuke
-rm -f %{buildroot}%{tde_libdir}/lib*common.so
-rm -f %{buildroot}%{tde_libdir}/lib*filters.so
-rm -f %{buildroot}%{tde_libdir}/lib*private.so
-rm -f %{buildroot}%{tde_libdir}/libkarbon*.so
-rm -f %{buildroot}%{tde_libdir}/libkchart*.so
-rm -f %{buildroot}%{tde_libdir}/libkexi*.so
-rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{tde_libdir}/libkplato*.so
-rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so
-rm -f %{buildroot}%{tde_libdir}/libkword*.so
-rm -f %{buildroot}%{tde_libdir}/libkross*.so
-rm -f %{buildroot}%{tde_libdir}/libkugar*.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post core
-touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || :
-
-%postun core
-if [ $1 -eq 0 ]; then
-  gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-  update-desktop-database -q &> /dev/null ||:
-fi
-
-%posttrans core
-gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
-%post karbon
-/sbin/ldconfig || :
-
-%postun karbon
-/sbin/ldconfig || :
-
-%post kword
-/sbin/ldconfig || :
-
-%postun kword
-/sbin/ldconfig || :
-
-%posttrans kword
-update-desktop-database -q &> /dev/null ||:
-
-%post kpresenter
-/sbin/ldconfig || :
-
-%postun kpresenter
-/sbin/ldconfig || :
-
-%posttrans kpresenter
-update-desktop-database -q &> /dev/null ||:
-
-%post kugar
-/sbin/ldconfig || :
-
-%postun kugar
-/sbin/ldconfig || :
-
-%posttrans kugar
-update-desktop-database -q &> /dev/null ||:
-
-%post kexi
-/sbin/ldconfig || :
-
-%postun kexi
-/sbin/ldconfig || :
-
-%posttrans kexi
-update-desktop-database -q &> /dev/null ||:
-
-%post kchart
-/sbin/ldconfig || :
-
-%postun kchart
-/sbin/ldconfig || :
-
-%posttrans kchart
-update-desktop-database -q &> /dev/null ||:
-
-%post filters
-/sbin/ldconfig || :
-
-%postun filters
-/sbin/ldconfig || :
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-%post chalk
-/sbin/ldconfig || :
-
-%postun chalk
-/sbin/ldconfig || :
-
-%posttrans chalk
-update-desktop-database -q &> /dev/null ||:
-
-%files suite
-#empty => virtual package
-
-%files core
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/koshell
-%{tde_bindir}/kthesaurus
-%{tde_bindir}/koconverter
-%{tde_libdir}/libkdeinit_koshell.so
-%{tde_libdir}/libkdeinit_kthesaurus.so
-%{tde_tdelibdir}/kfile_koffice.*
-%{tde_tdelibdir}/kfile_ooo.*
-%{tde_tdelibdir}/kfile_abiword.*
-%{tde_tdelibdir}/kfile_gnumeric.*
-%{tde_tdelibdir}/kodocinfopropspage.*
-%{tde_tdelibdir}/kofficescan.*
-%{tde_tdelibdir}/kofficethumbnail.*
-%{tde_tdelibdir}/koshell.*
-%{tde_tdelibdir}/kthesaurus.*
-%{tde_tdelibdir}/kwmailmerge_classic.*
-%{tde_tdelibdir}/kwmailmerge_kabc.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
-%{tde_tdelibdir}/libkounavailpart.*
-%{tde_tdelibdir}/libkprkword.*
-%{tde_tdelibdir}/libthesaurustool.*
-%{tde_tdelibdir}/clipartthumbnail.*
-%{tde_datadir}/apps/koffice/
-%{tde_datadir}/apps/konqueror/servicemenus/*
-%{tde_datadir}/apps/koshell/
-%{tde_datadir}/apps/thesaurus/
-%{tde_datadir}/config.kcfg/koshell.kcfg
-%{tde_tdedocdir}/HTML/en/koffice/
-%{tde_tdedocdir}/HTML/en/koshell/
-%{tde_tdedocdir}/HTML/en/thesaurus/
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/services/clipartthumbnail.desktop
-%{tde_datadir}/services/kfile*.desktop
-%{tde_datadir}/services/kwmailmerge*.desktop
-%{tde_datadir}/services/kodocinfopropspage.desktop
-%{tde_datadir}/services/kofficethumbnail.desktop
-%{tde_datadir}/services/kounavail.desktop
-%{tde_datadir}/services/kprkword.desktop
-%{tde_datadir}/services/thesaurustool.desktop
-%{tde_datadir}/servicetypes/kochart.desktop
-%{tde_datadir}/servicetypes/kofficepart.desktop
-%{tde_datadir}/servicetypes/koplugin.desktop
-%{tde_datadir}/servicetypes/kwmailmerge.desktop
-%{tde_datadir}/servicetypes/widgetfactory.desktop
-%{tde_tdeappdir}/*koffice.desktop
-%{tde_tdeappdir}/*KThesaurus.desktop
-%{tde_tdeappdir}/*koshell.desktop
-%{tde_datadir}/apps/kofficewidgets/
-%if 0%{?with_kross}
-%{tde_datadir}/apps/kross/
-%{tde_tdelibdir}/krosspython.*
-%if 0%{?with_ruby}
-%{tde_tdelibdir}/krossruby.*
-%endif
-%endif
-
-%files libs
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{tde_libdir}/libkarboncommon.so.*
-%{tde_libdir}/libkspreadcommon.so.*
-%{tde_libdir}/libkdchart.so.*
-%{tde_libdir}/libkochart.so.*
-%{tde_libdir}/libkofficecore.so.*
-%{tde_libdir}/libkofficeui.so.*
-%{tde_libdir}/libkotext.so.*
-%{tde_libdir}/libkowmf.so.*
-%{tde_libdir}/libkopainter.so.*
-%{tde_libdir}/libkstore.so.*
-%{tde_libdir}/libkwmailmerge_interface.so.*
-%{tde_libdir}/libkwmf.so.*
-%{tde_libdir}/libkformulalib.so.*
-%{tde_libdir}/libkopalette.so.*
-%{tde_libdir}/libkoproperty.so.*
-%if 0%{?with_kross}
-%{tde_libdir}/libkrossapi.so.*
-%{tde_libdir}/libkrossmain.so.*
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
-%{tde_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkdeinit_*.so
-%exclude %{tde_libdir}/libkudesignercore.so
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kword/
-%{tde_bindir}/kword
-%{tde_libdir}/libkdeinit_kword.so
-%{tde_libdir}/libkwordprivate.so.*
-%{tde_tdelibdir}/libkwordpart.*
-%{tde_tdelibdir}/kword.*
-%{tde_datadir}/apps/kword/
-%{tde_datadir}/services/kword*.desktop
-%{tde_datadir}/services/kwserial*.desktop
-%{tde_datadir}/templates/TextDocument.desktop
-%{tde_datadir}/templates/.source/TextDocument.kwt
-%{tde_tdeappdir}/*kword.desktop
-
-%files kspread
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
-%{tde_bindir}/kspread
-%{tde_libdir}/libkdeinit_kspread.so
-%{tde_tdelibdir}/kspread.*
-%{tde_tdelibdir}/libkspreadpart.*
-%{tde_tdelibdir}/kwmailmerge_kspread.*
-%{tde_tdelibdir}/libcsvexport.*
-%{tde_tdelibdir}/libcsvimport.*
-%{tde_tdelibdir}/libgnumericexport.*
-%{tde_tdelibdir}/libgnumericimport.*
-%{tde_tdelibdir}/libkspreadhtmlexport.*
-%{tde_tdelibdir}/libkspreadinsertcalendar.*
-%{tde_tdelibdir}/libopencalcexport.*
-%{tde_tdelibdir}/libopencalcimport.*
-%{tde_tdelibdir}/libqproimport.*
-%{tde_datadir}/apps/kspread/
-%{tde_datadir}/services/kspread*.desktop
-%{tde_datadir}/templates/SpreadSheet.desktop
-%{tde_datadir}/templates/.source/SpreadSheet.kst
-%{tde_tdeappdir}/*kspread.desktop
-%if 0%{?with_kross}
-%{tde_tdelibdir}/kspreadscripting.*
-%{tde_tdelibdir}/krosskspreadcore.*
-%endif
-
-%files kpresenter
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
-%{tde_bindir}/kpresenter
-%{tde_bindir}/kprconverter.pl
-%{tde_libdir}/libkdeinit_kpresenter.so
-%{tde_libdir}/libkpresenterimageexport.so.*
-%{tde_libdir}/libkpresenterprivate.so.*
-%{tde_tdelibdir}/*kpresenter*.*
-%{tde_datadir}/apps/kpresenter/
-%{tde_datadir}/services/kpresenter*.desktop
-%{tde_datadir}/templates/Presentation.desktop
-%{tde_datadir}/templates/.source/Presentation.kpt
-%{tde_tdeappdir}/*kpresenter.desktop
-
-%files karbon
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
-%{tde_bindir}/karbon
-%{tde_libdir}/libkdeinit_karbon.so
-%{tde_tdelibdir}/*karbon*.*
-%{tde_tdelibdir}/libwmfexport.*
-%{tde_tdelibdir}/libwmfimport.*
-%{tde_datadir}/apps/karbon/
-%{tde_datadir}/services/karbon*
-%{tde_datadir}/servicetypes/karbon_module.desktop
-%{tde_datadir}/templates/Illustration.desktop
-%{tde_datadir}/templates/.source/Illustration.karbon
-%{tde_tdeappdir}/*karbon.desktop
-
-%files kugar
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
-%{tde_bindir}/kugar
-%{tde_bindir}/kudesigner
-%{tde_libdir}/libkdeinit_kugar.so
-%{tde_libdir}/libkdeinit_kudesigner.so
-%{tde_libdir}/libkugarlib.so.*
-%{tde_libdir}/libkudesignercore.so
-%{tde_tdelibdir}/kudesigner.*
-%{tde_tdelibdir}/kugar.*
-%{tde_tdelibdir}/libkudesignerpart.*
-%{tde_tdelibdir}/libkugarpart.*
-%{tde_datadir}/apps/kudesigner/
-%{tde_datadir}/apps/kugar/
-%{tde_datadir}/services/kugar*.desktop
-%{tde_tdeappdir}/*kugar.desktop
-%{tde_tdeappdir}/*kudesigner.desktop
-
-%files kexi
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
-%{tde_bindir}/kexi*
-%{tde_bindir}/ksqlite*
-%{tde_libdir}/libkdeinit_kexi.so
-%{tde_libdir}/libkexi*.so.*
-%{tde_libdir}/libkformdesigner.so.*
-%{tde_tdelibdir}/kformdesigner_*.*
-%{tde_tdelibdir}/kexidb_sqlite2driver.*
-%{tde_tdelibdir}/kexidb_sqlite3driver.*
-%{tde_tdelibdir}/kexihandler_*.*
-%{tde_tdelibdir}/kexi.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_datadir}/config/kexirc
-%{tde_datadir}/config/magic/kexi.magic
-%{tde_datadir}/mimelnk/application/*
-%{tde_datadir}/servicetypes/kexi*.desktop
-%{tde_datadir}/services/kexi/
-%{tde_datadir}/apps/kexi/
-%{tde_datadir}/services/kformdesigner/*
-%{tde_tdeappdir}/*kexi.desktop
-%{tde_datadir}/services/kexidb_sqlite*driver.desktop
-%if 0%{?with_kross}
-%{tde_bindir}/krossrunner
-%{tde_tdelibdir}/krosskexiapp.*
-%{tde_tdelibdir}/krosskexidb.*
-%endif
-
-%files kexi-driver-mysql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_mysqldriver.*
-%{tde_tdelibdir}/keximigrate_mysql.*
-%{tde_datadir}/services/keximigrate_mysql.desktop
-%{tde_datadir}/services/kexidb_mysqldriver.desktop
-
-%files kexi-driver-pgsql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
-%{tde_tdelibdir}/keximigrate_pqxx.*
-%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{tde_datadir}/services/keximigrate_pqxx.desktop
-
-%files kchart
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
-%{tde_bindir}/kchart
-%{tde_libdir}/libkchart*.so.*
-%{tde_libdir}/libkdeinit_kchart.so
-%{tde_tdelibdir}/*kchart*.*
-%{tde_datadir}/apps/kchart/
-%{tde_datadir}/services/kchart*.desktop
-%{tde_tdeappdir}/*kchart.desktop
-
-%files kformula
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
-%{tde_bindir}/kformula
-%{tde_libdir}/libkdeinit_kformula.so
-%{tde_tdelibdir}/*kformula*.*
-%{tde_datadir}/apps/kformula/
-%{tde_datadir}/services/kformula*.desktop
-%{tde_tdeappdir}/*kformula.desktop
-
-%files kivio
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
-%{tde_bindir}/kivio
-%{tde_libdir}/libkdeinit_kivio.so
-%{tde_libdir}/libkiviocommon.so.*
-%{tde_tdelibdir}/*kivio*.*
-%{tde_tdelibdir}/straight_connector.*
-%{tde_datadir}/apps/kivio/
-%{tde_datadir}/config.kcfg/kivio.kcfg
-%{tde_datadir}/services/kivio*.desktop
-%{tde_tdeappdir}/*kivio.desktop
-
-%files filters
-%defattr(-,root,root,-)
-%{tde_libdir}/libkwordexportfilters.so.*
-%{tde_tdelibdir}/libabiwordexport.*
-%{tde_tdelibdir}/libabiwordimport.*
-%{tde_tdelibdir}/libamiproexport.*
-%{tde_tdelibdir}/libamiproimport.*
-%{tde_tdelibdir}/libapplixspreadimport.*
-%{tde_tdelibdir}/libapplixwordimport.*
-%{tde_tdelibdir}/libasciiexport.*
-%{tde_tdelibdir}/libasciiimport.*
-%{tde_tdelibdir}/libdbaseimport.*
-%{tde_tdelibdir}/libdocbookexport.*
-%{tde_tdelibdir}/libexcelimport.*
-%{tde_tdelibdir}/libgenerickofilter.*
-%{tde_tdelibdir}/libhtmlexport.*
-%{tde_tdelibdir}/libhtmlimport.*
-%{tde_tdelibdir}/libkarbonepsimport.*
-%{tde_tdelibdir}/libkfolatexexport.*
-%{tde_tdelibdir}/libkfomathmlexport.*
-%{tde_tdelibdir}/libkfomathmlimport.*
-%{tde_tdelibdir}/libkfopngexport.*
-%{tde_tdelibdir}/libkspreadlatexexport.*
-%{tde_tdelibdir}/libkugarnopimport.*
-%{tde_tdelibdir}/libkwordkword1dot3import.*
-%{tde_tdelibdir}/libkwordlatexexport.*
-%{tde_tdelibdir}/libmswriteexport.*
-%{tde_tdelibdir}/libmswriteimport.*
-%{tde_tdelibdir}/libooimpressexport.*
-%{tde_tdelibdir}/libooimpressimport.*
-%{tde_tdelibdir}/liboowriterexport.*
-%{tde_tdelibdir}/liboowriterimport.*
-%{tde_tdelibdir}/libpalmdocexport.*
-%{tde_tdelibdir}/libpalmdocimport.*
-%{tde_tdelibdir}/libpdfimport.*
-%{tde_tdelibdir}/librtfexport.*
-%{tde_tdelibdir}/librtfimport.*
-%{tde_tdelibdir}/libwmlexport.*
-%{tde_tdelibdir}/libwmlimport.*
-%{tde_tdelibdir}/libwpexport.*
-%{tde_tdelibdir}/libwpimport.*
-%{tde_tdelibdir}/libmswordimport.*
-%{tde_tdelibdir}/libxsltimport.*
-%{tde_tdelibdir}/libxsltexport.*
-%{tde_tdelibdir}/libhancomwordimport.*
-%{tde_tdelibdir}/libkfosvgexport.*
-%{tde_tdelibdir}/liboodrawimport.*
-%{tde_tdelibdir}/libolefilter.*
-%{tde_datadir}/apps/xsltfilter/
-%{tde_datadir}/services/generic_filter.desktop
-%{tde_datadir}/services/ole_powerpoint97_import.desktop
-%{tde_datadir}/services/xslt*.desktop
-%{tde_datadir}/servicetypes/kofilter*.desktop
-
-%files kplato
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
-%{tde_bindir}/kplato
-%{tde_libdir}/libkdeinit_kplato.so
-%{tde_tdelibdir}/kplato.*
-%{tde_tdelibdir}/libkplatopart.*
-%{tde_datadir}/apps/kplato/
-%{tde_datadir}/services/kplatopart.desktop
-%{tde_tdeappdir}/*kplato.desktop
-
-%files chalk
-%defattr(-,root,root,-)
-%{tde_bindir}/chalk
-%{tde_tdelibdir}/chalkblurfilter.la
-%{tde_tdelibdir}/chalkblurfilter.so
-%{tde_tdelibdir}/chalkbumpmap.la
-%{tde_tdelibdir}/chalkbumpmap.so
-%{tde_tdelibdir}/chalkcimg.la
-%{tde_tdelibdir}/chalkcimg.so
-%{tde_tdelibdir}/chalk_cmyk_*
-%{tde_tdelibdir}/chalkcmykplugin.la
-%{tde_tdelibdir}/chalkcmykplugin.so
-%{tde_tdelibdir}/chalkcolorify.la
-%{tde_tdelibdir}/chalkcolorify.so
-%{tde_tdelibdir}/chalkcolorrange.la
-%{tde_tdelibdir}/chalkcolorrange.so
-%{tde_tdelibdir}/chalkcolorsfilters.la
-%{tde_tdelibdir}/chalkcolorsfilters.so
-%{tde_tdelibdir}/chalkcolorspaceconversion.la
-%{tde_tdelibdir}/chalkcolorspaceconversion.so
-%{tde_tdelibdir}/chalkconvolutionfilters.la
-%{tde_tdelibdir}/chalkconvolutionfilters.so
-%{tde_tdelibdir}/chalkdefaultpaintops.la
-%{tde_tdelibdir}/chalkdefaultpaintops.so
-%{tde_tdelibdir}/chalkdefaulttools.la
-%{tde_tdelibdir}/chalkdefaulttools.so
-%{tde_tdelibdir}/chalkdropshadow.la
-%{tde_tdelibdir}/chalkdropshadow.so
-%{tde_tdelibdir}/chalkembossfilter.la
-%{tde_tdelibdir}/chalkembossfilter.so
-%{tde_tdelibdir}/chalkexample.la
-%{tde_tdelibdir}/chalkexample.so
-%{tde_tdelibdir}/chalkextensioncolorsfilters.la
-%{tde_tdelibdir}/chalkextensioncolorsfilters.so
-%{tde_tdelibdir}/chalkfastcolortransfer.la
-%{tde_tdelibdir}/chalkfastcolortransfer.so
-%{tde_tdelibdir}/chalkfiltersgallery.la
-%{tde_tdelibdir}/chalkfiltersgallery.so
-%{tde_tdelibdir}/chalk_gray_*
-%{tde_tdelibdir}/chalkgrayplugin.la
-%{tde_tdelibdir}/chalkgrayplugin.so
-%{tde_tdelibdir}/chalkhistogramdocker.la
-%{tde_tdelibdir}/chalkhistogramdocker.so
-%{tde_tdelibdir}/chalkhistogram.la
-%{tde_tdelibdir}/chalkhistogram.so
-%{tde_tdelibdir}/chalkimageenhancement.la
-%{tde_tdelibdir}/chalkimageenhancement.so
-%{tde_tdelibdir}/chalkimagesize.la
-%{tde_tdelibdir}/chalkimagesize.so
-%{tde_tdelibdir}/chalk.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.so
-%{tde_tdelibdir}/chalklevelfilter.la
-%{tde_tdelibdir}/chalklevelfilter.so
-%{tde_tdelibdir}/chalk_lms_*
-%{tde_tdelibdir}/chalkmodifyselection.la
-%{tde_tdelibdir}/chalkmodifyselection.so
-%{tde_tdelibdir}/chalknoisefilter.la
-%{tde_tdelibdir}/chalknoisefilter.so
-%{tde_tdelibdir}/chalkoilpaintfilter.la
-%{tde_tdelibdir}/chalkoilpaintfilter.so
-%{tde_tdelibdir}/chalkpixelizefilter.la
-%{tde_tdelibdir}/chalkpixelizefilter.so
-%{tde_tdelibdir}/chalkraindropsfilter.la
-%{tde_tdelibdir}/chalkraindropsfilter.so
-%{tde_tdelibdir}/chalkrandompickfilter.la
-%{tde_tdelibdir}/chalkrandompickfilter.so
-%{tde_tdelibdir}/chalk_rgb_*
-%{tde_tdelibdir}/chalkrgbplugin.la
-%{tde_tdelibdir}/chalkrgbplugin.so
-%{tde_tdelibdir}/chalkrotateimage.la
-%{tde_tdelibdir}/chalkrotateimage.so
-%{tde_tdelibdir}/chalkroundcornersfilter.la
-%{tde_tdelibdir}/chalkroundcornersfilter.so
-%{tde_tdelibdir}/chalkselectiontools.la
-%{tde_tdelibdir}/chalkselectiontools.so
-%{tde_tdelibdir}/chalkselectopaque.la
-%{tde_tdelibdir}/chalkselectopaque.so
-%{tde_tdelibdir}/chalkseparatechannels.la
-%{tde_tdelibdir}/chalkseparatechannels.so
-%{tde_tdelibdir}/chalkshearimage.la
-%{tde_tdelibdir}/chalkshearimage.so
-%{tde_tdelibdir}/chalksmalltilesfilter.la
-%{tde_tdelibdir}/chalksmalltilesfilter.so
-%{tde_tdelibdir}/chalk.so
-%{tde_tdelibdir}/chalkscreenshot.la
-%{tde_tdelibdir}/chalkscreenshot.so
-%{tde_tdelibdir}/chalksobelfilter.la
-%{tde_tdelibdir}/chalksobelfilter.so
-%{tde_tdelibdir}/chalksubstrate.la
-%{tde_tdelibdir}/chalksubstrate.so
-%{tde_tdelibdir}/chalktoolcrop.la
-%{tde_tdelibdir}/chalktoolcrop.so
-%{tde_tdelibdir}/chalktoolcurves.la
-%{tde_tdelibdir}/chalktoolcurves.so
-%{tde_tdelibdir}/chalktoolfilter.la
-%{tde_tdelibdir}/chalktoolfilter.so
-%{tde_tdelibdir}/chalktoolperspectivegrid.la
-%{tde_tdelibdir}/chalktoolperspectivegrid.so
-%{tde_tdelibdir}/chalktoolperspectivetransform.la
-%{tde_tdelibdir}/chalktoolperspectivetransform.so
-%{tde_tdelibdir}/chalktoolpolygon.la
-%{tde_tdelibdir}/chalktoolpolygon.so
-%{tde_tdelibdir}/chalktoolpolyline.la
-%{tde_tdelibdir}/chalktoolpolyline.so
-%{tde_tdelibdir}/chalktoolselectsimilar.la
-%{tde_tdelibdir}/chalktoolselectsimilar.so
-%{tde_tdelibdir}/chalktoolstar.la
-%{tde_tdelibdir}/chalktoolstar.so
-%{tde_tdelibdir}/chalktooltransform.la
-%{tde_tdelibdir}/chalktooltransform.so
-%{tde_tdelibdir}/chalkunsharpfilter.la
-%{tde_tdelibdir}/chalkunsharpfilter.so
-%{tde_tdelibdir}/chalkwavefilter.la
-%{tde_tdelibdir}/chalkwavefilter.so
-%{tde_tdelibdir}/chalkwetplugin.la
-%{tde_tdelibdir}/chalkwetplugin.so
-%{tde_tdelibdir}/chalk_ycbcr_*
-%{tde_tdelibdir}/libchalkgmagickexport.la
-%{tde_tdelibdir}/libchalkgmagickexport.so
-%{tde_tdelibdir}/libchalkgmagickimport.la
-%{tde_tdelibdir}/libchalkgmagickimport.so
-%{tde_tdelibdir}/libchalkjpegexport.la
-%{tde_tdelibdir}/libchalkjpegexport.so
-%{tde_tdelibdir}/libchalkjpegimport.la
-%{tde_tdelibdir}/libchalkjpegimport.so
-%{tde_tdelibdir}/libchalk_openexr_export.la
-%{tde_tdelibdir}/libchalk_openexr_export.so
-%{tde_tdelibdir}/libchalk_openexr_import.la
-%{tde_tdelibdir}/libchalk_openexr_import.so
-%{tde_tdelibdir}/libchalkpart.la
-%{tde_tdelibdir}/libchalkpart.so
-%{tde_tdelibdir}/libchalkpdfimport.la
-%{tde_tdelibdir}/libchalkpdfimport.so
-%{tde_tdelibdir}/libchalkpngexport.la
-%{tde_tdelibdir}/libchalkpngexport.so
-%{tde_tdelibdir}/libchalkpngimport.la
-%{tde_tdelibdir}/libchalkpngimport.so
-%{tde_tdelibdir}/libchalk_raw_import.la
-%{tde_tdelibdir}/libchalk_raw_import.so
-%{tde_tdelibdir}/libchalktiffexport.la
-%{tde_tdelibdir}/libchalktiffexport.so
-%{tde_tdelibdir}/libchalktiffimport.la
-%{tde_tdelibdir}/libchalktiffimport.so
-%{tde_libdir}/libkdeinit_chalk.so
-%{tde_libdir}/libchalk_cmyk_*.so.*
-%{tde_libdir}/libchalkcolor.so.*
-%{tde_libdir}/libchalkcommon.so.*
-%{tde_libdir}/libchalkgrayscale.so.*
-%{tde_libdir}/libchalk_gray_*.so.*
-%{tde_libdir}/libchalkimage.so.*
-%{tde_libdir}/libchalk_lms_*.so.*
-%{tde_libdir}/libchalk_rgb_*.so.*
-%{tde_libdir}/libchalkrgb.so.*
-%{tde_libdir}/libchalkui.so.*
-%{tde_libdir}/libchalk_ycbcr_*.so.*
-%if 0%{?with_kross}
-%{tde_tdelibdir}/krosschalkcore.la
-%{tde_tdelibdir}/krosschalkcore.so
-%{tde_tdelibdir}/chalkscripting.la
-%{tde_tdelibdir}/chalkscripting.so
-%{tde_libdir}/libchalkscripting.so.*
-%endif
-
-%files chalk-data
-%{tde_tdeappdir}/chalk.desktop
-%{tde_datadir}/applnk/.hidden/chalk_*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
-%{tde_datadir}/apps/chalk
-%{tde_datadir}/apps/chalkplugins
-%lang(en) %{tde_tdedocdir}/HTML/en/chalk
-%{tde_datadir}/icons/hicolor/*/apps/chalk.png
-%{tde_datadir}/services/chalk*.desktop
-%{tde_datadir}/servicetypes/chalk*.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
-- Fix kformula dependancies (for RHEL6)
-- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
-  Clean up lib paths in LDFLAGS - moved to LIBADD
-  For KWord and and KPresenter added linking kspell2
-  For KSpread added linking kutils
-- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
-- Updates BuildRequires
-- Build for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-- Fix compilation with Ruby 1.9 [Bug #735]
-- Fix compilation with libpng [Bug #603]
-
-* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
-- Fix GraphicksMagick 1.3 support [Bug #353]
-- Various patches for kexi [Bug #777]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Fix HTML directory location
-
-* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
-- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch
deleted file mode 100644
index 14e65f1cc..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h.ORI	2013-08-17 16:45:10.505854525 +0200
-+++ trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h	2013-08-17 16:45:15.120749288 +0200
-@@ -86,7 +86,7 @@
-  */
- class OrdinaryCreationStrategy : public ElementCreationStrategy {
- public:
--    virtual BasicElement* createElement( TQString type, const TQDomElement& element = 0 );
-+    virtual BasicElement* createElement( TQString type, const TQDomElement& element );
- 
-     virtual TextElement* createTextElement( const TQChar& ch, bool symbol=false );
-     virtual EmptyElement* createEmptyElement();
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
deleted file mode 100644
index f375078cf..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori	2013-08-24 20:57:39.878623151 +0200
-+++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in	2013-08-24 20:58:50.132123615 +0200
-@@ -42,6 +42,12 @@
-         fi
-       fi
-       if test -z "$RUBY_VERSION"; then
-+        RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
-+        if test -n "$RUBY_VERSION"; then
-+          RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
-+        fi
-+      fi
-+      if test -z "$RUBY_VERSION"; then
-         # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
-         if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
-           # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch
deleted file mode 100644
index c3519a0af..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support.patch
+++ /dev/null
@@ -1,16418 +0,0 @@
-From efca1544fd2475b9f1198e793dde8da1a39de4e2 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: Fri, 05 Apr 2013 20:17:32 +0000
-Subject: Fix FTBFS with libwpd 0.9 and above
-
-This resolves Bug 1169
-Remove spurious build files
----
-diff --git a/acinclude.m4 b/acinclude.m4
-deleted file mode 100644
-index b8033f8..0000000
---- a/acinclude.m4
-+++ b/dev/null
-@@ -1,12406 +0,0 @@
--##   -*- autoconf -*-
--
--dnl    This file is part of the KDE libraries/packages
--dnl    Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
--dnl              (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
--
--dnl    This file is free software; you can redistribute it and/or
--dnl    modify it under the terms of the GNU Library General Public
--dnl    License as published by the Free Software Foundation; either
--dnl    version 2 of the License, or (at your option) any later version.
--
--dnl    This library is distributed in the hope that it will be useful,
--dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
--dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--dnl    Library General Public License for more details.
--
--dnl    You should have received a copy of the GNU Library General Public License
--dnl    along with this library; see the file COPYING.LIB.  If not, write to
--dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--dnl    Boston, MA 02110-1301, USA.
--
--dnl IMPORTANT NOTE:
--dnl Please do not modify this file unless you expect your modifications to be
--dnl carried into every other module in the repository. 
--dnl
--dnl Single-module modifications are best placed in configure.in for kdelibs
--dnl and kdebase or configure.in.in if present.
--
--# KDE_PATH_X_DIRECT
--dnl Internal subroutine of AC_PATH_X.
--dnl Set ac_x_includes and/or ac_x_libraries.
--AC_DEFUN([KDE_PATH_X_DIRECT],
--[
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--if test "$ac_x_includes" = NO; then
--  # Guess where to find include files, by looking for this one X11 .h file.
--  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
--
--  # First, try using that file with no special directory specified.
--AC_TRY_CPP([#include <$x_direct_test_include>],
--[# We can compile using X headers with no special include directory.
--ac_x_includes=],
--[# Look for the header file in a standard set of common directories.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--  for ac_dir in               \
--    /usr/X11/include          \
--    /usr/X11R6/include        \
--    /usr/X11R5/include        \
--    /usr/X11R4/include        \
--                              \
--    /usr/include/X11          \
--    /usr/include/X11R6        \
--    /usr/include/X11R5        \
--    /usr/include/X11R4        \
--                              \
--    /usr/local/X11/include    \
--    /usr/local/X11R6/include  \
--    /usr/local/X11R5/include  \
--    /usr/local/X11R4/include  \
--                              \
--    /usr/local/include/X11    \
--    /usr/local/include/X11R6  \
--    /usr/local/include/X11R5  \
--    /usr/local/include/X11R4  \
--                              \
--    /usr/X386/include         \
--    /usr/x386/include         \
--    /usr/XFree86/include/X11  \
--                              \
--    /usr/include              \
--    /usr/local/include        \
--    /usr/unsupported/include  \
--    /usr/athena/include       \
--    /usr/local/x11r5/include  \
--    /usr/lpp/Xamples/include  \
--                              \
--    /usr/openwin/include      \
--    /usr/openwin/share/include \
--    ; \
--  do
--    if test -r "$ac_dir/$x_direct_test_include"; then
--      ac_x_includes=$ac_dir
--      break
--    fi
--  done])
--fi # $ac_x_includes = NO
--
--if test "$ac_x_libraries" = NO; then
--  # Check for the libraries.
--
--  test -z "$x_direct_test_library" && x_direct_test_library=Xt
--  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
--
--  # See if we find them without any special options.
--  # Don't add to $LIBS permanently.
--  ac_save_LIBS="$LIBS"
--  LIBS="-l$x_direct_test_library $LIBS"
--AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
--[LIBS="$ac_save_LIBS"
--# We can link X programs with no special library path.
--ac_x_libraries=],
--[LIBS="$ac_save_LIBS"
--# First see if replacing the include by lib works.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
--    /usr/X11/lib${kdelibsuff}           \
--    /usr/X11R6/lib${kdelibsuff}         \
--    /usr/X11R5/lib${kdelibsuff}         \
--    /usr/X11R4/lib${kdelibsuff}         \
--                                        \
--    /usr/lib${kdelibsuff}/X11           \
--    /usr/lib${kdelibsuff}/X11R6         \
--    /usr/lib${kdelibsuff}/X11R5         \
--    /usr/lib${kdelibsuff}/X11R4         \
--                                        \
--    /usr/local/X11/lib${kdelibsuff}     \
--    /usr/local/X11R6/lib${kdelibsuff}   \
--    /usr/local/X11R5/lib${kdelibsuff}   \
--    /usr/local/X11R4/lib${kdelibsuff}   \
--                                        \
--    /usr/local/lib${kdelibsuff}/X11     \
--    /usr/local/lib${kdelibsuff}/X11R6   \
--    /usr/local/lib${kdelibsuff}/X11R5   \
--    /usr/local/lib${kdelibsuff}/X11R4   \
--                                        \
--    /usr/X386/lib${kdelibsuff}          \
--    /usr/x386/lib${kdelibsuff}          \
--    /usr/XFree86/lib${kdelibsuff}/X11   \
--                                        \
--    /usr/lib${kdelibsuff}               \
--    /usr/local/lib${kdelibsuff}         \
--    /usr/unsupported/lib${kdelibsuff}   \
--    /usr/athena/lib${kdelibsuff}        \
--    /usr/local/x11r5/lib${kdelibsuff}   \
--    /usr/lpp/Xamples/lib${kdelibsuff}   \
--    /lib/usr/lib${kdelibsuff}/X11       \
--                                        \
--    /usr/openwin/lib${kdelibsuff}       \
--    /usr/openwin/share/lib${kdelibsuff} \
--    ; \
--do
--dnl Don't even attempt the hair of trying to link an X program!
--  for ac_extension in a so sl; do
--    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
--      ac_x_libraries=$ac_dir
--      break 2
--    fi
--  done
--done])
--fi # $ac_x_libraries = NO
--])
--
--
--dnl ------------------------------------------------------------------------
--dnl Find a file (or one of more files in a list of dirs)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_FIND_FILE],
--[
--$3=NO
--for i in $2;
--do
--  for j in $1;
--  do
--    echo "configure: __oline__: $i/$j" >&AC_FD_CC
--    if test -r "$i/$j"; then
--      echo "taking that" >&AC_FD_CC
--      $3=$i
--      break 2
--    fi
--  done
--done
--])
--
--dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
--dnl	if-not-found, test-parameter, prepend-path)
--dnl
--dnl Look for program-name in list-of-dirs+$PATH.
--dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
--dnl If found, $variable-name is set. If not, if-not-found is evaluated.
--dnl test-parameter: if set, the program is executed with this arg,
--dnl                 and only a successful exit code is required.
--AC_DEFUN([KDE_FIND_PATH],
--[
--   AC_MSG_CHECKING([for $1])
--   if test -n "$$2"; then
--        kde_cv_path="$$2";
--   else
--        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
--
--        AC_CACHE_VAL(kde_cv_path_$kde_cache,
--        [
--        kde_cv_path="NONE"
--	kde_save_IFS=$IFS
--	IFS=':'
--	dirs=""
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--	done
--	if test -z "$6"; then  dnl Append dirs in PATH (default)
--	  dirs="$3 $dirs"
--        else  dnl Prepend dirs in PATH (if 6th arg is set)
--	  dirs="$dirs $3"
--	fi
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/$1"; then
--	    if test -n "$5"
--	    then
--              evalstr="$dir/$1 $5 2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/$1"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/$1"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--        ])
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      AC_MSG_RESULT(not found)
--      $4
--   else
--      AC_MSG_RESULT($kde_cv_path)
--      $2=$kde_cv_path
--
--   fi
--])
--
--AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
--[
--    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
--Please check whether you installed Qt correctly.
--You need to have a running moc binary.
--configure tried to run $ac_cv_path_moc and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable MOC to the right one before running
--configure.
--])
--])
--
--AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
--[
--    AC_MSG_WARN([No Qt ui compiler (uic) found!
--Please check whether you installed Qt correctly.
--You need to have a running uic binary.
--configure tried to run $ac_cv_path_uic and the test didn't
--succeed. If configure shouldn't have tried this one, set
--the environment variable UIC to the right one before running
--configure.
--])
--])
--
--
--AC_DEFUN([KDE_CHECK_UIC_FLAG],
--[
--    AC_MSG_CHECKING([whether uic supports -$1 ])
--    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
--    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
--    [
--        cat >conftest.ui <<EOT
--        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
--EOT
--        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
--        if AC_TRY_EVAL(ac_uic_testrun); then
--            eval "kde_cv_prog_uic_$kde_cache=yes"
--        else
--            eval "kde_cv_prog_uic_$kde_cache=no"
--        fi
--        rm -f conftest*
--    ])
--
--    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
--        AC_MSG_RESULT([yes])
--        :
--        $3
--    else
--        AC_MSG_RESULT([no])
--        :
--        $4
--    fi
--])
--
--
--dnl ------------------------------------------------------------------------
--dnl Find the meta object compiler and the ui compiler in the PATH,
--dnl in $QTDIR/bin, and some more usual places
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_PATH_QT_MOC_UIC],
--[
--   AC_REQUIRE([KDE_CHECK_PERL])
--   qt_bindirs=""
--   for dir in $kde_qt_dirs; do
--      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
--   done
--   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
--   if test ! "$ac_qt_bindir" = "NO"; then
--      qt_bindirs="$ac_qt_bindir $qt_bindirs"
--   fi
--
--   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
--   if test -z "$UIC_NOT_NEEDED"; then
--     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
--     if test -z "$UIC_PATH" ; then
--       KDE_UIC_ERROR_MESSAGE
--       exit 1
--     else
--       UIC=$UIC_PATH
--
--       if test $kde_qtver = 3; then
--         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
--         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
--
--         if test x$ac_uic_supports_libpath = xyes; then
--             UIC="$UIC -L \$(kde_widgetdir)"
--         fi
--         if test x$ac_uic_supports_nounload = xyes; then
--             UIC="$UIC -nounload"
--         fi
--       fi
--     fi
--   else
--     UIC="echo uic not available: "
--   fi
--
--   AC_SUBST(MOC)
--   AC_SUBST(UIC)
--
--   UIC_TR="i18n"
--   if test $kde_qtver = 3; then
--     UIC_TR="tr2i18n"
--   fi
--
--   AC_SUBST(UIC_TR)
--])
--
--AC_DEFUN([KDE_1_CHECK_PATHS],
--[
--  KDE_1_CHECK_PATH_HEADERS
--
--  KDE_TEST_RPATH=
--
--  if test -n "$USE_RPATH"; then
--
--     if test -n "$kde_libraries"; then
--       KDE_TEST_RPATH="-R $kde_libraries"
--     fi
--
--     if test -n "$qt_libraries"; then
--       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
--     fi
--
--     if test -n "$x_libraries"; then
--       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
--     fi
--
--     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
--  fi
--
--AC_MSG_CHECKING([for KDE libraries installed])
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
--
--if AC_TRY_EVAL(ac_link) && test -s conftest; then
--  AC_MSG_RESULT(yes)
--else
--  AC_MSG_ERROR([your system fails at linking a small KDE application!
--Check, if your compiler is installed correctly and if you have used the
--same compiler to compile Qt and kdelibs as you did use now.
--For more details about this problem, look at the end of config.log.])
--fi
--
--if eval `KDEDIR= ./conftest 2>&5`; then
--  kde_result=done
--else
--  kde_result=problems
--fi
--
--KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
--kde_have_all_paths=yes
--
--KDE_SET_PATHS($kde_result)
--
--])
--
--AC_DEFUN([KDE_SET_PATHS],
--[
--  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
--	kde_htmldir=\"$kde_htmldir\" \
--	kde_appsdir=\"$kde_appsdir\" \
--	kde_icondir=\"$kde_icondir\" \
--	kde_sounddir=\"$kde_sounddir\" \
--	kde_datadir=\"$kde_datadir\" \
--	kde_locale=\"$kde_locale\" \
--	kde_cgidir=\"$kde_cgidir\" \
--	kde_confdir=\"$kde_confdir\" \
--	kde_kcfgdir=\"$kde_kcfgdir\" \
--	kde_mimedir=\"$kde_mimedir\" \
--	kde_toolbardir=\"$kde_toolbardir\" \
--	kde_wallpaperdir=\"$kde_wallpaperdir\" \
--	kde_templatesdir=\"$kde_templatesdir\" \
--	kde_bindir=\"$kde_bindir\" \
--	kde_servicesdir=\"$kde_servicesdir\" \
--	kde_servicetypesdir=\"$kde_servicetypesdir\" \
--	kde_moduledir=\"$kde_moduledir\" \
--	kde_styledir=\"$kde_styledir\" \
--	kde_widgetdir=\"$kde_widgetdir\" \
--	xdg_appsdir=\"$xdg_appsdir\" \
--	xdg_menudir=\"$xdg_menudir\" \
--	xdg_directorydir=\"$xdg_directorydir\" \
--	kde_result=$1"
--])
--
--AC_DEFUN([KDE_SET_DEFAULT_PATHS],
--[
--if test "$1" = "default"; then
--
--  if test -z "$kde_htmldir"; then
--    kde_htmldir='\${datadir}/doc/tde/HTML'
--  fi
--  if test -z "$kde_appsdir"; then
--    kde_appsdir='\${datadir}/applnk'
--  fi
--  if test -z "$kde_icondir"; then
--    kde_icondir='\${datadir}/icons'
--  fi
--  if test -z "$kde_sounddir"; then
--    kde_sounddir='\${datadir}/sounds'
--  fi
--  if test -z "$kde_datadir"; then
--    kde_datadir='\${datadir}/apps'
--  fi
--  if test -z "$kde_locale"; then
--    kde_locale='\${datadir}/locale'
--  fi
--  if test -z "$kde_cgidir"; then
--    kde_cgidir='\${exec_prefix}/cgi-bin'
--  fi
--  if test -z "$kde_confdir"; then
--    kde_confdir='\${datadir}/config'
--  fi
--  if test -z "$kde_kcfgdir"; then
--    kde_kcfgdir='\${datadir}/config.kcfg'
--  fi
--  if test -z "$kde_mimedir"; then
--    kde_mimedir='\${datadir}/mimelnk'
--  fi
--  if test -z "$kde_toolbardir"; then
--    kde_toolbardir='\${datadir}/toolbar'
--  fi
--  if test -z "$kde_wallpaperdir"; then
--    kde_wallpaperdir='\${datadir}/wallpapers'
--  fi
--  if test -z "$kde_templatesdir"; then
--    kde_templatesdir='\${datadir}/templates'
--  fi
--  if test -z "$kde_bindir"; then
--    kde_bindir='\${exec_prefix}/bin'
--  fi
--  if test -z "$kde_servicesdir"; then
--    kde_servicesdir='\${datadir}/services'
--  fi
--  if test -z "$kde_servicetypesdir"; then
--    kde_servicetypesdir='\${datadir}/servicetypes'
--  fi
--  if test -z "$kde_moduledir"; then
--    if test "$kde_qtver" = "2"; then
--      kde_moduledir='\${libdir}/kde2'
--    else
--      kde_moduledir='\${libdir}/trinity'
--    fi
--  fi
--  if test -z "$kde_styledir"; then
--    kde_styledir='\${libdir}/trinity/plugins/styles'
--  fi
--  if test -z "$kde_widgetdir"; then
--    kde_widgetdir='\${libdir}/trinity/plugins/designer'
--  fi
--  if test -z "$xdg_appsdir"; then
--    xdg_appsdir='\${datadir}/applications/kde'
--  fi
--  if test -z "$xdg_menudir"; then
--    xdg_menudir='\${sysconfdir}/xdg/menus'
--  fi
--  if test -z "$xdg_directorydir"; then
--    xdg_directorydir='\${datadir}/desktop-directories'
--  fi
--
--  KDE_SET_PATHS(defaults)
--
--else
--
--  if test $kde_qtver = 1; then
--     AC_MSG_RESULT([compiling])
--     KDE_1_CHECK_PATHS
--  else
--     AC_MSG_ERROR([path checking not yet supported for KDE 2])
--  fi
--
--fi
--])
--
--AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
--[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
--   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
--   test -z "$kde_datadir" || test -z "$kde_locale"  ||
--   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
--   test -z "$kde_kcfgdir" ||
--   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
--   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
--   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
--   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
--   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
--   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
--   test "x$kde_have_all_paths" != "xyes"; then
--     kde_have_all_paths=no
--  fi
--])
--
--AC_DEFUN([KDE_MISSING_PROG_ERROR],
--[
--    AC_MSG_ERROR([The important program $1 was not found!
--Please check whether you installed KDE correctly.
--])
--])
--
--AC_DEFUN([KDE_MISSING_ARTS_ERROR],
--[
--    AC_MSG_ERROR([The important program $1 was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--])
--])
--
--AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
--[
--    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
--    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
--    if test -n "$KDEDIRS"; then
--       kde_save_IFS=$IFS
--       IFS=:
--       for dir in $KDEDIRS; do
--            kde_default_bindirs="$dir/bin $kde_default_bindirs "
--       done
--       IFS=$kde_save_IFS
--    fi
--])
--
--AC_DEFUN([KDE_SUBST_PROGRAMS],
--[
--    AC_ARG_WITH(arts,
--        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
--        [build_arts=$withval],
--        [build_arts=yes]
--    )
--    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
--    if test "$build_arts" = "no"; then
--        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
--    fi
--
--        KDE_SET_DEFAULT_BINDIRS
--        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
--        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
--        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
--        if test "$build_arts" '!=' "no"; then
--          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
--          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
--        fi
--        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
--
--        trinity2ornewer=1
--        trinity3ornewer=1
--        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
--            trinity2ornewer=
--            trinity3ornewer=
--        else
--            if test "$kde_qtver" = "3"; then
--              if test "$kde_qtsubver" -le 1; then
--                trinity2ornewer=
--              fi
--              if test "$kde_qtsubver" -le 2; then
--                trinity3ornewer=
--              fi
--              if test "$KDECONFIG" != "compiled"; then
--                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
--                  trinity3ornewer=
--                fi
--              fi
--            fi
--        fi
--
--        if test -n "$trinity2ornewer"; then
--            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
--            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
--        fi
--        if test -n "$trinity3ornewer"; then
--            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
--            AC_SUBST(MAKEKDEWIDGETS)
--        fi
--        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
--
--        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
--            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
--            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
--	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
--		KDE_XSL_STYLESHEET=""
--	    else
--                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
--	    fi
--        fi
--
--        DCOP_DEPENDENCIES='$(DCOPIDL)'
--        if test -n "$trinity2ornewer"; then
--            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
--            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
--            AC_SUBST(KCONFIG_COMPILER)
--            AC_SUBST(KCFG_DEPENDENCIES)
--            AC_SUBST(DCOPIDLNG)
--        fi
--        AC_SUBST(DCOPIDL)
--        AC_SUBST(DCOPIDL2CPP)
--        AC_SUBST(DCOP_DEPENDENCIES)
--        AC_SUBST(MCOPIDL)
--        AC_SUBST(ARTSCCONFIG)
--	AC_SUBST(MEINPROC)
-- 	AC_SUBST(KDE_XSL_STYLESHEET)
--	AC_SUBST(XMLLINT)
--])dnl
--
--AC_DEFUN([AC_CREATE_KFSSTND],
--[
--AC_REQUIRE([AC_CHECK_RPATH])
--
--AC_MSG_CHECKING([for KDE paths])
--kde_result=""
--kde_cached_paths=yes
--AC_CACHE_VAL(kde_cv_all_paths,
--[
--  KDE_SET_DEFAULT_PATHS($1)
--  kde_cached_paths=no
--])
--eval "$kde_cv_all_paths"
--KDE_CHECK_PATHS_FOR_COMPLETENESS
--if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
--  # wrong values were cached, may be, we can set better ones
--  kde_result=
--  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
--  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
--  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
--  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
--  kde_have_all_paths=
--  kde_styledir=
--  kde_widgetdir=
--  xdg_appsdir = xdg_menudir= xdg_directorydir= 
--  KDE_SET_DEFAULT_PATHS($1)
--  eval "$kde_cv_all_paths"
--  KDE_CHECK_PATHS_FOR_COMPLETENESS
--  kde_result="$kde_result (cache overridden)"
--fi
--if test "$kde_have_all_paths" = "no"; then
--  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
--Since it had compiled and linked before, it must be a strange problem on your system.
--Look at config.log for details. If you are not able to fix this, look at
--http://www.kde.org/faq/installation.html or any www.kde.org mirror.
--(If you're using an egcs version on Linux, you may update binutils!)
--])
--else
--  rm -f conftest*
--  AC_MSG_RESULT($kde_result)
--fi
--
--bindir=$kde_bindir
--
--KDE_SUBST_PROGRAMS
--
--])
--
--AC_DEFUN([AC_SUBST_KFSSTND],
--[
--AC_SUBST(kde_htmldir)
--AC_SUBST(kde_appsdir)
--AC_SUBST(kde_icondir)
--AC_SUBST(kde_sounddir)
--AC_SUBST(kde_datadir)
--AC_SUBST(kde_locale)
--AC_SUBST(kde_confdir)
--AC_SUBST(kde_kcfgdir)
--AC_SUBST(kde_mimedir)
--AC_SUBST(kde_wallpaperdir)
--AC_SUBST(kde_bindir)
--dnl X Desktop Group standards
--AC_SUBST(xdg_appsdir)
--AC_SUBST(xdg_menudir)
--AC_SUBST(xdg_directorydir)
--dnl for KDE 2
--AC_SUBST(kde_templatesdir)
--AC_SUBST(kde_servicesdir)
--AC_SUBST(kde_servicetypesdir)
--AC_SUBST(kde_moduledir)
--AC_SUBST(kdeinitdir, '$(kde_moduledir)')
--AC_SUBST(kde_styledir)
--AC_SUBST(kde_widgetdir)
--if test "$kde_qtver" = 1; then
--  kde_minidir="$kde_icondir/mini"
--else
--# for KDE 1 - this breaks KDE2 apps using minidir, but
--# that's the plan ;-/
--  kde_minidir="/dev/null"
--fi
--dnl AC_SUBST(kde_minidir)
--dnl AC_SUBST(kde_cgidir)
--dnl AC_SUBST(kde_toolbardir)
--])
--
--AC_DEFUN([KDE_MISC_TESTS],
--[
--   dnl Checks for libraries.
--   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
--   AC_SUBST(LIBUTIL)
--   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
--   AC_SUBST(LIBCOMPAT)
--   kde_have_crypt=
--   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
--      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
--        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
--You should install libcrypt from another source or configure with PAM
--support])
--	kde_have_crypt=no
--      ]))
--   AC_SUBST(LIBCRYPT)
--   if test $kde_have_crypt = yes; then
--      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
--   fi
--   AC_CHECK_SOCKLEN_T
--   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
--   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
--        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
--   fi
--   AC_CHECK_FUNC(inet_ntoa)
--   if test $ac_cv_func_inet_ntoa = no; then
--     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
--   fi
--   AC_CHECK_FUNC(connect)
--   if test $ac_cv_func_connect = no; then
--      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
--        $X_EXTRA_LIBS)
--   fi
--
--   AC_CHECK_FUNC(remove)
--   if test $ac_cv_func_remove = no; then
--      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
--   fi
--
--   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--   AC_CHECK_FUNC(shmat, ,
--     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
--   
--   # more headers that need to be explicitly included on darwin
--   AC_CHECK_HEADERS(sys/types.h stdint.h)
--
--   # sys/bitypes.h is needed for uint32_t and friends on Tru64
--   AC_CHECK_HEADERS(sys/bitypes.h)
--
--   # darwin requires a poll emulation library
--   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
--
--   # for some image handling on Mac OS X
--   AC_CHECK_HEADERS(Carbon/Carbon.h)
--
--   # CoreAudio framework
--   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
--     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
--     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
--   ])
--
--   AC_CHECK_RES_INIT
--   AC_SUBST(LIB_POLL)
--   AC_SUBST(FRAMEWORK_COREAUDIO)
--   LIBSOCKET="$X_EXTRA_LIBS"
--   AC_SUBST(LIBSOCKET)
--   AC_SUBST(X_EXTRA_LIBS)
--   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
--   AC_SUBST(LIBUCB)
--
--   case $host in  dnl this *is* LynxOS specific
--   *-*-lynxos* )
--        AC_MSG_CHECKING([LynxOS header file wrappers])
--        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
--        AC_MSG_RESULT(disabled)
--        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
--         ;;
--    esac
--
--   KDE_CHECK_TYPES
--   KDE_CHECK_LIBDL
--   KDE_CHECK_STRLCPY
--   KDE_CHECK_PIE_SUPPORT
--
--# darwin needs this to initialize the environment
--AC_CHECK_HEADERS(crt_externs.h)
--AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-- 
--AH_VERBATIM(_DARWIN_ENVIRON,
--[
--#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
--# include <sys/time.h>
--# include <crt_externs.h>
--# define environ (*_NSGetEnviron())
--#endif
--])
--
--AH_VERBATIM(_AIX_STRINGS_H_BZERO,
--[
--/*
-- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
-- * that defines bzero.
-- */
--
--#if defined(_AIX)
--#include <strings.h>
--#endif
--])
--
--AC_CHECK_FUNCS([vsnprintf snprintf])
--
--AH_VERBATIM(_TRU64,[
--/*
-- * On HP-UX, the declaration of vsnprintf() is needed every time !
-- */
--
--#if !defined(HAVE_VSNPRINTF) || defined(hpux)
--#if __STDC__
--#include <stdarg.h>
--#include <stdlib.h>
--#else
--#include <varargs.h>
--#endif
--#ifdef __cplusplus
--extern "C"
--#endif
--int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
--#ifdef __cplusplus
--extern "C"
--#endif
--int snprintf(char *str, size_t n, char const *fmt, ...);
--#endif
--])
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Find the header files and libraries for X-Windows. Extended the
--dnl macro AC_PATH_X
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([K_PATH_X],
--[
--AC_REQUIRE([KDE_MISC_TESTS])dnl
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--AC_ARG_ENABLE(
--  embedded,
--  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
--  kde_use_qt_emb=$enableval,
--  kde_use_qt_emb=no
--)
--
--AC_ARG_ENABLE(
--  qtopia,
--  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
--  kde_use_qt_emb_palm=$enableval,
--  kde_use_qt_emb_palm=no
--)
--
--AC_ARG_ENABLE(
--  mac,
--  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
--  kde_use_qt_mac=$enableval,
--  kde_use_qt_mac=no
--)
--
--# used to disable x11-specific stuff on special platforms
--AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
--
--if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
--
--AC_MSG_CHECKING(for X)
--
--AC_CACHE_VAL(kde_cv_have_x,
--[# One or both of the vars are not set, and there is no cached value.
--if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
--   kde_x_includes=NO
--else
--   kde_x_includes=$x_includes
--fi
--if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
--   kde_x_libraries=NO
--else
--   kde_x_libraries=$x_libraries
--fi
--
--# below we use the standard autoconf calls
--ac_x_libraries=$kde_x_libraries
--ac_x_includes=$kde_x_includes
--
--KDE_PATH_X_DIRECT
--dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
--dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
--dnl location. The correct location is /usr/lib32 or an undefined value
--dnl (the linker is smart enough to pick the correct default library).
--dnl Things work just fine if you use just AC_PATH_X_DIRECT.
--dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
--dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
--dnl x_includes should be left alone.
--case "$host" in
--mips-sgi-irix6*)
--  ;;
--*-*-solaris*)
--  ;;
--*)
--  _AC_PATH_X_XMKMF
--  if test -z "$ac_x_includes"; then
--    ac_x_includes="."
--  fi
--  if test -z "$ac_x_libraries"; then
--    ac_x_libraries="/usr/lib${kdelibsuff}"
--  fi
--esac
--#from now on we use our own again
--
--# when the user already gave --x-includes, we ignore
--# what the standard autoconf macros told us.
--if test "$kde_x_includes" = NO; then
--  kde_x_includes=$ac_x_includes
--fi
--
--# for --x-libraries too
--if test "$kde_x_libraries" = NO; then
--  kde_x_libraries=$ac_x_libraries
--fi
--
--if test "$kde_x_includes" = NO; then
--  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
--fi
--
--if test "$kde_x_libraries" = NO; then
--  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
--fi
--
--# Record where we found X for the cache.
--kde_cv_have_x="have_x=yes \
--         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
--])dnl
--
--eval "$kde_cv_have_x"
--
--if test "$have_x" != yes; then
--  AC_MSG_RESULT($have_x)
--  no_x=yes
--else
--  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
--fi
--
--if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
--  X_INCLUDES=""
--  x_includes="."; dnl better than nothing :-
-- else
--  x_includes=$kde_x_includes
--  X_INCLUDES="-I$x_includes"
--fi
--
--if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
--  X_LDFLAGS=""
--  x_libraries="/usr/lib"; dnl better than nothing :-
-- else
--  x_libraries=$kde_x_libraries
--  X_LDFLAGS="-L$x_libraries"
--fi
--all_includes="$X_INCLUDES"
--all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
--
--# Check for libraries that X11R6 Xt/Xaw programs need.
--ac_save_LDFLAGS="$LDFLAGS"
--LDFLAGS="$LDFLAGS $X_LDFLAGS"
--# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
--# check for ICE first), but we must link in the order -lSM -lICE or
--# we get undefined symbols.  So assume we have SM if we have ICE.
--# These have to be linked with before -lX11, unlike the other
--# libraries we check for below, so use a different variable.
--#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
--AC_CHECK_LIB(ICE, IceConnectionNumber,
--  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
--LDFLAGS="$ac_save_LDFLAGS"
--
--LIB_X11='-lX11 $(LIBSOCKET)'
--
--AC_MSG_CHECKING(for libXext)
--AC_CACHE_VAL(kde_cv_have_libXext,
--[
--kde_ldflags_safe="$LDFLAGS"
--kde_libs_safe="$LIBS"
--
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
--LIBS="-lXext -lX11 $LIBSOCKET"
--
--AC_TRY_LINK([
--#include <stdio.h>
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--],
--[
--printf("hello Xext\n");
--],
--kde_cv_have_libXext=yes,
--kde_cv_have_libXext=no
--)
--
--LDFLAGS=$kde_ldflags_safe
--LIBS=$kde_libs_safe
--])
--
--AC_MSG_RESULT($kde_cv_have_libXext)
--
--if test "$kde_cv_have_libXext" = "no"; then
--  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
--can't find it itself, we stop here assuming that make wouldn't find
--them either.])
--fi
--
--LIB_XEXT="-lXext"
--QTE_NORTTI=""
--
--elif test "$kde_use_qt_emb" = "yes"; then
--  dnl We're using QT Embedded
--  CPPFLAGS=-DQWS
--  CXXFLAGS="$CXXFLAGS -fno-rtti"
--  QTE_NORTTI="-fno-rtti -DQWS"
--  X_PRE_LIBS=""
--  LIB_X11=""
--  LIB_XEXT=""
--  LIB_XRENDER=""
--  LIBSM=""
--  X_INCLUDES=""
--  X_LDFLAGS=""
--  x_includes=""
--  x_libraries=""
--elif test "$kde_use_qt_mac" = "yes"; then
--  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
--  dnl be included to get the information) --Sam
--  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
--  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
--  X_PRE_LIBS=""
--  LIB_X11=""
--  LIB_XEXT=""
--  LIB_XRENDER=""
--  LIBSM=""
--  X_INCLUDES=""
--  X_LDFLAGS=""
--  x_includes=""
--  x_libraries=""
--fi
--AC_SUBST(X_PRE_LIBS)
--AC_SUBST(LIB_X11)
--AC_SUBST(LIB_XRENDER)
--AC_SUBST(LIBSM)
--AC_SUBST(X_INCLUDES)
--AC_SUBST(X_LDFLAGS)
--AC_SUBST(x_includes)
--AC_SUBST(x_libraries)
--AC_SUBST(QTE_NORTTI)
--AC_SUBST(LIB_XEXT)
--
--])
--
--AC_DEFUN([KDE_PRINT_QT_PROGRAM],
--[
--AC_REQUIRE([KDE_USE_QT])
--cat > conftest.$ac_ext <<EOF
--#include "confdefs.h"
--#include <qglobal.h>
--#include <qapplication.h>
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qevent.h>
--#include <qstring.h>
--#include <qstyle.h>
--EOF
--
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
--#if QT_VERSION < 210
--#error 1
--#endif
--EOF
--fi
--fi
--
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
--#include <qcursor.h>
--#include <qstylefactory.h>
--#include <private/qucomextra_p.h>
--EOF
--fi
--
--echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
--cat >> conftest.$ac_ext <<EOF
--#error 1
--#endif
--
--int main() {
--EOF
--if test "$kde_qtver" = "2"; then
--cat >> conftest.$ac_ext <<EOF
--    QStringList *t = new QStringList();
--    Q_UNUSED(t);
--EOF
--if test $kde_qtsubver -gt 0; then
--cat >> conftest.$ac_ext <<EOF
--    QString s;
--    s.setLatin1("Elvis is alive", 14);
--EOF
--fi
--fi
--if test "$kde_qtver" = "3"; then
--cat >> conftest.$ac_ext <<EOF
--    (void)QStyleFactory::create(QString::null);
--    QCursor c(Qt::WhatsThisCursor);
--EOF
--fi
--cat >> conftest.$ac_ext <<EOF
--    return 0;
--}
--EOF
--])
--
--AC_DEFUN([KDE_USE_QT],
--[
--if test -z "$1"; then
--  # Current default Qt version: 3.3
--  kde_qtver=3
--  kde_qtsubver=3
--else
--  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
--  # following is the check if subversion isnt found in passed argument
--  if test "$kde_qtsubver" = "$1"; then
--    kde_qtsubver=1
--  fi
--  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
--  if test "$kde_qtver" = "1"; then
--    kde_qtsubver=42
--  fi
--fi
--
--if test -z "$2"; then
--  if test "$kde_qtver" = "2"; then
--    if test $kde_qtsubver -gt 0; then
--      kde_qt_minversion=">= Qt 2.2.2"
--    else
--      kde_qt_minversion=">= Qt 2.0.2"
--    fi
--  fi
--  if test "$kde_qtver" = "3"; then
--    if test $kde_qtsubver -gt 0; then
--	 if test $kde_qtsubver -gt 1; then
--	    if test $kde_qtsubver -gt 2; then
--		kde_qt_minversion=">= Qt 3.3 and < 4.0"
--	    else
--	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
--	    fi
--	 else
--            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
--         fi
--    else
--      kde_qt_minversion=">= Qt 3.0 and < 4.0"
--    fi
--  fi
--  if test "$kde_qtver" = "1"; then
--    kde_qt_minversion=">= 1.42 and < 2.0"
--  fi
--else
--   kde_qt_minversion="$2"
--fi
--
--if test -z "$3"; then
--   if test $kde_qtver = 3; then
--     if test $kde_qtsubver -gt 0; then
--       kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
--       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
--       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
--     else
--       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
--     fi
--   fi
--   if test $kde_qtver = 2; then
--     if test $kde_qtsubver -gt 0; then
--       kde_qt_verstring="QT_VERSION >= 222"
--     else
--       kde_qt_verstring="QT_VERSION >= 200"
--     fi
--   fi
--   if test $kde_qtver = 1; then
--    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
--   fi
--else
--   kde_qt_verstring="$3"
--fi
--
--if test $kde_qtver = 4; then
--  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
--fi
--if test $kde_qtver = 3; then
--  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
--fi
--if test $kde_qtver = 2; then
--   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
--fi
--if test $kde_qtver = 1; then
--   kde_qt_dirs="$QTDIR /usr/lib/qt"
--fi
--])
--
--AC_DEFUN([KDE_CHECK_QT_DIRECT],
--[
--AC_REQUIRE([KDE_USE_QT])
--AC_MSG_CHECKING([if Qt compiles without flags])
--AC_CACHE_VAL(kde_cv_qt_direct,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
--ac_LIBRARY_PATH="$LIBRARY_PATH"
--ac_cxxflags_safe="$CXXFLAGS"
--ac_ldflags_safe="$LDFLAGS"
--ac_libs_safe="$LIBS"
--
--CXXFLAGS="$CXXFLAGS -I$qt_includes"
--LDFLAGS="$LDFLAGS $X_LDFLAGS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
--else
--LIBS="$LIBQT $LIBSOCKET"
--fi
--LD_LIBRARY_PATH=
--export LD_LIBRARY_PATH
--LIBRARY_PATH=
--export LIBRARY_PATH
--
--KDE_PRINT_QT_PROGRAM
--
--if AC_TRY_EVAL(ac_link) && test -s conftest; then
--  kde_cv_qt_direct="yes"
--else
--  kde_cv_qt_direct="no"
--  echo "configure: failed program was:" >&AC_FD_CC
--  cat conftest.$ac_ext >&AC_FD_CC
--fi
--
--rm -f conftest*
--CXXFLAGS="$ac_cxxflags_safe"
--LDFLAGS="$ac_ldflags_safe"
--LIBS="$ac_libs_safe"
--
--LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
--export LD_LIBRARY_PATH
--LIBRARY_PATH="$ac_LIBRARY_PATH"
--export LIBRARY_PATH
--AC_LANG_RESTORE
--])
--
--if test "$kde_cv_qt_direct" = "yes"; then
--  AC_MSG_RESULT(yes)
--  $1
--else
--  AC_MSG_RESULT(no)
--  $2
--fi
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the Qt headers and libraries.
--dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
--dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_PATH_QT_1_3],
--[
--AC_REQUIRE([K_PATH_X])
--AC_REQUIRE([KDE_USE_QT])
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--dnl ------------------------------------------------------------------------
--dnl Add configure flag to enable linking to MT version of Qt library.
--dnl ------------------------------------------------------------------------
--
--AC_ARG_ENABLE(
--  mt,
--  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
--  kde_use_qt_mt=$enableval,
--  [
--    if test $kde_qtver = 3; then
--      kde_use_qt_mt=yes
--    else
--      kde_use_qt_mt=no
--    fi
--  ]
--)
--
--USING_QT_MT=""
--
--dnl ------------------------------------------------------------------------
--dnl If we not get --disable-qt-mt then adjust some vars for the host.
--dnl ------------------------------------------------------------------------
--
--KDE_MT_LDFLAGS=
--KDE_MT_LIBS=
--if test "x$kde_use_qt_mt" = "xyes"; then
--  KDE_CHECK_THREADING
--  if test "x$kde_use_threading" = "xyes"; then
--    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
--    KDE_MT_LDFLAGS="$USE_THREADS"
--    KDE_MT_LIBS="$LIBPTHREAD"
--  else
--    kde_use_qt_mt=no
--  fi
--fi
--AC_SUBST(KDE_MT_LDFLAGS)
--AC_SUBST(KDE_MT_LIBS)
--
--kde_qt_was_given=yes
--
--dnl ------------------------------------------------------------------------
--dnl If we haven't been told how to link to Qt, we work it out for ourselves.
--dnl ------------------------------------------------------------------------
--if test -z "$LIBQT_GLOB"; then
--  if test "x$kde_use_qt_emb" = "xyes"; then
--    LIBQT_GLOB="libqte.*"
--  else
--    LIBQT_GLOB="libqt.*"
--  fi
--fi
--
--dnl ------------------------------------------------------------
--dnl If we got --enable-embedded then adjust the Qt library name.
--dnl ------------------------------------------------------------
--if test "x$kde_use_qt_emb" = "xyes"; then
--  qtlib="qte"
--else
--  qtlib="qt"
--fi
--
--kde_int_qt="-l$qtlib"
--
--if test -z "$LIBQPE"; then
--dnl ------------------------------------------------------------
--dnl If we got --enable-palmtop then add -lqpe to the link line
--dnl ------------------------------------------------------------
--  if test "x$kde_use_qt_emb" = "xyes"; then
--    if test "x$kde_use_qt_emb_palm" = "xyes"; then
--      LIB_QPE="-lqpe"
--    else
--      LIB_QPE=""
--    fi
--  else
--    LIB_QPE=""
--  fi
--fi
--
--dnl ------------------------------------------------------------------------
--dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
--dnl ------------------------------------------------------------------------
--
--if test "x$kde_use_qt_mt" = "xyes"; then
--  LIBQT="-l$qtlib-mt"
--  kde_int_qt="-l$qtlib-mt"
--  LIBQT_GLOB="lib$qtlib-mt.*"
--  USING_QT_MT="using -mt"
--else
--  LIBQT="-l$qtlib"
--fi
--
--if test $kde_qtver != 1; then
--
--  AC_REQUIRE([AC_FIND_PNG])
--  AC_REQUIRE([AC_FIND_JPEG])
--  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
--fi
--
--if test $kde_qtver = 3; then
--  AC_REQUIRE([KDE_CHECK_LIBDL])
--  LIBQT="$LIBQT $LIBDL"
--fi
--
--AC_MSG_CHECKING([for Qt])
--
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
--fi
--ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
--qt_libraries=""
--qt_includes=""
--AC_ARG_WITH(qt-dir,
--    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
--    [  ac_qt_includes="$withval"/include
--       ac_qt_libraries="$withval"/lib${kdelibsuff}
--       ac_qt_bindir="$withval"/bin
--    ])
--
--AC_ARG_WITH(qt-includes,
--    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
--    [
--       ac_qt_includes="$withval"
--    ])
--
--kde_qt_libs_given=no
--
--AC_ARG_WITH(qt-libraries,
--    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
--    [  ac_qt_libraries="$withval"
--       kde_qt_libs_given=yes
--    ])
--
--AC_CACHE_VAL(ac_cv_have_qt,
--[#try to guess Qt locations
--
--qt_incdirs=""
--for dir in $kde_qt_dirs; do
--   qt_incdirs="$qt_incdirs $dir/include $dir"
--done
--qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
--if test ! "$ac_qt_includes" = "NO"; then
--   qt_incdirs="$ac_qt_includes $qt_incdirs"
--fi
--
--if test "$kde_qtver" != "1"; then
--  kde_qt_header=qstyle.h
--else
--  kde_qt_header=qglobal.h
--fi
--
--AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
--ac_qt_includes="$qt_incdir"
--
--qt_libdirs=""
--for dir in $kde_qt_dirs; do
--   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
--done
--qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
--if test ! "$ac_qt_libraries" = "NO"; then
--  qt_libdir=$ac_qt_libraries
--else
--  qt_libdirs="$ac_qt_libraries $qt_libdirs"
--  # if the Qt was given, the chance is too big that libqt.* doesn't exist
--  qt_libdir=NONE
--  for dir in $qt_libdirs; do
--    try="ls -1 $dir/${LIBQT_GLOB}"
--    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
--  done
--fi
--for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
--  if test -e "$a"; then
--    LIBQT="$LIBQT ${kde_int_qt}_incremental"
--    break
--  fi
--done
--
--ac_qt_libraries="$qt_libdir"
--
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--
--ac_cxxflags_safe="$CXXFLAGS"
--ac_ldflags_safe="$LDFLAGS"
--ac_libs_safe="$LIBS"
--
--CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
--LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
--LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
--
--KDE_PRINT_QT_PROGRAM
--
--if AC_TRY_EVAL(ac_link) && test -s conftest; then
--  rm -f conftest*
--else
--  echo "configure: failed program was:" >&AC_FD_CC
--  cat conftest.$ac_ext >&AC_FD_CC
--  ac_qt_libraries="NO"
--fi
--rm -f conftest*
--CXXFLAGS="$ac_cxxflags_safe"
--LDFLAGS="$ac_ldflags_safe"
--LIBS="$ac_libs_safe"
--
--AC_LANG_RESTORE
--if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
--  ac_cv_have_qt="have_qt=no"
--  ac_qt_notfound=""
--  missing_qt_mt=""
--  if test "$ac_qt_includes" = NO; then
--    if test "$ac_qt_libraries" = NO; then
--      ac_qt_notfound="(headers and libraries)";
--    else
--      ac_qt_notfound="(headers)";
--    fi
--  else
--    if test "x$kde_use_qt_mt" = "xyes"; then
--       missing_qt_mt="
--Make sure that you have compiled Qt with thread support!"
--       ac_qt_notfound="(library $qtlib-mt)";
--    else
--       ac_qt_notfound="(library $qtlib)";
--    fi
--  fi
--
--  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
--For more details about this problem, look at the end of config.log.$missing_qt_mt])
--else
--  have_qt="yes"
--fi
--])
--
--eval "$ac_cv_have_qt"
--
--if test "$have_qt" != yes; then
--  AC_MSG_RESULT([$have_qt]);
--else
--  ac_cv_have_qt="have_qt=yes \
--    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
--  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
--
--  qt_libraries="$ac_qt_libraries"
--  qt_includes="$ac_qt_includes"
--fi
--
--if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
--     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
--fi
--
--AC_SUBST(qt_libraries)
--AC_SUBST(qt_includes)
--
--if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-- QT_INCLUDES=""
--else
-- QT_INCLUDES="-I$qt_includes"
-- all_includes="$QT_INCLUDES $all_includes"
--fi
--
--if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-- QT_LDFLAGS=""
--else
-- QT_LDFLAGS="-L$qt_libraries"
-- all_libraries="$QT_LDFLAGS $all_libraries"
--fi
--test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
--
--AC_SUBST(QT_INCLUDES)
--AC_SUBST(QT_LDFLAGS)
--AC_PATH_QT_MOC_UIC
--
--KDE_CHECK_QT_JPEG
--
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
--else
--LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
--fi
--test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
--for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
--  if test -e "$a"; then
--     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
--     break
--  fi
--done
--
--AC_SUBST(LIB_QT)
--AC_SUBST(LIB_QPE)
--
--AC_SUBST(kde_qtver)
--])
--
--AC_DEFUN([AC_PATH_QT],
--[
--AC_PATH_QT_1_3
--])
--
--AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
--[
--AC_REQUIRE([AC_PATH_QT_MOC_UIC])
--
--if test x$ac_uic_supports_libpath = xyes; then
--
--AC_MSG_CHECKING([if UIC has KDE plugins available])
--AC_CACHE_VAL(kde_cv_uic_plugins,
--[
--cat > actest.ui << EOF
--<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
--<class>NewConnectionDialog</class>
--<widget class="QDialog">
--   <widget class="KLineEdit">
--        <property name="name">
--           <cstring>testInput</cstring>
--        </property>
--   </widget>
--</widget>
--</UI>
--EOF
--       
--
--
--kde_cv_uic_plugins=no
--kde_line="$UIC_PATH -L $kde_widgetdir"
--if test x$ac_uic_supports_nounload = xyes; then
--   kde_line="$kde_line -nounload"
--fi
--kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
--if AC_TRY_EVAL(kde_line); then
--	# if you're trying to debug this check and think it's incorrect,
--	# better check your installation. The check _is_ correct - your
--	# installation is not.
--	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
--		kde_cv_uic_plugins=yes
--	fi
--fi
--rm -f actest.ui actest.cpp
--])
--
--AC_MSG_RESULT([$kde_cv_uic_plugins])
--if test "$kde_cv_uic_plugins" != yes; then
--	AC_MSG_ERROR([
--you need to install kdelibs first.
--
--If you did install kdelibs, then the Qt version that is picked up by
--this configure is not the same version you used to compile kdelibs. 
--The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
--_same Qt version_, compiled with the _same compiler_ and the same Qt
--configuration settings.
--])
--fi
--fi
--])
--
--AC_DEFUN([KDE_CHECK_FINAL],
--[
--  AC_ARG_ENABLE(final,
--	AC_HELP_STRING([--enable-final],
--		       [build size optimized apps (experimental - needs lots of memory)]),
--	kde_use_final=$enableval, kde_use_final=no)
--
--  if test "x$kde_use_final" = "xyes"; then
--      KDE_USE_FINAL_TRUE=""
--      KDE_USE_FINAL_FALSE="#"
--   else
--      KDE_USE_FINAL_TRUE="#"
--      KDE_USE_FINAL_FALSE=""
--  fi
--  AC_SUBST(KDE_USE_FINAL_TRUE)
--  AC_SUBST(KDE_USE_FINAL_FALSE)
--])
--
--AC_DEFUN([KDE_CHECK_CLOSURE],
--[
--  AC_ARG_ENABLE(closure,
--		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
--  	kde_use_closure=$enableval, kde_use_closure=no)
--
--  KDE_NO_UNDEFINED=""
--  if test "x$kde_use_closure" = "xyes"; then
--       KDE_USE_CLOSURE_TRUE=""
--       KDE_USE_CLOSURE_FALSE="#"
--#       CXXFLAGS="$CXXFLAGS $REPO"
--  else
--       KDE_USE_CLOSURE_TRUE="#"
--       KDE_USE_CLOSURE_FALSE=""
--       KDE_NO_UNDEFINED=""
--  fi
--  AC_SUBST(KDE_USE_CLOSURE_TRUE)
--  AC_SUBST(KDE_USE_CLOSURE_FALSE)
--  AC_SUBST(KDE_NO_UNDEFINED)
--])
--
--dnl Check if the linker supports --enable-new-dtags and --as-needed
--AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
--[
--  AC_ARG_ENABLE(new_ldflags,
--		AC_HELP_STRING([--enable-new-ldflags],
--		[enable the new linker flags]),
--	kde_use_new_ldflags=$enableval, 
--	kde_use_new_ldflags=no)
--
--  LDFLAGS_AS_NEEDED=""
--  LDFLAGS_NEW_DTAGS=""
--  if test "x$kde_use_new_ldflags" = "xyes"; then
--       LDFLAGS_NEW_DTAGS=""
--       KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
--		[LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
--
--       KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
--		[LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
--  fi
--  AC_SUBST(LDFLAGS_AS_NEEDED)
--  AC_SUBST(LDFLAGS_NEW_DTAGS)
--])
--
--AC_DEFUN([KDE_CHECK_NMCHECK],
--[
--  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
--	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
--
--  if test "$kde_use_nmcheck" = "yes"; then
--      KDE_USE_NMCHECK_TRUE=""
--      KDE_USE_NMCHECK_FALSE="#"
--   else
--      KDE_USE_NMCHECK_TRUE="#"
--      KDE_USE_NMCHECK_FALSE=""
--  fi
--  AC_SUBST(KDE_USE_NMCHECK_TRUE)
--  AC_SUBST(KDE_USE_NMCHECK_FALSE)
--])
--
--AC_DEFUN([KDE_EXPAND_MAKEVAR], [
--savex=$exec_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--tmp=$$2
--while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
--exec_prefix=$savex
--])
--
--dnl ------------------------------------------------------------------------
--dnl Now, the same with KDE
--dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
--dnl and $(kde_includes) will be the kdehdrlocation (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_BASE_PATH_KDE],
--[
--AC_REQUIRE([KDE_CHECK_STL])
--AC_REQUIRE([AC_PATH_QT])dnl
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--AC_CHECK_RPATH
--AC_MSG_CHECKING([for KDE])
--
--if test "${prefix}" != NONE; then
--  kde_includes=${includedir}
--  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
--
--  kde_libraries=${libdir}
--  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
--
--else
--  ac_kde_includes=
--  ac_kde_libraries=
--  kde_libraries=""
--  kde_includes=""
--fi
--
--AC_CACHE_VAL(ac_cv_have_kde,
--[#try to guess kde locations
--
--if test "$kde_qtver" = 1; then
--  kde_check_header="ksock.h"
--  kde_check_lib="libkdecore.la"
--else
--  kde_check_header="ksharedptr.h"
--  kde_check_lib="libkio.la"
--fi
--
--if test -z "$1"; then
--
--kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
--test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
--kde_incdirs="$ac_kde_includes $kde_incdirs"
--AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
--ac_kde_includes="$kde_incdir"
--
--if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
--  AC_MSG_ERROR([
--in the prefix, you've chosen, are no KDE headers installed. This will fail.
--So, check this please and use another prefix!])
--fi
--
--kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
--test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
--kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
--AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
--ac_kde_libraries="$kde_libdir"
--
--kde_widgetdir=NO
--dnl this might be somewhere else
--AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
--
--if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
--AC_MSG_ERROR([
--in the prefix, you've chosen, are no KDE libraries installed. This will fail.
--So, check this please and use another prefix!])
--fi
--
--if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
--AC_MSG_ERROR([
--I can't find the designer plugins. These are required and should have been installed
--by kdelibs])
--fi
--
--if test -n "$kde_widgetdir"; then
--    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
--fi
--
--
--if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
--  ac_cv_have_kde="have_kde=no"
--else
--  ac_cv_have_kde="have_kde=yes \
--    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
--fi
--
--else dnl test -z $1, e.g. from kdelibs
--
--  ac_cv_have_kde="have_kde=no"
--
--fi
--])dnl
--
--eval "$ac_cv_have_kde"
--
--if test "$have_kde" != "yes"; then
-- if test "${prefix}" = NONE; then
--  ac_kde_prefix="$ac_default_prefix"
-- else
--  ac_kde_prefix="$prefix"
-- fi
-- if test "$exec_prefix" = NONE; then
--  ac_kde_exec_prefix="$ac_kde_prefix"
--  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
-- else
--  ac_kde_exec_prefix="$exec_prefix"
--  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
-- fi
--
-- kde_libraries="${libdir}"
-- kde_includes="${includedir}"
--
--else
--  ac_cv_have_kde="have_kde=yes \
--    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
--  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
--
--  kde_libraries="$ac_kde_libraries"
--  kde_includes="$ac_kde_includes"
--fi
--AC_SUBST(kde_libraries)
--AC_SUBST(kde_includes)
--
--if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
-- KDE_INCLUDES=""
--else
-- KDE_INCLUDES="-I$kde_includes"
-- all_includes="$KDE_INCLUDES $all_includes"
--fi
--
--KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-- 
--KDE_LDFLAGS="-L$kde_libraries"
--if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
-- all_libraries="$KDE_LDFLAGS $all_libraries"
--fi
--
--AC_SUBST(KDE_LDFLAGS)
--AC_SUBST(KDE_INCLUDES)
--
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--
--all_libraries="$all_libraries $USER_LDFLAGS"
--all_includes="$all_includes $USER_INCLUDES"
--AC_SUBST(all_includes)
--AC_SUBST(all_libraries)
--
--if test -z "$1"; then
--KDE_CHECK_UIC_PLUGINS
--fi
--
--ac_kde_libraries="$kde_libdir"
--
--AC_SUBST(AUTODIRS)
--
--
--])
--
--AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
--[
--AC_MSG_CHECKING(for extra includes)
--AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
--  kde_use_extra_includes="$withval",
--  kde_use_extra_includes=NONE
--)
--kde_extra_includes=
--if test -n "$kde_use_extra_includes" && \
--   test "$kde_use_extra_includes" != "NONE"; then
--
--   ac_save_ifs=$IFS
--   IFS=':'
--   for dir in $kde_use_extra_includes; do
--     kde_extra_includes="$kde_extra_includes $dir"
--     USER_INCLUDES="$USER_INCLUDES -I$dir"
--   done
--   IFS=$ac_save_ifs
--   kde_use_extra_includes="added"
--else
--   kde_use_extra_includes="no"
--fi
--AC_SUBST(USER_INCLUDES)
--
--AC_MSG_RESULT($kde_use_extra_includes)
--
--kde_extra_libs=
--AC_MSG_CHECKING(for extra libs)
--AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
--  kde_use_extra_libs=$withval,
--  kde_use_extra_libs=NONE
--)
--if test -n "$kde_use_extra_libs" && \
--   test "$kde_use_extra_libs" != "NONE"; then
--
--   ac_save_ifs=$IFS
--   IFS=':'
--   for dir in $kde_use_extra_libs; do
--     kde_extra_libs="$kde_extra_libs $dir"
--     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
--     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
--   done
--   IFS=$ac_save_ifs
--   kde_use_extra_libs="added"
--else
--   kde_use_extra_libs="no"
--fi
--
--AC_SUBST(USER_LDFLAGS)
--
--AC_MSG_RESULT($kde_use_extra_libs)
--
--])
--
--AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
--[
--    AC_MSG_CHECKING([for KDE headers installed])
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--cat > conftest.$ac_ext <<EOF
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--#include <stdio.h>
--#include "confdefs.h"
--#include <kapp.h>
--
--int main() {
--    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
--    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
--    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
--    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
--    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
--    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
--    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
--    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
--    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
--    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
--    printf("kde_wallpaperdir=\\"%s\\"\n",
--	KApplication::kde_wallpaperdir().data());
--    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
--    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
--    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
--    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
--    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
--    printf("kde_styledir=\\"/tmp/dummy\\"\n");
--    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
--    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
--    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
--    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
--    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
--    return 0;
--    }
--EOF
--
-- ac_save_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS="$all_includes $CPPFLAGS"
-- if AC_TRY_EVAL(ac_compile); then
--   AC_MSG_RESULT(yes)
-- else
--   AC_MSG_ERROR([your system is not able to compile a small KDE application!
--Check, if you installed the KDE header files correctly.
--For more details about this problem, look at the end of config.log.])
--  fi
--  CPPFLAGS=$ac_save_CPPFLAGS
--
--  AC_LANG_RESTORE
--])
--
--AC_DEFUN([KDE_CHECK_KDEQTADDON],
--[
--AC_MSG_CHECKING(for kde-qt-addon)
--AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
--[
-- kde_ldflags_safe="$LDFLAGS"
-- kde_libs_safe="$LIBS"
-- kde_cxxflags_safe="$CXXFLAGS"
--
-- LIBS="-lkde-qt-addon $LIBQT $LIBS"
-- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
-- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
--
-- AC_TRY_LINK([
--   #include <qdom.h>
-- ],
-- [
--   QDomDocument doc;
-- ],
--  kde_cv_have_kdeqtaddon=yes,
--  kde_cv_have_kdeqtaddon=no
-- )
--
-- LDFLAGS=$kde_ldflags_safe
-- LIBS=$kde_libs_safe
-- CXXFLAGS=$kde_cxxflags_safe
--])
--
--AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
--
--if test "$kde_cv_have_kdeqtaddon" = "no"; then
--  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
--It is a separate package (and CVS module) named kde-qt-addon.])
--fi
--])
--
--AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
--[
--   AC_REQUIRE([KDE_MISC_TESTS])
--   AC_REQUIRE([KDE_CHECK_LIBDL])
--   AC_REQUIRE([K_PATH_X])
--
--if test $kde_qtver = 3; then
--   case $host in 
--               *cygwin*) lib_kded="-lkdeinit_kded" ;;
--               *) lib_kded="" ;;
--       esac
--   AC_SUBST(LIB_KDED, $lib_kded)
--   AC_SUBST(LIB_KDECORE, "-lkdecore")
--   AC_SUBST(LIB_KDEUI, "-lkdeui")
--   AC_SUBST(LIB_KIO, "-lkio")
--   AC_SUBST(LIB_KJS, "-lkjs")
--   AC_SUBST(LIB_SMB, "-lsmb")
--   AC_SUBST(LIB_KAB, "-lkab")
--   AC_SUBST(LIB_KABC, "-lkabc")
--   AC_SUBST(LIB_KHTML, "-lkhtml")
--   AC_SUBST(LIB_KSPELL, "-lkspell")
--   AC_SUBST(LIB_KPARTS, "-lkparts")
--   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
--   AC_SUBST(LIB_KUTILS, "-lkutils")
--   AC_SUBST(LIB_KDEPIM, "-lkdepim")
--   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
--   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
--   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
--   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
--# these are for backward compatibility
--   AC_SUBST(LIB_KSYCOCA, "-lkio")
--   AC_SUBST(LIB_KFILE, "-lkio")
--elif test $kde_qtver = 2; then
--   AC_SUBST(LIB_KDECORE, "-lkdecore")
--   AC_SUBST(LIB_KDEUI, "-lkdeui")
--   AC_SUBST(LIB_KIO, "-lkio")
--   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
--   AC_SUBST(LIB_SMB, "-lsmb")
--   AC_SUBST(LIB_KFILE, "-lkfile")
--   AC_SUBST(LIB_KAB, "-lkab")
--   AC_SUBST(LIB_KHTML, "-lkhtml")
--   AC_SUBST(LIB_KSPELL, "-lkspell")
--   AC_SUBST(LIB_KPARTS, "-lkparts")
--   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
--else
--   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
--   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
--   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
--   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
--   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
--fi
--])
--
--AC_DEFUN([AC_PATH_KDE],
--[
--  AC_BASE_PATH_KDE
--  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
--  [
--  if test "$enableval" = "no";
--    then ac_use_path_checking="default"
--    else ac_use_path_checking=""
--  fi
--  ],
--  [
--  if test "$kde_qtver" = 1;
--    then ac_use_path_checking=""
--    else ac_use_path_checking="default"
--  fi
--  ]
--  )
--
--  AC_CREATE_KFSSTND($ac_use_path_checking)
--
--  AC_SUBST_KFSSTND
--  KDE_CREATE_LIBS_ALIASES
--])
--
--dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
--AC_DEFUN([KDE_CHECK_FUNC_EXT],
--[
--AC_MSG_CHECKING(for $1)
--AC_CACHE_VAL(kde_cv_func_$1,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--save_CXXFLAGS="$CXXFLAGS"
--kde_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
--AC_TRY_COMPILE([
--$2
--],
--[
--$3
--],
--kde_cv_func_$1=yes,
--kde_cv_func_$1=no)
--CXXFLAGS="$save_CXXFLAGS"
--LIBS="$kde_safe_LIBS"
--AC_LANG_RESTORE
--])
--
--AC_MSG_RESULT($kde_cv_func_$1)
--
--AC_MSG_CHECKING([if $1 needs custom prototype])
--AC_CACHE_VAL(kde_cv_proto_$1,
--[
--if test "x$kde_cv_func_$1" = xyes; then
--  kde_cv_proto_$1=no
--else
--  case "$1" in
--	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
--		kde_cv_proto_$1="yes - in libkdefakes"
--		;;
--	*)
--		kde_cv_proto_$1=unknown
--		;;
--  esac
--fi
--
--if test "x$kde_cv_proto_$1" = xunknown; then
--
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--  kde_safe_libs=$LIBS
--  LIBS="$LIBS $X_EXTRA_LIBS"
--  AC_TRY_LINK([
--$2
--
--extern "C" $4;
--],
--[
--$3
--],
--[ kde_cv_func_$1=yes
--  kde_cv_proto_$1=yes ],
--  [kde_cv_proto_$1="$1 unavailable"]
--)
--LIBS=$kde_safe_libs
--AC_LANG_RESTORE
--fi
--])
--AC_MSG_RESULT($kde_cv_proto_$1)
--
--if test "x$kde_cv_func_$1" = xyes; then
--  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
--  $6
--fi
--if test "x$kde_cv_proto_$1" = xno; then
--  AC_DEFINE(HAVE_$5_PROTO, 1,
--  [Define if you have the $1 prototype])
--fi
--
--AH_VERBATIM([_HAVE_$5_PROTO],
--[
--#if !defined(HAVE_$5_PROTO)
--#ifdef __cplusplus
--extern "C" {
--#endif
--$4;
--#ifdef __cplusplus
--}
--#endif
--#endif
--])
--])
--
--AC_DEFUN([AC_CHECK_SETENV],
--[
--	KDE_CHECK_FUNC_EXT(setenv, [
--#include <stdlib.h>
--], 
--		[setenv("VAR", "VALUE", 1);],
--	        [int setenv (const char *, const char *, int)],
--		[SETENV])
--])
--
--AC_DEFUN([AC_CHECK_UNSETENV],
--[
--	KDE_CHECK_FUNC_EXT(unsetenv, [
--#include <stdlib.h>
--], 
--		[unsetenv("VAR");],
--	        [void unsetenv (const char *)],
--		[UNSETENV])
--])
--
--AC_DEFUN([AC_CHECK_GETDOMAINNAME],
--[
--	KDE_CHECK_FUNC_EXT(getdomainname, [
--#include <stdlib.h>
--#include <unistd.h>
--#include <netdb.h>
--], 
--		[
--char buffer[200];
--getdomainname(buffer, 200);
--], 	
--	        [#include <sys/types.h>
--		int getdomainname (char *, size_t)],
--		[GETDOMAINNAME])
--])
--
--AC_DEFUN([AC_CHECK_GETHOSTNAME],
--[
--	KDE_CHECK_FUNC_EXT(gethostname, [
--#include <stdlib.h>
--#include <unistd.h>
--], 
--		[
--char buffer[200];
--gethostname(buffer, 200);
--], 	
--	        [int gethostname (char *, unsigned int)],
--		[GETHOSTNAME])
--])
--
--AC_DEFUN([AC_CHECK_USLEEP],
--[
--	KDE_CHECK_FUNC_EXT(usleep, [
--#include <unistd.h>
--], 
--		[
--usleep(200);
--], 	
--	        [int usleep (unsigned int)],
--		[USLEEP])
--])
--
--
--AC_DEFUN([AC_CHECK_RANDOM],
--[
--	KDE_CHECK_FUNC_EXT(random, [
--#include <stdlib.h>
--], 
--		[
--random();
--], 	
--	        [long int random(void)],
--		[RANDOM])
--
--	KDE_CHECK_FUNC_EXT(srandom, [
--#include <stdlib.h>
--], 
--		[
--srandom(27);
--], 	
--	        [void srandom(unsigned int)],
--		[SRANDOM])
--
--])
--
--AC_DEFUN([AC_CHECK_INITGROUPS],
--[
--	KDE_CHECK_FUNC_EXT(initgroups, [
--#include <sys/types.h>
--#include <unistd.h>
--#include <grp.h>
--],
--	[
--char buffer[200];
--initgroups(buffer, 27);
--],
--	[int initgroups(const char *, gid_t)],
--	[INITGROUPS])
--])
--
--AC_DEFUN([AC_CHECK_MKSTEMPS],
--[
--	KDE_CHECK_FUNC_EXT(mkstemps, [
--#include <stdlib.h>
--#include <unistd.h>
--],
--	[
--mkstemps("/tmp/aaaXXXXXX", 6);
--],
--	[int mkstemps(char *, int)],
--	[MKSTEMPS])
--])
--
--AC_DEFUN([AC_CHECK_MKSTEMP],
--[
--	KDE_CHECK_FUNC_EXT(mkstemp, [
--#include <stdlib.h>
--#include <unistd.h>
--],
--	[
--mkstemp("/tmp/aaaXXXXXX");
--],
--	[int mkstemp(char *)],
--	[MKSTEMP])
--])
--
--AC_DEFUN([AC_CHECK_MKDTEMP],
--[
--	KDE_CHECK_FUNC_EXT(mkdtemp, [
--#include <stdlib.h>
--#include <unistd.h>
--],
--	[
--mkdtemp("/tmp/aaaXXXXXX");
--],
--	[char *mkdtemp(char *)],
--	[MKDTEMP])
--])
--
--
--AC_DEFUN([AC_CHECK_RES_INIT],
--[
--  AC_MSG_CHECKING([if res_init needs -lresolv])
--  kde_libs_safe="$LIBS"
--  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
--  AC_TRY_LINK(
--    [
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--    ],
--    [
--      res_init(); 
--    ],
--    [
--      LIBRESOLV="-lresolv"
--      AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
--    ],
--    [ AC_MSG_RESULT(no) ]
--  )
--  LIBS=$kde_libs_safe
--  AC_SUBST(LIBRESOLV)
--
--  KDE_CHECK_FUNC_EXT(res_init,
--    [
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--    ],
--    [res_init()],
--    [int res_init(void)],
--    [RES_INIT])
--])
--
--AC_DEFUN([AC_CHECK_STRLCPY],
--[
--	KDE_CHECK_FUNC_EXT(strlcpy, [
--#include <string.h>
--],
--[ char buf[20];
--  strlcpy(buf, "KDE function test", sizeof(buf));
--],
-- 	[unsigned long strlcpy(char*, const char*, unsigned long)],
--	[STRLCPY])
--])
--
--AC_DEFUN([AC_CHECK_STRLCAT],
--[
--	KDE_CHECK_FUNC_EXT(strlcat, [
--#include <string.h>
--],
--[ char buf[20];
--  buf[0]='\0';
--  strlcat(buf, "KDE function test", sizeof(buf));
--],
-- 	[unsigned long strlcat(char*, const char*, unsigned long)],
--	[STRLCAT])
--])
--
--AC_DEFUN([AC_CHECK_RES_QUERY],
--[
--	KDE_CHECK_FUNC_EXT(res_query, [
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--#include <netdb.h>
--],
--[
--res_query(NULL, 0, 0, NULL, 0);
--],
--	[int res_query(const char *, int, int, unsigned char *, int)],
--	[RES_QUERY])
--])
--
--AC_DEFUN([AC_CHECK_DN_SKIPNAME],
--[
--	KDE_CHECK_FUNC_EXT(dn_skipname, [
--#include <sys/types.h>
--#include <netinet/in.h>
--#include <arpa/nameser.h>
--#include <resolv.h>
--],
--[
--dn_skipname (NULL, NULL);
--],
--	[int dn_skipname (unsigned char *, unsigned char *)],
--	[DN_SKIPNAME])
--])
--
--
--AC_DEFUN([AC_FIND_GIF],
--   [AC_MSG_CHECKING([for giflib])
--AC_CACHE_VAL(ac_cv_lib_gif,
--[ac_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
--else
--LIBS="$all_libraries -lgif"
--fi
--AC_TRY_LINK(dnl
--[
--#ifdef __cplusplus
--extern "C" {
--#endif
--int GifLastError(void);
--#ifdef __cplusplus
--}
--#endif
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--],
--            [return GifLastError();],
--            eval "ac_cv_lib_gif=yes",
--            eval "ac_cv_lib_gif=no")
--LIBS="$ac_save_LIBS"
--])dnl
--if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
--  AC_MSG_RESULT(yes)
--  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
--else
--  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
--fi
--])
--
--AC_DEFUN([KDE_FIND_JPEG_HELPER],
--[
--AC_MSG_CHECKING([for libjpeg$2])
--AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
--[
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--AC_TRY_LINK(
--[
--#ifdef __cplusplus
--extern "C" {
--#endif
--void jpeg_CreateDecompress();
--#ifdef __cplusplus
--}
--#endif
--],
--[jpeg_CreateDecompress();],
--            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
--            eval "ac_cv_lib_jpeg_$1=no")
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
--])
--
--if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
--  LIBJPEG="$ac_cv_lib_jpeg_$1"
--  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
--else
--  AC_MSG_RESULT(no)
--  $3
--fi
--
--])
--
--AC_DEFUN([AC_FIND_JPEG],
--[
--dnl first look for libraries
--KDE_FIND_JPEG_HELPER(6b, 6b,
--   KDE_FIND_JPEG_HELPER(normal, [],
--    [
--       LIBJPEG=
--    ]
--   )
--)
--
--dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
--dnl requires system dependent includes loaded before it)
--jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
--AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
--test "x$jpeg_incdir" = xNO && jpeg_incdir=
--
--dnl if headers _and_ libraries are missing, this is no error, and we
--dnl continue with a warning (the user will get no jpeg support in khtml)
--dnl if only one is missing, it means a configuration error, but we still
--dnl only warn
--if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
--  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
--else
--  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
--    AC_MSG_WARN([
--There is an installation error in jpeg support. You seem to have only one
--of either the headers _or_ the libraries installed. You may need to either
--provide correct --with-extra-... options, or the development package of
--libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
--Disabling JPEG support.
--])
--  else
--    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
--  fi
--  jpeg_incdir=
--  LIBJPEG=
--fi
--
--AC_SUBST(LIBJPEG)
--AH_VERBATIM(_AC_CHECK_JPEG,
--[/*
-- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
-- * headers and I'm too lazy to write a configure test as long as only
-- * unixware is related
-- */
--#ifdef _UNIXWARE
--#define HAVE_BOOLEAN
--#endif
--])
--])
--
--AC_DEFUN([KDE_CHECK_QT_JPEG],
--[
--if test -n "$LIBJPEG"; then
--AC_MSG_CHECKING([if Qt needs $LIBJPEG])
--AC_CACHE_VAL(kde_cv_qt_jpeg,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
--LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
--AC_TRY_LINK(
--[#include <qapplication.h>],
--            [
--            int argc;
--            char** argv;
--            QApplication app(argc, argv);],
--            eval "kde_cv_qt_jpeg=no",
--            eval "kde_cv_qt_jpeg=yes")
--LIBS="$ac_save_LIBS"
--CXXFLAGS="$ac_save_CXXFLAGS"
--AC_LANG_RESTORE
--fi
--])
--
--if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
--  AC_MSG_RESULT(yes)
--  LIBJPEG_QT='$(LIBJPEG)'
--else
--  AC_MSG_RESULT(no)
--  LIBJPEG_QT=
--fi
--
--])
--
--AC_DEFUN([AC_FIND_ZLIB],
--[
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--AC_MSG_CHECKING([for libz])
--AC_CACHE_VAL(ac_cv_lib_z,
--[
--kde_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--AC_TRY_LINK(dnl
--[
--#include<zlib.h>
--],
--[
--  char buf[42];
--  gzFile f = (gzFile) 0;
--  /* this would segfault.. but we only link, don't run */
--  (void) gzgets(f, buf, sizeof(buf));
--
--  return (zlibVersion() == ZLIB_VERSION); 
--],
--            eval "ac_cv_lib_z='-lz'",
--            eval "ac_cv_lib_z=no")
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
--])dnl
--if test ! "$ac_cv_lib_z" = no; then
--  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
--  LIBZ="$ac_cv_lib_z"
--  AC_MSG_RESULT($ac_cv_lib_z)
--else
--  AC_MSG_ERROR(not found. 
--          Possibly configure picks up an outdated version
--          installed by XFree86. Remove it from your system.
--
--          Check your installation and look into config.log)
--  LIBZ=""
--fi
--AC_SUBST(LIBZ)
--])
--
--AC_DEFUN([KDE_TRY_TIFFLIB],
--[
--AC_MSG_CHECKING([for libtiff $1])
--
--AC_CACHE_VAL(kde_cv_libtiff_$1,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
--else
--LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
--fi
--kde_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
--
--AC_TRY_LINK(dnl
--[
--#include<tiffio.h>
--],
--    [return (TIFFOpen( "", "r") == 0); ],
--[
--    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
--], [
--    kde_cv_libtiff_$1=no
--])
--
--LIBS="$kde_save_LIBS"
--CXXFLAGS="$kde_save_CXXFLAGS"
--AC_LANG_RESTORE
--])
--
--if test "$kde_cv_libtiff_$1" = "no"; then
--    AC_MSG_RESULT(no)
--    LIBTIFF=""
--    $3
--else
--    LIBTIFF="$kde_cv_libtiff_$1"
--    AC_MSG_RESULT(yes)
--    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
--    $2
--fi
--
--])
--
--AC_DEFUN([AC_FIND_TIFF],
--[
--AC_REQUIRE([K_PATH_X])
--AC_REQUIRE([AC_FIND_ZLIB])
--AC_REQUIRE([AC_FIND_JPEG])
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--
--KDE_TRY_TIFFLIB(tiff, [],
--   KDE_TRY_TIFFLIB(tiff34))
--
--AC_SUBST(LIBTIFF)
--])
--
--AC_DEFUN([KDE_FIND_LIBEXR],
--[
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--AC_REQUIRE([AC_FIND_ZLIB])
--AC_CACHE_VAL(ac_cv_libexr,
--[
--  if test -z "$PKG_CONFIG"; then
--    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--  fi
--
--  AC_MSG_CHECKING([for OpenEXR libraries])
--
--  if test "$PKG_CONFIG" = "no" ; then
--     AC_MSG_RESULT(no)
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
--        AC_MSG_RESULT(no)
--        EXRSTATUS=no
--     else
--        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
--           AC_MSG_RESULT(no)
--           EXRSTATUS=old
--        else
--           kde_save_LIBS="$LIBS"
--           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
--           AC_LANG_SAVE
--           AC_LANG_CPLUSPLUS
--           kde_save_CXXFLAGS="$CXXFLAGS"
--           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
--           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
--
--           AC_TRY_LINK(dnl
--               [
--               #include <ImfRgbaFile.h>
--               ],
--               [
--               using namespace Imf;
--               RgbaInputFile file ("dummy");
--               return 0;
--               ],
--               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
--               eval "ac_cv_libexr=no"
--           )
--           LIBS="$kde_save_LIBS"
--           CXXFLAGS="$kde_save_CXXFLAGS"
--           AC_LANG_RESTORE
--           ])dnl
--           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
--               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
--               LIB_EXR="$ac_cv_libexr"
--               AC_MSG_RESULT($ac_cv_libexr)
--           else
--               AC_MSG_RESULT(no)
--               LIB_EXR=""
--           fi
--        fi
--     fi
--  fi
--  AC_SUBST(LIB_EXR)
--  AC_SUBST(EXR_FLAGS)
--])
--
--
--
--AC_DEFUN([AC_FIND_PNG],
--[
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--AC_REQUIRE([AC_FIND_ZLIB])
--AC_MSG_CHECKING([for libpng])
--AC_CACHE_VAL(ac_cv_lib_png,
--[
--kde_save_LIBS="$LIBS"
--if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
--else
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
--fi
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--
--AC_TRY_LINK(dnl
--    [
--    #include<png.h>
--    ],
--    [
--    png_structp png_ptr = png_create_read_struct(  /* image ptr */
--		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
--    return( png_ptr != 0 );
--    ],
--    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
--    eval "ac_cv_lib_png=no"
--)
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
--])dnl
--if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
--  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
--  LIBPNG="$ac_cv_lib_png"
--  AC_SUBST(LIBPNG)
--  AC_MSG_RESULT($ac_cv_lib_png)
--else
--  AC_MSG_RESULT(no)
--  LIBPNG=""
--  AC_SUBST(LIBPNG)
--fi
--])
--
--
--AC_DEFUN([AC_FIND_JASPER],
--[
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--AC_REQUIRE([AC_FIND_JPEG])
--AC_MSG_CHECKING([for jasper])
--AC_CACHE_VAL(ac_cv_jasper,
--[
--kde_save_LIBS="$LIBS"
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
--kde_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
--
--AC_TRY_LINK(dnl
--    [
--    #include<jasper/jasper.h>
--    ],
--    [
--    return( jas_init() );
--    ],
--    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
--    eval "ac_cv_jasper=no"
--)
--LIBS="$kde_save_LIBS"
--CFLAGS="$kde_save_CFLAGS"
--])dnl
--if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
--  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
--  LIB_JASPER="$ac_cv_jasper"
--  AC_MSG_RESULT($ac_cv_jasper)
--else
--  AC_MSG_RESULT(no)
--  LIB_JASPER=""
--fi
--AC_SUBST(LIB_JASPER)
--])
--
--AC_DEFUN([AC_CHECK_BOOL],
--[
--  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
--])
--
--AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
--[
--AC_MSG_CHECKING(if you need GNU extensions)
--AC_CACHE_VAL(ac_cv_gnu_extensions,
--[
--cat > conftest.c << EOF
--#include <features.h>
--
--#ifdef __GNU_LIBRARY__
--yes
--#endif
--EOF
--
--if (eval "$ac_cpp conftest.c") 2>&5 |
--  egrep "yes" >/dev/null 2>&1; then
--  rm -rf conftest*
--  ac_cv_gnu_extensions=yes
--else
--  ac_cv_gnu_extensions=no
--fi
--])
--
--AC_MSG_RESULT($ac_cv_gnu_extensions)
--if test "$ac_cv_gnu_extensions" = "yes"; then
--  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
--fi
--])
--
--AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
--[
--AC_MSG_CHECKING([whether $CXX supports -$1])
--kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
--AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
--[
--  AC_LANG_SAVE
--  AC_LANG_CPLUSPLUS
--  save_CXXFLAGS="$CXXFLAGS"
--  CXXFLAGS="$CXXFLAGS -$1"
--  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
--  CXXFLAGS="$save_CXXFLAGS"
--  AC_LANG_RESTORE
--])
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- AC_MSG_RESULT(yes)
-- :
-- $2
--else
-- AC_MSG_RESULT(no)
-- :
-- $3
--fi
--])
--
--AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG],
--[
--AC_MSG_CHECKING([whether $CC supports -$1])
--kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
--AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache,
--[
--  AC_LANG_SAVE
--  AC_LANG_C
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -$1"
--  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], [])
--  CFLAGS="$save_CFLAGS"
--  AC_LANG_RESTORE
--])
--if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
-- AC_MSG_RESULT(yes)
-- :
-- $2
--else
-- AC_MSG_RESULT(no)
-- :
-- $3
--fi
--])
--
--
--dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
--dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
--dnl it's all white-space separated
--AC_DEFUN([AC_REMOVE_FORBIDDEN],
--[ __val=$$1
--  __forbid=" $2 "
--  if test -n "$__val"; then
--    __new=""
--    ac_save_IFS=$IFS
--    IFS=" 	"
--    for i in $__val; do
--      case "$__forbid" in
--        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
--	*) # Careful to not add spaces, where there were none, because otherwise
--	   # libtool gets confused, if we change e.g. CXX
--	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
--      esac
--    done
--    IFS=$ac_save_IFS
--    $1=$__new
--  fi
--])
--
--
--AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
--[
--  AC_MSG_CHECKING([whether $CC is blacklisted])
--
--  dnl In theory we have tu run this test against $CC and $CXX
--  dnl in C and in C++ mode, because its perfectly legal for
--  dnl the user to mix compiler versions, since C has a defined
--  dnl ABI. 
--  dnl 
--  dnl For now, we assume the user is not on crack.
--
--  AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
--  kde_bad_compiler=no, 
--  kde_bad_compiler=yes
--)
--
--  AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
--  AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version. 
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
--
--])
--
--
--AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
--[
--  AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
--    kde_cv_opt_noinline_match,
--  [
--  kde_cv_opt_noinline_match=irrelevant
--  dnl if we don't use both -O2 and -fno-inline, this check is moot
--  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
--     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
--
--    ac_cflags_save="$CFLAGS"
--    CFLAGS="$CFLAGS -D_USE_GNU"
--
--    AC_TRY_LINK([
--  #include <string.h>
--], [  const char *pt, *et;
--  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
--],
--    kde_cv_opt_noinline_match=yes,
--    kde_cv_opt_noinline_match=no
--    )
--
--    CFLAGS="$ac_cflags_save"
--  fi
--  ])
--])
--
--
--dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
--AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
--[dnl
--if test "x$kde_use_qt_emb" != "xyes"; then
-- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
-- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
--else
-- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
-- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
--fi
--])
--
--AC_DEFUN([AC_CHECK_COMPILERS],
--[
--  AC_ARG_ENABLE(debug,
--	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
--  [
--    case $enableval in
--      yes)
--        kde_use_debug_code="yes"
--        kde_use_debug_define=no
--        ;;
--      full)
--        kde_use_debug_code="full"
--        kde_use_debug_define=no
--        ;;
--      *)
--        kde_use_debug_code="no"
--        kde_use_debug_define=yes
--        ;;
--    esac
--  ], 
--    [kde_use_debug_code="no"
--      kde_use_debug_define=no
--  ])
--
--  dnl Just for configure --help
--  AC_ARG_ENABLE(dummyoption,
--	        AC_HELP_STRING([--disable-debug],
--	  		       [disables debug output and debug symbols [default=no]]),
--		[],[])
--
--  AC_ARG_ENABLE(strict,
--		AC_HELP_STRING([--enable-strict],
--			      [compiles with strict compiler options (may not work!)]),
--   [
--    if test $enableval = "no"; then
--         kde_use_strict_options="no"
--       else
--         kde_use_strict_options="yes"
--    fi
--   ], [kde_use_strict_options="no"])
--
--  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
--   [
--    if test $enableval = "no"; then
--         kde_use_warnings="no"
--       else
--         kde_use_warnings="yes"
--    fi
--   ], [kde_use_warnings="yes"])
--
--  dnl enable warnings for debug build
--  if test "$kde_use_debug_code" != "no"; then
--    kde_use_warnings=yes
--  fi
--
--  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
--    [kde_use_profiling=$enableval],
--    [kde_use_profiling="no"]
--  )
--
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
--  AC_PROG_CPP
--
--  if test "$GCC" = "yes"; then
--    if test "$kde_use_debug_code" != "no"; then
--      if test $kde_use_debug_code = "full"; then
--        CFLAGS="-g3 -fno-inline $CFLAGS"
--      else
--        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
--      fi
--    else
--      CFLAGS="-O2 $CFLAGS"
--    fi
--  fi
--
--  if test "$kde_use_debug_define" = "yes"; then
--    CFLAGS="-DNDEBUG $CFLAGS"
--  fi
--
--
--  case "$host" in
--  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
--  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
--  esac
--
--  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
--     LDFLAGS=""
--  fi
--
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
--  KDE_CHECK_FOR_BAD_COMPILER
--
--  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
--    if test "$kde_use_debug_code" != "no"; then
--      if test "$CXX" = "KCC"; then
--        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
--      else
--        if test "$kde_use_debug_code" = "full"; then
--          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
--        else
--          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
--        fi
--      fi
--      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
--
--      dnl convenience compiler flags
--      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
--      AC_SUBST(WOVERLOADED_VIRTUAL)
--    else
--      if test "$CXX" = "KCC"; then
--        CXXFLAGS="+K3 $CXXFLAGS"
--      else
--        CXXFLAGS="-O2 $CXXFLAGS"
--      fi
--    fi
--  fi
--
--  if test "$kde_use_debug_define" = "yes"; then
--    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
--  fi  
--
--  if test "$kde_use_profiling" = "yes"; then
--    KDE_CHECK_COMPILER_FLAG(pg,
--    [
--      CFLAGS="-pg $CFLAGS"
--      CXXFLAGS="-pg $CXXFLAGS"
--    ])
--  fi
--
--  if test "$kde_use_warnings" = "yes"; then
--      if test "$GCC" = "yes"; then
--        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
--        case $host in
--          *-*-linux-gnu)	
--            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
--            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
--            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
--            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
--          ;;
--        esac
--        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
--        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
--        dnl ### FIXME: revert for KDE 4
--        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
--     fi
--  fi
--
--  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
--    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
--  fi
--
--  AC_ARG_ENABLE(pch,
--     AC_HELP_STRING([--enable-pch],
--                    [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
--    [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
-- 
--  HAVE_GCC_VISIBILITY=0
--  AC_SUBST([HAVE_GCC_VISIBILITY])
--
--  if test "$GXX" = "yes"; then
--    gcc_no_reorder_blocks=NO
--    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
--    if test $kde_use_debug_code != "no" && \
--       test $kde_use_debug_code != "full" && \
--       test "YES" = "$gcc_no_reorder_blocks" ; then
--          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
--          CFLAGS="$CFLAGS -fno-reorder-blocks"
--    fi
--    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
--    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
--    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
--    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
--    ENABLE_PERMISSIVE_FLAG="-fpermissive"
--
--    if test "$kde_use_pch" = "yes"; then
--        AC_MSG_CHECKING(whether gcc supports precompiling c header files)
--        echo >conftest.h
--        if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
--            kde_gcc_supports_pch=yes
--            AC_MSG_RESULT(yes)
--        else
--            kde_gcc_supports_pch=no
--            AC_MSG_RESULT(no)
--        fi
--        if test "$kde_gcc_supports_pch" = "yes"; then
--            AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
--            if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
--                kde_gcc_supports_pch=yes
--                AC_MSG_RESULT(yes)
--            else
--                kde_gcc_supports_pch=no
--                AC_MSG_RESULT(no)
--            fi
--        fi
--        rm -f conftest.h conftest.h.gch
--    fi
--
--    KDE_CHECK_FOR_OPT_NOINLINE_MATCH
--    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
--       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
--    fi
--  fi
--  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
--  if test "$CXX" = "KCC"; then
--    dnl unfortunately we currently cannot disable exception support in KCC
--    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
--    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
--    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
--
--    if test "$kde_use_pch" = "yes"; then
--      dnl TODO: support --pch-dir!
--      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
--      dnl the below works (but the dir must exist), but it's
--      dnl useless for a whole package.
--      dnl The are precompiled headers for each source file, so when compiling
--      dnl from scratch, it doesn't make a difference, and they take up
--      dnl around ~5Mb _per_ sourcefile.
--      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
--      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
--    fi
--    dnl this flag controls inlining. by default KCC inlines in optimisation mode
--    dnl all implementations that are defined inside the class {} declaration. 
--    dnl because of templates-compatibility with broken gcc compilers, this
--    dnl can cause excessive inlining. This flag limits it to a sane level
--    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
--    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
--    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
--    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
--    dnl Some source files are shared between multiple executables
--    dnl (or libraries) and some of those need template instantiations.
--    dnl In that case KCC needs to compile those sources with
--    dnl --one_instantiation_per_object.  To make it easy for us we compile
--    dnl _all_ objects with that flag (--one_per is a shorthand).
--    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
--  fi
--  AC_SUBST(USE_EXCEPTIONS)
--  dnl obsolete macro - provided to keep things going
--  USE_RTTI=
--  AC_SUBST(USE_RTTI)
--
--  case "$host" in
--      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
--      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
--      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
--      *-*-solaris*) 
--        if test "$GXX" = yes; then
--          libstdcpp=`$CXX -print-file-name=libstdc++.so`
--          if test ! -f $libstdcpp; then
--             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
--          fi
--        fi
--        ;;
--  esac
--
--  AC_VALIDIFY_CXXFLAGS
--
--  AC_PROG_CXXCPP
--
--  if test "$GCC" = yes; then
--     NOOPT_CFLAGS=-O0
--  fi
--  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
--
--  AC_ARG_ENABLE(coverage,
--    AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
--      if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
--        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
--        ac_coverage_linker="-lgcc"
--      elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
--        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
--        ac_coverage_linker=""
--      else
--        AC_MSG_ERROR([coverage with your compiler is not supported])
--      fi
--      CFLAGS="$CFLAGS $ac_coverage_compiler"
--      CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
--      LDFLAGS="$LDFLAGS $ac_coverage_linker"
--    ])
--
--  AC_SUBST(NOOPT_CXXFLAGS)
--  AC_SUBST(NOOPT_CFLAGS)
--  AC_SUBST(ENABLE_PERMISSIVE_FLAG)
--
--  KDE_CHECK_NEW_LDFLAGS
--  KDE_CHECK_FINAL
--  KDE_CHECK_CLOSURE
--  KDE_CHECK_NMCHECK
--
--  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
--])
--
--AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
--  [
--    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
--      [
--        AC_LANG_SAVE
--        AC_LANG_CPLUSPLUS
--
--        safe_CXXFLAGS=$CXXFLAGS
--        safe_LDFLAGS=$LDFLAGS
--        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
--        LDFLAGS="$LDFLAGS -shared -fPIC"
--
--        AC_TRY_LINK(
--        [
--          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
--	  #include <string>
--          int some_function( void ) __attribute__ ((visibility("default")));
--          int some_function( void )
--          {
--	    std::string s("blafasel");
--            return 0;
--          }
--        ], [/* elvis is alive */],
--        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
--
--        CXXFLAGS=$safe_CXXFLAGS
--        LDFLAGS=$safe_LDFLAGS
--        AC_LANG_RESTORE
--      ]
--    )
--
--    if test x$kde_cv_val_gcc_visibility_bug = xno; then
--      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
--    fi
--  ]
--)
--
--AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
--[
--  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
--
--  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
--
--  if test "x$GXX" = "xyes"; then
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    AC_EGREP_CPP(
--       [GCC visibility push],
--       [ #include <exception> 
--       ], 
--    [
--      AC_MSG_RESULT(yes)
--      kde_stdc_visibility_patched=yes ],
--    [ 
--      AC_MSG_RESULT(no)
--      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
--                   visibility support. Disabling -fvisibility=hidden])
--
--      kde_stdc_visibility_patched=no ])
--
--    AC_LANG_RESTORE
--
--    kde_have_gcc_visibility=no
--    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
--    [
--      kde_have_gcc_visibility=yes
--      dnl the whole toolchain is just a mess, gcc is just too buggy
--      dnl to handle STL with visibility enabled. Lets reconsider 
--      dnl when gcc 4.2 is out or when things get fixed in the compiler.
--      dnl Contact mueller@kde.org for details.
--      AC_ARG_ENABLE(gcc-hidden-visibility,
--        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
--          [kde_have_gcc_visibility=$enableval],
--          [kde_have_gcc_visibility=no])
--
--      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
--        [
--          AC_LANG_SAVE
--          AC_LANG_CPLUSPLUS
--
--          safe_CXXFLAGS=$CXXFLAGS
--          CXXFLAGS="$CXXFLAGS $all_includes"
--
--          AC_TRY_COMPILE(
--          [
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
--          ], [/* elvis is alive */],
--          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
--
--          CXXFLAGS=$safe_CXXFLAGS
--          AC_LANG_RESTORE
--        ]
--      )
--
--      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--        KDE_CHECK_VISIBILITY_GCC_BUG
--        HAVE_GCC_VISIBILITY=1
--        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
--      fi
--    ])
--  fi
--])
--
--AC_DEFUN([KDE_ADD_DEPENDENCIES],
--[
--   [A]M_DEPENDENCIES(CC)
--   [A]M_DEPENDENCIES(CXX)
--])
--
--dnl just a wrapper to clean up configure.in
--AC_DEFUN([KDE_PROG_LIBTOOL],
--[
--AC_REQUIRE([AC_CHECK_COMPILERS])
--AC_REQUIRE([AC_ENABLE_SHARED])
--AC_REQUIRE([AC_ENABLE_STATIC])
--
--AC_REQUIRE([AC_LIBTOOL_DLOPEN])
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--AC_OBJEXT
--AC_EXEEXT
--
--AM_PROG_LIBTOOL
--AC_LIBTOOL_CXX
--
--LIBTOOL_SHELL="/bin/sh ./libtool"
--#  LIBTOOL="$LIBTOOL --silent"
--KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
--AC_SUBST(KDE_PLUGIN)
--
--# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
--KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
--AC_SUBST(KDE_CHECK_PLUGIN)
--
--# we patch configure quite some so we better keep that consistent for incremental runs 
--AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
--])
--
--AC_DEFUN([KDE_CHECK_LIB64],
--[
--    AC_ARG_ENABLE(libsuffix,
--        AC_HELP_STRING([--enable-libsuffix],
--            [/lib directory suffix (64,32,none,auto[=default])]),
--            kdelibsuff=$enableval, kdelibsuff="auto")
--    
--    if test "$kdelibsuff" = "auto"; then
--    
--cat > conftest.c << EOF
--#include <stdio.h>
--int main() {
-- return 0;
--}
--EOF
--        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
--    s,.*/lib\([[^\/]]*\)/.*,\1, 
--    p 
--}'`
--	rm -rf conftest.*
--    fi	
--	
--    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
--       kdelibsuff=
--    fi
--    if test -z "$kdelibsuff"; then
--        AC_MSG_RESULT([not using lib directory suffix])
--        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
--    else
--        if test "$libdir" = '${exec_prefix}/lib'; then
--            libdir="$libdir${kdelibsuff}"
--            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
--        fi
--        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
--        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
--    fi
--])
--
--AC_DEFUN([KDE_CHECK_TYPES],
--[  AC_CHECK_SIZEOF(int, 4)dnl
--   AC_CHECK_SIZEOF(short)dnl
--  AC_CHECK_SIZEOF(long, 4)dnl
--  AC_CHECK_SIZEOF(char *, 4)dnl
--])dnl
--
--dnl Not used - kept for compat only?
--AC_DEFUN([KDE_DO_IT_ALL],
--[
--AC_CANONICAL_SYSTEM
--AC_ARG_PROGRAM
--AM_INIT_AUTOMAKE($1, $2)
--AM_DISABLE_LIBRARIES
--AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
--AC_CHECK_COMPILERS
--KDE_PROG_LIBTOOL
--AM_KDE_WITH_NLS
--AC_PATH_KDE
--])
--
--AC_DEFUN([AC_CHECK_RPATH],
--[
--AC_MSG_CHECKING(for rpath)
--AC_ARG_ENABLE(rpath,
--      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
--      USE_RPATH=$enableval, USE_RPATH=yes)
--
--if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
--
--  KDE_RPATH="-R \$(libdir)"
--
--  if test "$kde_libraries" != "$libdir"; then
--      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
--  fi
--
--  if test -n "$qt_libraries"; then
--    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
--  fi
--  dnl $x_libraries is set to /usr/lib in case
--  if test -n "$X_LDFLAGS"; then
--    X_RPATH="-R \$(x_libraries)"
--    KDE_RPATH="$KDE_RPATH $X_RPATH"
--  fi
--  if test -n "$KDE_EXTRA_RPATH"; then
--    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
--  fi
--fi
--AC_SUBST(KDE_EXTRA_RPATH)
--AC_SUBST(KDE_RPATH)
--AC_SUBST(X_RPATH)
--AC_MSG_RESULT($USE_RPATH)
--])
--
--dnl Check for the type of the third argument of getsockname
--AC_DEFUN([AC_CHECK_SOCKLEN_T],
--[
--   AC_MSG_CHECKING(for socklen_t)
--   AC_CACHE_VAL(kde_cv_socklen_t,
--   [
--      AC_LANG_PUSH(C++)
--      kde_cv_socklen_t=no
--      AC_TRY_COMPILE([
--         #include <sys/types.h>
--         #include <sys/socket.h>
--      ],
--      [
--         socklen_t len;
--         getpeername(0,0,&len);
--      ],
--      [
--         kde_cv_socklen_t=yes
--         kde_cv_socklen_t_equiv=socklen_t
--      ])
--      AC_LANG_POP(C++)
--   ])
--   AC_MSG_RESULT($kde_cv_socklen_t)
--   if test $kde_cv_socklen_t = no; then
--      AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
--      AC_CACHE_VAL(kde_cv_socklen_t_equiv,
--      [
--         kde_cv_socklen_t_equiv=int
--         AC_LANG_PUSH(C++)
--         for t in int size_t unsigned long "unsigned long"; do
--            AC_TRY_COMPILE([
--               #include <sys/types.h>
--               #include <sys/socket.h>
--            ],
--            [
--               $t len;
--               getpeername(0,0,&len);
--            ],
--            [
--               kde_cv_socklen_t_equiv="$t"
--               break
--            ])
--         done
--         AC_LANG_POP(C++)
--      ])
--      AC_MSG_RESULT($kde_cv_socklen_t_equiv)
--   fi
--   AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
--                     [type to use in place of socklen_t if not defined])
--   AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
--                     [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
--])
--
--dnl This is a merge of some macros out of the gettext aclocal.m4
--dnl since we don't need anything, I took the things we need
--dnl the copyright for them is:
--dnl >
--dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
--dnl This Makefile.in is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--dnl >
--dnl for this file it is relicensed under LGPL
--
--AC_DEFUN([AM_KDE_WITH_NLS],
--  [
--    dnl If we use NLS figure out what method
--
--    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
--        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
--    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--
--     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
--        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
--        GMSGFMT=":"
--      fi
--      MSGFMT=$GMSGFMT
--      AC_SUBST(GMSGFMT)
--      AC_SUBST(MSGFMT)
--
--      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
--	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
--
--      dnl Test whether we really found GNU xgettext.
--      if test "$XGETTEXT" != ":"; then
--	dnl If it is no GNU xgettext we define it as : so that the
--	dnl Makefiles still can work.
--	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
--	  : ;
--	else
--	  AC_MSG_RESULT(
--	    [found xgettext programs is not GNU xgettext; ignore it])
--	  XGETTEXT=":"
--	fi
--      fi
--     AC_SUBST(XGETTEXT)
--
--  ])
--
--# Search path for a program which passes the given test.
--# Ulrich Drepper <drepper@cygnus.com>, 1996.
--
--# serial 1
--# Stephan Kulow: I appended a _KDE against name conflicts
--
--dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
--dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
--  /*)
--  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in ifelse([$5], , $PATH, [$5]); do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      if [$3]; then
--	ac_cv_path_$1="$ac_dir/$ac_word"
--	break
--      fi
--    fi
--  done
--  IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
--  ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test -n "[$]$1"; then
--  AC_MSG_RESULT([$]$1)
--else
--  AC_MSG_RESULT(no)
--fi
--AC_SUBST($1)dnl
--])
--
--
--# Check whether LC_MESSAGES is available in <locale.h>.
--# Ulrich Drepper <drepper@cygnus.com>, 1995.
--
--# serial 1
--
--AC_DEFUN([AM_LC_MESSAGES],
--  [if test $ac_cv_header_locale_h = yes; then
--    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
--      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
--       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
--    if test $am_cv_val_LC_MESSAGES = yes; then
--      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
--    fi
--  fi])
--
--dnl From Jim Meyering.
--dnl FIXME: migrate into libit.
--
--AC_DEFUN([AM_FUNC_OBSTACK],
--[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
-- [AC_TRY_LINK([#include "obstack.h"],
--	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
--	      am_cv_func_obstack=yes,
--	      am_cv_func_obstack=no)])
-- if test $am_cv_func_obstack = yes; then
--   AC_DEFINE(HAVE_OBSTACK)
-- else
--   LIBOBJS="$LIBOBJS obstack.o"
-- fi
--])
--
--dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
--dnl FIXME: Migrate into libit
--
--AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
--[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
--              am_cv_lib_error_at_line=yes,
--	      am_cv_lib_error_at_line=no)])
-- if test $am_cv_lib_error_at_line = no; then
--   LIBOBJS="$LIBOBJS error.o"
-- fi
-- AC_SUBST(LIBOBJS)dnl
--])
--
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper@cygnus.com>, 1995.
--
--# serial 1
--# Stephan Kulow: I put a KDE in it to avoid name conflicts
--
--AC_DEFUN([AM_KDE_GNU_GETTEXT],
--  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--   AC_REQUIRE([AC_PROG_RANLIB])dnl
--   AC_REQUIRE([AC_HEADER_STDC])dnl
--   AC_REQUIRE([AC_TYPE_OFF_T])dnl
--   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
--   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
--   AC_REQUIRE([AC_FUNC_MMAP])dnl
--   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
--   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
--   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
--__argz_count __argz_stringify __argz_next])
--
--   AC_MSG_CHECKING(for stpcpy)
--   AC_CACHE_VAL(kde_cv_func_stpcpy,
--   [
--   kde_safe_cxxflags=$CXXFLAGS
--   CXXFLAGS="-Werror"
--   AC_LANG_SAVE
--   AC_LANG_CPLUSPLUS
--   AC_TRY_COMPILE([
--   #include <string.h>
--   ],
--   [
--   char buffer[200];
--   stpcpy(buffer, buffer);
--   ],
--   kde_cv_func_stpcpy=yes,
--   kde_cv_func_stpcpy=no)
--   AC_LANG_RESTORE
--   CXXFLAGS=$kde_safe_cxxflags
--   ])
--   AC_MSG_RESULT($kde_cv_func_stpcpy)
--   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
--     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
--   fi
--
--   AM_LC_MESSAGES
--
--   if test "x$CATOBJEXT" != "x"; then
--     if test "x$ALL_LINGUAS" = "x"; then
--       LINGUAS=
--     else
--       AC_MSG_CHECKING(for catalogs to be installed)
--       NEW_LINGUAS=
--       for lang in ${LINGUAS=$ALL_LINGUAS}; do
--         case "$ALL_LINGUAS" in
--          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
--         esac
--       done
--       LINGUAS=$NEW_LINGUAS
--       AC_MSG_RESULT($LINGUAS)
--     fi
--
--     dnl Construct list of names of catalog files to be constructed.
--     if test -n "$LINGUAS"; then
--       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
--     fi
--   fi
--
--  ])
--
--AC_DEFUN([AC_HAVE_XPM],
-- [AC_REQUIRE_CPP()dnl
--  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--
-- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
-- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
--
-- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
--	xpm_test=$withval, xpm_test="yes")
-- if test "x$xpm_test" = xno; then
--   ac_cv_have_xpm=no
-- else
--   AC_MSG_CHECKING(for XPM)
--   AC_CACHE_VAL(ac_cv_have_xpm,
--   [
--    ac_save_ldflags="$LDFLAGS"
--    ac_save_cflags="$CFLAGS"
--    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
--      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
--    else
--      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
--    fi
--    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
--    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
--    AC_TRY_LINK([#include <X11/xpm.h>],[],
--	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
--    LDFLAGS="$ac_save_ldflags"
--    CFLAGS="$ac_save_cflags"
--   ])dnl
--
--  if test "$ac_cv_have_xpm" = no; then
--    AC_MSG_RESULT(no)
--    XPM_LDFLAGS=""
--    XPMINC=""
--    $2
--  else
--    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
--    if test "$XPM_LDFLAGS" = ""; then
--       XPMLIB='-lXpm $(LIB_X11)'
--    else
--       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
--    fi
--    if test "$XPM_INCLUDE" = ""; then
--       XPMINC=""
--    else
--       XPMINC="-I$XPM_INCLUDE"
--    fi
--    AC_MSG_RESULT(yes)
--    $1
--  fi
-- fi
-- AC_SUBST(XPMINC)
-- AC_SUBST(XPMLIB)
--])
--
--AC_DEFUN([AC_HAVE_DPMS],
-- [AC_REQUIRE_CPP()dnl
--  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--
-- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
-- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
-- DPMS_LIB=
--
-- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
--	dpms_test=$withval, dpms_test="yes")
-- if test "x$dpms_test" = xno; then
--   ac_cv_have_dpms=no
-- else
--   AC_MSG_CHECKING(for DPMS)
--   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
--   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
--   AC_CACHE_VAL(ac_cv_have_dpms,
--   [
--    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
--      AC_MSG_RESULT(no)
--      ac_cv_have_dpms="no"
--    else
--      ac_save_ldflags="$LDFLAGS"
--      ac_save_cflags="$CFLAGS"
--      ac_save_libs="$LIBS"
--      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
--      LIBS="-lX11 -lXext $LIBSOCKET"
--      CFLAGS="$CFLAGS $X_INCLUDES"
--      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
--      AC_TRY_LINK([
--	  #include <X11/Xproto.h>
--	  #include <X11/X.h>
--	  #include <X11/Xlib.h>
--	  #include <X11/extensions/dpms.h>
--	  int foo_test_dpms()
--	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
--	  ac_cv_have_dpms="yes", [
--              LIBS="-lXdpms $LIBS"
--              AC_TRY_LINK([
--	          #include <X11/Xproto.h>
--        	  #include <X11/X.h>
--        	  #include <X11/Xlib.h>
--        	  #include <X11/extensions/dpms.h>
--        	  int foo_test_dpms()
--        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
--        	  [
--                  ac_cv_have_dpms="-lXdpms"
--                  ],ac_cv_have_dpms="no")
--              ])
--      LDFLAGS="$ac_save_ldflags"
--      CFLAGS="$ac_save_cflags"
--      LIBS="$ac_save_libs"
--    fi
--   ])dnl
--
--  if test "$ac_cv_have_dpms" = no; then
--    AC_MSG_RESULT(no)
--    DPMS_LDFLAGS=""
--    DPMSINC=""
--    $2
--  else
--    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
--    if test "$ac_cv_have_dpms" = "-lXdpms"; then
--       DPMS_LIB="-lXdpms"
--    fi
--    if test "$DPMS_LDFLAGS" = ""; then
--       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
--    else
--       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
--    fi
--    if test "$DPMS_INCLUDE" = ""; then
--       DPMSINC=""
--    else
--       DPMSINC="-I$DPMS_INCLUDE"
--    fi
--    AC_MSG_RESULT(yes)
--    $1
--  fi
-- fi
-- ac_save_cflags="$CFLAGS"
-- CFLAGS="$CFLAGS $X_INCLUDES"
-- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
--   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
-- AC_CHECK_DECL(DPMSCapable,
--   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
--   [#include <X11/Xlib.h>
--   #include <X11/extensions/dpms.h>])
-- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
--   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
-- AC_CHECK_DECL(DPMSInfo,
--   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
--   [#include <X11/Xlib.h>
--   #include <X11/extensions/dpms.h>])
-- CFLAGS="$ac_save_cflags"
-- AC_SUBST(DPMSINC)
-- AC_SUBST(DPMSLIB)
--])
--
--AC_DEFUN([AC_HAVE_GL],
-- [AC_REQUIRE_CPP()dnl
--  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--
-- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-- test -z "$GL_INCLUDE" && GL_INCLUDE=
--
-- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
--	gl_test=$withval, gl_test="yes")
-- if test "x$kde_use_qt_emb" = "xyes"; then
--   # GL and Qt Embedded is a no-go for now.
--   ac_cv_have_gl=no
-- elif test "x$gl_test" = xno; then
--   ac_cv_have_gl=no
-- else
--   AC_MSG_CHECKING(for GL)
--   AC_CACHE_VAL(ac_cv_have_gl,
--   [
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    ac_save_ldflags=$LDFLAGS
--    ac_save_cxxflags=$CXXFLAGS
--    ac_save_libs=$LIBS
--    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
--    LIBS="$LIBS -lGL -lGLU"
--    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
--    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
--    CXXFLAGS="$CFLAGS $X_INCLUDES"
--    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
--    AC_TRY_LINK([#include <GL/gl.h>
--#include <GL/glu.h>
--], [],
--	ac_cv_have_gl="yes", ac_cv_have_gl="no")
--    AC_LANG_RESTORE
--    LDFLAGS=$ac_save_ldflags
--    CXXFLAGS=$ac_save_cxxflags
--    LIBS=$ac_save_libs
--   ])dnl
--
--  if test "$ac_cv_have_gl" = "no"; then
--    AC_MSG_RESULT(no)
--    GL_LDFLAGS=""
--    GLINC=""
--    $2
--  else
--    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
--    if test "$GL_LDFLAGS" = ""; then
--       GLLIB='-lGLU -lGL $(LIB_X11)'
--    else
--       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
--    fi
--    if test "$GL_INCLUDE" = ""; then
--       GLINC=""
--    else
--       GLINC="-I$GL_INCLUDE"
--    fi
--    AC_MSG_RESULT($ac_cv_have_gl)
--    $1
--  fi
-- fi
-- AC_SUBST(GLINC)
-- AC_SUBST(GLLIB)
--])
--
--
-- dnl shadow password and PAM magic - maintained by ossi@kde.org
--
--AC_DEFUN([KDE_PAM], [
--  AC_REQUIRE([KDE_CHECK_LIBDL])
--
--  want_pam=
--  AC_ARG_WITH(pam,
--    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
--    [ if test "x$withval" = "xyes"; then
--        want_pam=yes
--        pam_service=kde
--      elif test "x$withval" = "xno"; then
--        want_pam=no
--      else
--        want_pam=yes
--        pam_service=$withval
--      fi
--    ], [ pam_service=kde ])
--
--  use_pam=
--  PAMLIBS=
--  if test "x$want_pam" != xno; then
--    AC_CHECK_LIB(pam, pam_start, [
--      AC_CHECK_HEADER(security/pam_appl.h,
--        [ pam_header=security/pam_appl.h ],
--        [ AC_CHECK_HEADER(pam/pam_appl.h,
--            [ pam_header=pam/pam_appl.h ],
--            [
--    AC_MSG_WARN([PAM detected, but no headers found!
--Make sure you have the necessary development packages installed.])
--            ]
--          )
--        ]
--      )
--    ], , $LIBDL)
--    if test -z "$pam_header"; then
--      if test "x$want_pam" = xyes; then
--        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
--      fi
--    else
--      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
--      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
--      use_pam=yes
--
--      dnl darwin claims to be something special
--      if test "$pam_header" = "pam/pam_appl.h"; then
--        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
--      fi
--
--      dnl test whether struct pam_message is const (Linux) or not (Sun)
--      AC_MSG_CHECKING(for const pam_message)
--      AC_EGREP_HEADER([struct pam_message], $pam_header,
--        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
--                          [AC_MSG_RESULT([const: Linux-type PAM])],
--                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
--                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
--                          )],
--        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
--    fi
--  fi
--
--  AC_SUBST(PAMLIBS)
--])
--
--dnl DEF_PAM_SERVICE(arg name, full name, define name)
--AC_DEFUN([DEF_PAM_SERVICE], [
--  AC_ARG_WITH($1-pam,
--    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
--    [ if test "x$use_pam" = xyes; then
--        $3_PAM_SERVICE=$withval
--      else
--        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
--You may want to enforce it by using --with-pam.])
--      fi
--    ], 
--    [ if test "x$use_pam" = xyes; then
--        $3_PAM_SERVICE="$pam_service"
--      fi
--    ])
--    if test -n "$$3_PAM_SERVICE"; then
--      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
--      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
--    fi
--    AC_SUBST($3_PAM_SERVICE)
--])
--
--AC_DEFUN([KDE_SHADOWPASSWD], [
--  AC_REQUIRE([KDE_PAM])
--
--  AC_CHECK_LIB(shadow, getspent,
--    [ LIBSHADOW="-lshadow"
--      ac_use_shadow=yes
--    ],
--    [ dnl for UnixWare
--      AC_CHECK_LIB(gen, getspent, 
--        [ LIBGEN="-lgen"
--          ac_use_shadow=yes
--        ], 
--        [ AC_CHECK_FUNC(getspent, 
--            [ ac_use_shadow=yes ],
--            [ ac_use_shadow=no ])
--	])
--    ])
--  AC_SUBST(LIBSHADOW)
--  AC_SUBST(LIBGEN)
--  
--  AC_MSG_CHECKING([for shadow passwords])
--
--  AC_ARG_WITH(shadow,
--    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
--    [ if test "x$withval" != "xno"; then
--        use_shadow=yes
--      else
--        use_shadow=no
--      fi
--    ], [
--      use_shadow="$ac_use_shadow"
--    ])
--
--  if test "x$use_shadow" = xyes; then
--    AC_MSG_RESULT(yes)
--    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
--  else
--    AC_MSG_RESULT(no)
--    LIBSHADOW=
--    LIBGEN=
--  fi
--
--  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
--  dnl this still applies, if we could use it indirectly through pam.
--  if test "x$use_shadow" = xyes || 
--     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
--      case $host in
--      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
--	SETUIDFLAGS="-m 4755 -o root";;
--      *)
--	SETUIDFLAGS="-m 4755";;
--      esac
--  fi
--  AC_SUBST(SETUIDFLAGS)
--
--])
--
--AC_DEFUN([KDE_PASSWDLIBS], [
--  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
--  AC_REQUIRE([KDE_PAM])
--  AC_REQUIRE([KDE_SHADOWPASSWD])
--
--  if test "x$use_pam" = "xyes"; then 
--    PASSWDLIBS="$PAMLIBS"
--  else
--    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
--  fi
--
--  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
--  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
--  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
--  dnl may need to read /etc/master.passwd).
--  case $host in
--  *-*-freebsd*)
--    SETUIDFLAGS="-m 4755 -o root"
--    ;;
--  *)
--    ;;
--  esac
--
--  AC_SUBST(PASSWDLIBS)
--])
--
--AC_DEFUN([KDE_CHECK_LIBDL],
--[
--AC_CHECK_LIB(dl, dlopen, [
--LIBDL="-ldl"
--ac_cv_have_dlfcn=yes
--])
--
--AC_CHECK_LIB(dld, shl_unload, [
--LIBDL="-ldld"
--ac_cv_have_shload=yes
--])
--
--AC_SUBST(LIBDL)
--])
--
--AC_DEFUN([KDE_CHECK_DLOPEN],
--[
--KDE_CHECK_LIBDL
--AC_CHECK_HEADERS(dlfcn.h dl.h)
--if test "$ac_cv_header_dlfcn_h" = "no"; then
--  ac_cv_have_dlfcn=no
--fi
--
--if test "$ac_cv_header_dl_h" = "no"; then
--  ac_cv_have_shload=no
--fi
--
--dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
--dnl (MM)
--AC_ARG_ENABLE(dlopen,
--AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
--enable_dlopen=$enableval,
--enable_dlopen=yes)
--
--# override the user's opinion, if we know it better ;)
--if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
--  enable_dlopen=no
--fi
--
--if test "$ac_cv_have_dlfcn" = "yes"; then
--  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
--fi
--
--if test "$ac_cv_have_shload" = "yes"; then
--  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
--fi
--
--if test "$enable_dlopen" = no ; then
--  test -n "$1" && eval $1
--else
--  test -n "$2" && eval $2
--fi
--
--])
--
--AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
--[
--KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
--KDE_PROG_LIBTOOL
--AC_MSG_CHECKING([dynamic loading])
--eval "`egrep '^build_libtool_libs=' libtool`"
--if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
--  dynamic_loading=yes
--  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
--else
--  dynamic_loading=no
--fi
--AC_MSG_RESULT($dynamic_loading)
--if test "$dynamic_loading" = "yes"; then
--  $1
--else
--  $2
--fi
--])
--
--AC_DEFUN([KDE_ADD_INCLUDES],
--[
--if test -z "$1"; then
--  test_include="Pix.h"
--else
--  test_include="$1"
--fi
--
--AC_MSG_CHECKING([for libg++ ($test_include)])
--
--AC_CACHE_VAL(kde_cv_libgpp_includes,
--[
--kde_cv_libgpp_includes=no
--
--   for ac_dir in               \
--                               \
--     /usr/include/g++          \
--     /usr/include              \
--     /usr/unsupported/include  \
--     /opt/include              \
--     $extra_include            \
--     ; \
--   do
--     if test -r "$ac_dir/$test_include"; then
--       kde_cv_libgpp_includes=$ac_dir
--       break
--     fi
--   done
--])
--
--AC_MSG_RESULT($kde_cv_libgpp_includes)
--if test "$kde_cv_libgpp_includes" != "no"; then
--  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
--fi
--])
--])
--
--AC_DEFUN([KDE_CHECK_LIBPTHREAD],
--[
--  dnl This code is here specifically to handle the
--  dnl various flavors of threading library on FreeBSD
--  dnl 4-, 5-, and 6-, and the (weird) rules around it.
--  dnl There may be an environment PTHREAD_LIBS that 
--  dnl specifies what to use; otherwise, search for it.
--  dnl -pthread is special cased and unsets LIBPTHREAD
--  dnl below if found.
--  LIBPTHREAD=""
--
--  if test -n "$PTHREAD_LIBS"; then
--    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
--      LIBPTHREAD="PTHREAD"
--    else
--      PTHREAD_LIBS_save="$PTHREAD_LIBS"
--      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
--      AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
--      KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
--          LIBPTHREAD="$PTHREAD_LIBS_save"])
--      PTHREAD_LIBS="$PTHREAD_LIBS_save"
--    fi
--  fi
--
--  dnl Is this test really needed, in the face of the Tru64 test below?
--  if test -z "$LIBPTHREAD"; then
--    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
--  fi
--
--  dnl This is a special Tru64 check, see BR 76171 issue #18.
--  if test -z "$LIBPTHREAD" ; then
--    AC_MSG_CHECKING([for pthread_create in -lpthread])
--    kde_safe_libs=$LIBS
--    LIBS="$LIBS -lpthread"
--    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
--        AC_MSG_RESULT(yes)
--        LIBPTHREAD="-lpthread"],[
--	AC_MSG_RESULT(no)])
--    LIBS=$kde_safe_libs
--  fi
--
--  dnl Un-special-case for FreeBSD.
--  if test "x$LIBPTHREAD" = "xPTHREAD" ; then
--    LIBPTHREAD=""
--  fi
--
--  AC_SUBST(LIBPTHREAD)
--])
--
--AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
--[
--      USE_THREADS=""
--      if test -z "$LIBPTHREAD"; then
--        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
--      fi
--
--    AH_VERBATIM(__svr_define, [
--#if defined(__SVR4) && !defined(__svr4__)
--#define __svr4__ 1
--#endif
--])
--    case $host_os in
-- 	solaris*)
--		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
--                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
--    		;;
--        freebsd*)
--                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
--                ;;
--        aix*)
--                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
--                LIBPTHREAD="$LIBPTHREAD -lc_r"
--                ;;
--        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
--                if test "$CXX" = "KCC"; then
--                  CXXFLAGS="$CXXFLAGS --thread_safe"
--		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
--                fi
--                ;;
--	*)
--		;;
--    esac
--    AC_SUBST(USE_THREADS)
--    AC_SUBST(LIBPTHREAD)
--])
--
--AC_DEFUN([KDE_CHECK_THREADING],
--[
--  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
--  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
--  dnl default is yes if libpthread is found and no if no libpthread is available
--  if test -z "$LIBPTHREAD"; then
--    if test -z "$USE_THREADS"; then
--      kde_check_threading_default=no
--    else
--      kde_check_threading_default=yes
--    fi
--  else
--    kde_check_threading_default=yes
--  fi
--  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
--   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
--  if test "x$kde_use_threading" = "xyes"; then
--    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
--  fi
--])
--
--AC_DEFUN([KDE_TRY_LINK_PYTHON],
--[
--if test "$kde_python_link_found" = no; then
--
--if test "$1" = normal; then
--  AC_MSG_CHECKING(if a Python application links)
--else
--  AC_MSG_CHECKING(if Python depends on $2)
--fi
--
--AC_CACHE_VAL(kde_cv_try_link_python_$1,
--[
--kde_save_cflags="$CFLAGS"
--CFLAGS="$CFLAGS $PYTHONINC"
--kde_save_libs="$LIBS"
--LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
--kde_save_ldflags="$LDFLAGS"
--LDFLAGS="$LDFLAGS $PYTHONLIB"
--
--AC_TRY_LINK(
--[
--#include <Python.h>
--],[
--	PySys_SetArgv(1, 0);
--],
--	[kde_cv_try_link_python_$1=yes],
--	[kde_cv_try_link_python_$1=no]
--)
--CFLAGS="$kde_save_cflags"
--LIBS="$kde_save_libs"
--LDFLAGS="$kde_save_ldflags"
--])
--
--if test "$kde_cv_try_link_python_$1" = "yes"; then
--  AC_MSG_RESULT(yes)
--  kde_python_link_found=yes
--  if test ! "$1" = normal; then
--    LIBPYTHON="$LIBPYTHON $2"
--  fi
--  $3
--else
--  AC_MSG_RESULT(no)
--  $4
--fi
--
--fi
--
--])
--
--AC_DEFUN([KDE_CHECK_PYTHON_DIR],
--[
--AC_MSG_CHECKING([for Python directory])
-- 
--AC_CACHE_VAL(kde_cv_pythondir,
--[
--  if test -z "$PYTHONDIR"; then
--    kde_cv_pythondir=/usr/local
--  else
--    kde_cv_pythondir="$PYTHONDIR"
--  fi
--])
-- 
--AC_ARG_WITH(pythondir,
--AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
--[
--  ac_python_dir=$withval
--], ac_python_dir=$kde_cv_pythondir
--)
-- 
--AC_MSG_RESULT($ac_python_dir)
--])
--
--AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
--[
--AC_REQUIRE([KDE_CHECK_LIBDL])
--AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
--AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
--
--if test -z "$1"; then
--  version="1.5"
--else
--  version="$1"
--fi
--
--AC_MSG_CHECKING([for Python$version])
--
--python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
--AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
--if test ! -r $python_incdir/Python.h; then
--  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
--  python_incdir=$python_incdir/python$version
--  if test ! -r $python_incdir/Python.h; then
--    python_incdir=no
--  fi
--fi
--
--PYTHONINC=-I$python_incdir
--
--python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
--AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
--if test ! -r $python_libdir/libpython$version.so; then
--  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
--  if test ! -r $python_libdir/libpython$version.a; then
--    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
--    python_libdir=$python_libdir/python$version/config
--    if test ! -r $python_libdir/libpython$version.a; then
--      python_libdir=no
--    fi
--  fi
--fi
--
--PYTHONLIB=-L$python_libdir
--kde_orig_LIBPYTHON=$LIBPYTHON
--if test -z "$LIBPYTHON"; then
--  LIBPYTHON=-lpython$version
--fi
--
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
--python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
--  python_moddir=no
--fi
--
--PYTHONMODDIR=$python_moddir
--
--AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
--
--if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
--   LIBPYTHON=$kde_orig_LIBPYTHON
--   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
--   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
--   $2
--else 
--  dnl Note: this test is very weak
--  kde_python_link_found=no
--  KDE_TRY_LINK_PYTHON(normal)
--  KDE_TRY_LINK_PYTHON(m, -lm)
--  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
--  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
--  KDE_TRY_LINK_PYTHON(db2, -ldb2)
--  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
--  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
--  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
--  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
--	[AC_MSG_WARN([it seems, Python depends on another library.
--    Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
--    and contact the authors to let them know about this problem])
--	])
--
--  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
--  AC_SUBST(PYTHONINC)
--  AC_SUBST(PYTHONLIB)
--  AC_SUBST(LIBPYTHON)
--  AC_SUBST(PYTHONMODDIR)
--  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
--fi
--
--])
--
--
--AC_DEFUN([KDE_CHECK_PYTHON],
--[
--  KDE_CHECK_PYTHON_INTERN("2.5",
--    [KDE_CHECK_PYTHON_INTERN("2.4",
--     [KDE_CHECK_PYTHON_INTERN("2.3", 
--       [KDE_CHECK_PYTHON_INTERN("2.2", 
--         [KDE_CHECK_PYTHON_INTERN("2.1", 
--           [KDE_CHECK_PYTHON_INTERN("2.0", 
--             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
--           ])
--         ])
--       ])
--     ])
--  ])
--])
--
--AC_DEFUN([KDE_CHECK_STL],
--[
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    ac_save_CXXFLAGS="$CXXFLAGS"
--    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
--
--    AC_MSG_CHECKING([if C++ programs can be compiled])
--    AC_CACHE_VAL(kde_cv_stl_works,
--    [
--      AC_TRY_COMPILE([
--#include <string>
--using namespace std;
--],[
--  string astring="Hallo Welt.";
--  astring.erase(0, 6); // now astring is "Welt"
--  return 0;
--], kde_cv_stl_works=yes,
--   kde_cv_stl_works=no)
--])
--
--   AC_MSG_RESULT($kde_cv_stl_works)
--
--   if test "$kde_cv_stl_works" = "yes"; then
--     # back compatible
--	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
--   else
--	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
--Check config.log for details - if you're using a Linux distribution you might miss
--a package named similar to libstdc++-dev.])
--   fi
--
--   CXXFLAGS="$ac_save_CXXFLAGS"
--   AC_LANG_RESTORE
--])
--
--AC_DEFUN([AC_FIND_QIMGIO],
--   [AC_REQUIRE([AC_FIND_JPEG])
--AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--AC_MSG_CHECKING([for qimgio])
--AC_CACHE_VAL(ac_cv_lib_qimgio,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--ac_save_LIBS="$LIBS"
--ac_save_CXXFLAGS="$CXXFLAGS"
--LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
--CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
--AC_TRY_RUN(dnl
--[
--#include <qimageio.h>
--#include <qstring.h>
--int main() {
--		QString t = "hallo";
--		t.fill('t');
--		qInitImageIO();
--}
--],
--            ac_cv_lib_qimgio=yes,
--            ac_cv_lib_qimgio=no,
--	    ac_cv_lib_qimgio=no)
--LIBS="$ac_save_LIBS"
--CXXFLAGS="$ac_save_CXXFLAGS"
--AC_LANG_RESTORE
--])dnl
--if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
--  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
--  AC_MSG_RESULT(yes)
--  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
--  AC_SUBST(LIBQIMGIO)
--else
--  AC_MSG_RESULT(not found)
--fi
--])
--
--AC_DEFUN([AM_DISABLE_LIBRARIES],
--[
--    AC_PROVIDE([AM_ENABLE_STATIC])
--    AC_PROVIDE([AM_ENABLE_SHARED])
--    enable_static=no
--    enable_shared=yes
--])
--
--
--AC_DEFUN([AC_CHECK_UTMP_FILE],
--[
--    AC_MSG_CHECKING([for utmp file])
--
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
--
--    for ac_file in    \
--                      \
--	/var/run/utmp \
--	/var/adm/utmp \
--	/etc/utmp     \
--     ; \
--    do
--     if test -r "$ac_file"; then
--       kde_cv_utmp_file=$ac_file
--       break
--     fi
--    done
--    ])
--
--    if test "$kde_cv_utmp_file" != "no"; then
--	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
--	$1
--	AC_MSG_RESULT($kde_cv_utmp_file)
--    else
--    	$2
--	AC_MSG_RESULT([non found])
--    fi
--])
--
--
--AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
--[
--
--DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
--TOPSUBDIRS=""
--
--if test ! -s $srcdir/subdirs; then
--  dnl Note: Makefile.common creates subdirs, so this is just a fallback
--  files=`cd $srcdir && ls -1`
--  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
--  for i in $dirs; do
--    echo $i >> $srcdir/subdirs
--  done
--fi
--
--ac_topsubdirs=
--if test -s $srcdir/inst-apps; then
--  ac_topsubdirs="`cat $srcdir/inst-apps`"
--elif test -s $srcdir/subdirs; then
--  ac_topsubdirs="`cat $srcdir/subdirs`"
--fi
--
--for i in $ac_topsubdirs; do
--  AC_MSG_CHECKING([if $i should be compiled])
--  if test -d $srcdir/$i; then
--    install_it="yes"
--    for j in $DO_NOT_COMPILE; do
--      if test $i = $j; then
--        install_it="no"
--      fi
--    done
--  else
--    install_it="no"
--  fi
--  AC_MSG_RESULT($install_it)
--  vari=`echo $i | sed -e 's,[[-+.@]],_,g'`
--  if test $install_it = "yes"; then
--    TOPSUBDIRS="$TOPSUBDIRS $i"
--    eval "$vari""_SUBDIR_included=yes"
--  else
--    eval "$vari""_SUBDIR_included=no"
--  fi
--done
--
--AC_SUBST(TOPSUBDIRS)
--])
--
--AC_DEFUN([KDE_CHECK_NAMESPACES],
--[
--AC_MSG_CHECKING(whether C++ compiler supports namespaces)
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([
--],
--[
--namespace Foo {
--  extern int i;
--  namespace Bar {
--    extern int i;
--  }
--}
--
--int Foo::i = 0;
--int Foo::Bar::i = 1;
--],[
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_NAMESPACES)
--], [
--AC_MSG_RESULT(no)
--])
--AC_LANG_RESTORE
--])
--
--dnl ------------------------------------------------------------------------
--dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_CHECK_S_ISSOCK],
--[
--AC_MSG_CHECKING(for S_ISSOCK)
--AC_CACHE_VAL(ac_cv_have_s_issock,
--[
--AC_TRY_LINK(
--[
--#include <sys/stat.h>
--],
--[
--struct stat buff;
--int b = S_ISSOCK( buff.st_mode );
--],
--ac_cv_have_s_issock=yes,
--ac_cv_have_s_issock=no)
--])
--AC_MSG_RESULT($ac_cv_have_s_issock)
--if test "$ac_cv_have_s_issock" = "yes"; then
--  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
--fi
--
--AH_VERBATIM(_ISSOCK,
--[
--#ifndef HAVE_S_ISSOCK
--#define HAVE_S_ISSOCK
--#define S_ISSOCK(mode) (1==0)
--#endif
--])
--
--])
--
--dnl ------------------------------------------------------------------------
--dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
--[
--AC_MSG_CHECKING(for MAXPATHLEN)
--AC_CACHE_VAL(ac_cv_maxpathlen,
--[
--cat > conftest.$ac_ext <<EOF
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--#endif
--#include <stdio.h>
--#include <sys/param.h>
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 1024
--#endif
--
--KDE_HELLO MAXPATHLEN
--
--EOF
--
--ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
--
--if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
--    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
--else
--    ac_cv_maxpathlen=1024
--fi
--
--rm conftest.*
--
--])
--AC_MSG_RESULT($ac_cv_maxpathlen)
--AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
--])
--
--AC_DEFUN([KDE_CHECK_HEADER],
--[
--   kde_safe_cppflags=$CPPFLAGS
--   CPPFLAGS="$CPPFLAGS $all_includes"
--   AC_LANG_SAVE
--   AC_LANG_CPLUSPLUS
--   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
--   AC_LANG_RESTORE
--   CPPFLAGS=$kde_safe_cppflags
--])
--
--AC_DEFUN([KDE_CHECK_HEADERS],
--[
--   AH_CHECK_HEADERS([$1])
--   AC_LANG_SAVE
--   kde_safe_cppflags=$CPPFLAGS
--   CPPFLAGS="$CPPFLAGS $all_includes"
--   AC_LANG_CPLUSPLUS
--   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
--   CPPFLAGS=$kde_safe_cppflags
--   AC_LANG_RESTORE
--])
--
--AC_DEFUN([KDE_FAST_CONFIGURE],
--[
--  dnl makes configure fast (needs perl)
--  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
--      with_fast_perl=$enableval, with_fast_perl=yes)
--])
--
--AC_DEFUN([KDE_CONF_FILES],
--[
--  val=
--  if test -f $srcdir/configure.files ; then
--    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
--  fi
--  CONF_FILES=
--  if test -n "$val" ; then
--    for i in $val ; do
--      CONF_FILES="$CONF_FILES $i"
--    done
--  fi
--  AC_SUBST(CONF_FILES)
--])dnl
--
--dnl This sets the prefix, for arts and kdelibs
--dnl Do NOT use in any other module.
--dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
--AC_DEFUN([KDE_SET_PREFIX_CORE],
--[
--  unset CDPATH
--  dnl make $KDEDIR the default for the installation
--  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
--
--  if test "x$prefix" = "xNONE"; then
--    prefix=$ac_default_prefix
--    ac_configure_args="$ac_configure_args --prefix=$prefix"
--  fi
--  # And delete superfluous '/' to make compares easier
--  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
--  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
--
--  kde_libs_prefix='$(prefix)'
--  kde_libs_htmldir='$(kde_htmldir)'
--  AC_SUBST(kde_libs_prefix)
--  AC_SUBST(kde_libs_htmldir)
--  KDE_FAST_CONFIGURE
--  KDE_CONF_FILES
--])
--
--
--AC_DEFUN([KDE_SET_PREFIX],
--[
--  unset CDPATH
--  dnl We can't give real code to that macro, only a value.
--  dnl It only matters for --help, since we set the prefix in this function anyway.
--  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
--
--  KDE_SET_DEFAULT_BINDIRS
--  if test "x$prefix" = "xNONE"; then
--    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
--    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
--  else
--    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
--    kde_save_PATH="$PATH"
--    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
--    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
--    PATH="$kde_save_PATH"
--  fi
--
--  kde_libs_prefix=`$KDECONFIG --prefix`
--  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
--       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
--                    This means it has been moved since you installed it.
--                    This won't work. Please recompile kdelibs for the new prefix.
--                    ])
--  fi
--  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
--
--  AC_MSG_CHECKING([where to install])
--  if test "x$prefix" = "xNONE"; then
--    prefix=$kde_libs_prefix
--    AC_MSG_RESULT([$prefix (as returned by kde-config)])
--  else
--    dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
--    given_prefix=$prefix
--    AC_MSG_RESULT([$prefix (as requested)])
--  fi
--
--  # And delete superfluous '/' to make compares easier
--  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
--  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
--  given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
--
--  AC_SUBST(KDECONFIG)
--  AC_SUBST(kde_libs_prefix)
--  AC_SUBST(kde_libs_htmldir)
--
--  KDE_FAST_CONFIGURE
--  KDE_CONF_FILES
--])
--
--pushdef([AC_PROG_INSTALL],
--[
--  dnl our own version, testing for a -p flag
--  popdef([AC_PROG_INSTALL])
--  dnl as AC_PROG_INSTALL works as it works we first have
--  dnl to save if the user didn't specify INSTALL, as the
--  dnl autoconf one overwrites INSTALL and we have no chance to find
--  dnl out afterwards
--  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
--  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
--  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
--  AC_PROG_INSTALL
--
--  if test -z "$kde_save_INSTALL_given" ; then
--    # OK, user hasn't given any INSTALL, autoconf found one for us
--    # now we test, if it supports the -p flag
--    AC_MSG_CHECKING(for -p flag to install)
--    rm -f confinst.$$.* > /dev/null 2>&1
--    echo "Testtest" > confinst.$$.orig
--    ac_res=no
--    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
--      if test -f confinst.$$.new ; then
--        # OK, -p seems to do no harm to install
--	INSTALL="${INSTALL} -p"
--	ac_res=yes
--      fi
--    fi
--    rm -f confinst.$$.*
--    AC_MSG_RESULT($ac_res)
--  fi
--  dnl the following tries to resolve some signs and wonders coming up
--  dnl with different autoconf/automake versions
--  dnl e.g.:
--  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
--  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
--  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
--  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
--  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
--  dnl   install-@DIR@PROGRAMS targets to explicitly use that flag
--  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
--  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
--  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
--  dnl  *sometimes KDE does not use the install-@DIR@PROGRAM targets from
--  dnl   automake (due to broken Makefile.am or whatever) to install programs,
--  dnl   and so does not see the -s flag in automake > 1.4
--  dnl to clean up that mess we:
--  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
--  dnl   which cleans KDE's program with automake > 1.4;
--  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
--  dnl   with automake<=1.4
--  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
--  dnl   properly uses install-@DIR@PROGRAMS, but I don't care
--  dnl
--  dnl And to all this comes, that I even can't write in comments variable
--  dnl  names used by automake, because it is so stupid to think I wanted to
--  dnl  _use_ them, therefor I have written A_M_... instead of AM_
--  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
--
--  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
--    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
--  fi
--  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
--    INSTALL_SCRIPT='${INSTALL}'
--  fi
--])dnl
--
--AC_DEFUN([KDE_LANG_CPLUSPLUS],
--[AC_LANG_CPLUSPLUS
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
--pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
--])
--
--pushdef([AC_LANG_CPLUSPLUS],
--[popdef([AC_LANG_CPLUSPLUS])
--KDE_LANG_CPLUSPLUS
--])
--
--AC_DEFUN([KDE_CHECK_LONG_LONG],
--[
--AC_MSG_CHECKING(for long long)
--AC_CACHE_VAL(kde_cv_c_long_long,
--[
--  AC_LANG_SAVE
--  AC_LANG_CPLUSPLUS
--  AC_TRY_LINK([], [
--  long long foo = 0;
--  foo = foo+1;
--  ],
--  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
--  AC_LANG_RESTORE
--])
--AC_MSG_RESULT($kde_cv_c_long_long)
--if test "$kde_cv_c_long_long" = yes; then
--   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
--fi
--])
--
--AC_DEFUN([KDE_CHECK_LIB],
--[
--     kde_save_LDFLAGS="$LDFLAGS"
--     dnl AC_CHECK_LIB modifies LIBS, so save it here
--     kde_save_LIBS="$LIBS"
--     LDFLAGS="$LDFLAGS $all_libraries"
--     case $host_os in
--      aix*) LDFLAGS="-brtl $LDFLAGS"
--	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
--	;;
--     esac
--     AC_CHECK_LIB($1, $2, $3, $4, $5)
--     LDFLAGS="$kde_save_LDFLAGS"
--     LIBS="$kde_save_LIBS"
--])
--
--AC_DEFUN([KDE_JAVA_PREFIX],
--[
--	dir=`dirname "$1"`
--	base=`basename "$1"`
--	list=`ls -1 $dir 2> /dev/null`
--	for entry in $list; do 
--		if test -d $dir/$entry/bin; then
--			case $entry in
--			   $base)
--				javadirs="$javadirs $dir/$entry/bin"
--				;;
--			esac
--		elif test -d $dir/$entry/jre/bin; then
--			case $entry in
--			   $base)
--				javadirs="$javadirs $dir/$entry/jre/bin"
--				;;
--			esac
--		fi
--	done
--])
--
--dnl KDE_CHEC_JAVA_DIR(onlyjre)
--AC_DEFUN([KDE_CHECK_JAVA_DIR],
--[
--
--AC_ARG_WITH(java,
--AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
--[  ac_java_dir=$withval
--], ac_java_dir=""
--)
--
--AC_MSG_CHECKING([for Java])
--
--dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
--if test "x$ac_java_dir" = "xno"; then
--   kde_java_bindir=no
--   kde_java_includedir=no
--   kde_java_libjvmdir=no
--   kde_java_libgcjdir=no
--   kde_java_libhpidir=no
--else
--  if test "x$ac_java_dir" = "x"; then
--     
--     
--      dnl No option set -> collect list of candidate paths
--      if test -n "$JAVA_HOME"; then
--        KDE_JAVA_PREFIX($JAVA_HOME)
--      fi
--      KDE_JAVA_PREFIX(/usr/j2se)
--      KDE_JAVA_PREFIX(/usr/lib/j2se)
--      KDE_JAVA_PREFIX(/usr/j*dk*)
--      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
--      KDE_JAVA_PREFIX(/opt/j*sdk*)
--      KDE_JAVA_PREFIX(/usr/lib/java*)
--      KDE_JAVA_PREFIX(/usr/java*)
--      KDE_JAVA_PREFIX(/usr/java/j*dk*)
--      KDE_JAVA_PREFIX(/usr/java/j*re*)
--      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
--      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
--      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
--      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
--      KDE_JAVA_PREFIX(/opt/java*)
--
--      kde_cv_path="NONE"
--      kde_save_IFS=$IFS
--      IFS=':'
--      for dir in $PATH; do
--	  if test -d "$dir"; then
--	      javadirs="$javadirs $dir"
--	  fi
--      done
--      IFS=$kde_save_IFS
--      jredirs=
--
--      dnl Now javadirs contains a list of paths that exist, all ending with bin/
--      for dir in $javadirs; do
--          dnl Check for the java executable
--	  if test -x "$dir/java"; then
--	      sane_path=$(cd $dir; /bin/pwd)
--	      dnl And also check for a libjvm.so somewhere under there
--	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
--              if test "$sane_path" != "/usr/bin"; then
--                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
--		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
--		  jredirs="$jredirs $dir"
--	      fi
--	  fi
--      done
--
--      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
--      JAVAC=
--      JAVA=
--      kde_java_bindir=no
--      for dir in $jredirs; do
--	  JAVA="$dir/java"
--	  kde_java_bindir=$dir
--	  if test -x "$dir/javac"; then
--		JAVAC="$dir/javac"
--                break
--	  fi
--      done
--
--      if test -n "$JAVAC"; then
--          dnl this substitution might not work - well, we test for jni.h below
--          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
--      else
--          kde_java_includedir=no
--      fi
--  else
--    dnl config option set
--    kde_java_bindir=$ac_java_dir/bin
--    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
--	kde_java_includedir=no
--    else
--        kde_java_includedir=$ac_java_dir/include
--    fi
--  fi
--fi
--
--dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
--if test "x$kde_java_bindir" != "xno"; then
--
--  dnl Look for libjvm.so
--  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
--  dnl Look for libgcj.so
--  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
--  dnl Look for libhpi.so and avoid green threads
--  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
--
--  dnl Now check everything's fine under there
--  dnl the include dir is our flag for having the JDK
--  if test -d "$kde_java_includedir"; then
--    if test ! -x "$kde_java_bindir/javac"; then
--      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
--    fi
--    if test ! -x "$kde_java_bindir/javah"; then
--      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
--    fi
--    if test ! -x "$kde_java_bindir/jar"; then
--      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
--    fi
--    if test ! -r "$kde_java_includedir/jni.h"; then
--      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
--    fi
--
--    jni_includes="-I$kde_java_includedir"
--    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
--    dnl and under linux here.. 
--    
--    dnl not needed for gcj
--
--    if test "x$kde_java_libgcjdir" = "x"; then 
--      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
--      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
--      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
--    fi
--
--  else
--    JAVAC=
--    jni_includes=
--  fi
--
--  if test "x$kde_java_libgcjdir" = "x"; then 
--     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
--        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
--     fi 
--  else
--     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
--        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
--     fi 
--  fi
--
--  if test ! -x "$kde_java_bindir/java"; then
--      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
--  fi
--
--  dnl not needed for gcj compile
--
--  if test "x$kde_java_libgcjdir" = "x"; then 
--      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
--        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
--      fi
--  fi
--
--  if test -n "$jni_includes"; then
--    dnl Check for JNI version
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    ac_cxxflags_safe="$CXXFLAGS"
--    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
--
--    AC_TRY_COMPILE([
--  #include <jni.h>
--	      ],
--	      [
--  #ifndef JNI_VERSION_1_2
--  Syntax Error
--  #endif
--	      ],[ kde_jni_works=yes ],
--	      [ kde_jni_works=no ])
--
--    if test $kde_jni_works = no; then
--      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
--		    You need to have Java Development Kit (JDK) version 1.2. 
--
--		    Use --with-java to specify another location.
--		    Use --without-java to configure without java support.
--		    Or download a newer JDK and try again. 
--		    See e.g. http://java.sun.com/products/jdk/1.2 ])
--    fi
--
--    CXXFLAGS="$ac_cxxflags_safe"    
--    AC_LANG_RESTORE
--
--    dnl All tests ok, inform and subst the variables
--
--    JAVAC=$kde_java_bindir/javac
--    JAVAH=$kde_java_bindir/javah
--    JAR=$kde_java_bindir/jar
--    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
--    if test "x$kde_java_libgcjdir" = "x"; then 
--      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
--    else
--      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
--    fi
--    AC_MSG_RESULT([java JDK in $kde_java_bindir])
--
--  else
--      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
--      AC_MSG_RESULT([java JRE in $kde_java_bindir])
--  fi
--elif test -d "/Library/Java/Home"; then
--  kde_java_bindir="/Library/Java/Home/bin"
--  jni_includes="-I/Library/Java/Home/include"
--
--  JAVAC=$kde_java_bindir/javac
--  JAVAH=$kde_java_bindir/javah
--  JAR=$kde_java_bindir/jar
--  JVMLIBS="-Wl,-framework,JavaVM"
--
--  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
--  AC_MSG_RESULT([Apple Java Framework])
--else
--  AC_MSG_RESULT([none found])
--fi
--
--AC_SUBST(JAVAC)
--AC_SUBST(JAVAH)
--AC_SUBST(JAR)
--AC_SUBST(JVMLIBS)
--AC_SUBST(jni_includes)
--
--# for backward compat
--kde_cv_java_includedir=$kde_java_includedir
--kde_cv_java_bindir=$kde_java_bindir
--])
--
--dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
--dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
--dnl big packages, m4_foreach is dog-slow.  So use our own version of
--dnl it.  (matz@kde.org)
--m4_define([mm_foreach],
--[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
--m4_define([mm_car], [[$1]])
--m4_define([mm_car2], [[$@]])
--m4_define([_mm_foreach],
--[m4_if(m4_quote($2), [], [],
--       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
--                                                   mm_car2(m4_shift($2)),
--                                                   [$3])])])
--m4_define([AC_FOREACH],
--[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
--
--AC_DEFUN([KDE_NEED_FLEX],
--[
--kde_libs_safe=$LIBS
--LIBS="$LIBS $USER_LDFLAGS"
--AM_PROG_LEX
--LIBS=$kde_libs_safe
--if test -z "$LEXLIB"; then
--    AC_MSG_ERROR([You need to have flex installed.])
--fi
--AC_SUBST(LEXLIB)
--])
--
--AC_DEFUN([AC_PATH_QTOPIA],
--[
--  dnl TODO: use AC_CACHE_VAL
--
--  if test -z "$1"; then
--    qtopia_minver_maj=1
--    qtopia_minver_min=5
--    qtopia_minver_pat=0
--  else
--    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
--    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
--    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
--  fi
--
--  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
--  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
--
--  AC_REQUIRE([AC_PATH_QT])
--
--  AC_MSG_CHECKING([for Qtopia])
--
--  LIB_QTOPIA="-lqpe"
--  AC_SUBST(LIB_QTOPIA)
--
--  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
--
--  ac_qtopia_incdir=NO
--
--  AC_ARG_WITH(qtopia-dir,
--              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
--              [  ac_qtopia_incdir="$withval"/include] ) 
--  
--  qtopia_incdirs=""
--  for dir in $kde_qtopia_dirs; do
--    qtopia_incdirs="$qtopia_incdirs $dir/include"
--  done
--
--  if test ! "$ac_qtopia_incdir" = "NO"; then
--    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
--  fi
--
--  qtopia_incdir=""
--  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
--  ac_qtopia_incdir="$qtopia_incdir"
--
--  if test -z "$qtopia_incdir"; then
--    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
--  fi
--
--  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
--  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
--  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
--
--  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
--  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
--  if test "$qtopia_ver" -lt "$qtopia_minver"; then
--    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
--is required.])
--  fi
--
--  AC_LANG_SAVE
--  AC_LANG_CPLUSPLUS
--
--  ac_cxxflags_safe="$CXXFLAGS"
--  ac_ldflags_safe="$LDFLAGS"
--  ac_libs_safe="$LIBS"
--
--  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
--  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
--  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
--
--  cat > conftest.$ac_ext <<EOF
--#include "confdefs.h"
--#include <qpe/qpeapplication.h>
--#include <qpe/version.h>
--
--int main( int argc, char **argv )
--{
--    QPEApplication app( argc, argv );
--    return 0;
--}
--EOF
--
--  if AC_TRY_EVAL(ac_link) && test -s conftest; then
--    rm -f conftest*
--  else
--    rm -f conftest*
--    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
--the end of config.log])
--  fi
--
--  CXXFLAGS="$ac_cxxflags_safe"
--  LDFLAGS="$ac_ldflags_safe"
--  LIBS="$ac_libs_safe"
--
--  AC_LANG_RESTORE
--
--  QTOPIA_INCLUDES="-I$qtopia_incdir"
--  AC_SUBST(QTOPIA_INCLUDES)
--
--  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
--])
--
--
--AC_DEFUN([KDE_INIT_DOXYGEN],
--[
--AC_MSG_CHECKING([for Qt docs])
--kde_qtdir=
--if test "${with_qt_dir+set}" = set; then
--  kde_qtdir="$with_qt_dir"
--fi
--
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
--AC_MSG_RESULT($QTDOCDIR)
--
--AC_SUBST(QTDOCDIR)
--
--KDE_FIND_PATH(dot, DOT, [], [])
--if test -n "$DOT"; then
--  KDE_HAVE_DOT="YES"
--else
--  KDE_HAVE_DOT="NO"
--fi
--AC_SUBST(KDE_HAVE_DOT)
--KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
--AC_SUBST(DOXYGEN)
--
--DOXYGEN_PROJECT_NAME="$1"
--DOXYGEN_PROJECT_NUMBER="$2"
--AC_SUBST(DOXYGEN_PROJECT_NAME)
--AC_SUBST(DOXYGEN_PROJECT_NUMBER)
--
--KDE_HAS_DOXYGEN=no
--if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
--  KDE_HAS_DOXYGEN=yes
--fi
--AC_SUBST(KDE_HAS_DOXYGEN)
--
--])
--
--
--AC_DEFUN([AC_FIND_BZIP2],
--[
--AC_MSG_CHECKING([for bzDecompress in libbz2])
--AC_CACHE_VAL(ac_cv_lib_bzip2,
--[
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--kde_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
--kde_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
--AC_TRY_LINK(dnl
--[
--#define BZ_NO_STDIO
--#include<bzlib.h>
--],
--            [ bz_stream s; (void) bzDecompress(&s); ],
--            eval "ac_cv_lib_bzip2='-lbz2'",
--            eval "ac_cv_lib_bzip2=no")
--LIBS="$kde_save_LIBS"
--CXXFLAGS="$kde_save_CXXFLAGS"
--AC_LANG_RESTORE
--])dnl
--AC_MSG_RESULT($ac_cv_lib_bzip2)
--
--if test ! "$ac_cv_lib_bzip2" = no; then
--  BZIP2DIR=bzip2
--
--  LIBBZ2="$ac_cv_lib_bzip2"
--  AC_SUBST(LIBBZ2)
--
--else
--
--   cxx_shared_flag=
--   ld_shared_flag=
--   KDE_CHECK_COMPILER_FLAG(shared, [
--	ld_shared_flag="-shared"
--   ])
--   KDE_CHECK_COMPILER_FLAG(fPIC, [
--        cxx_shared_flag="-fPIC"
--   ])
--
--   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
--   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
--   [
--   AC_LANG_SAVE
--   AC_LANG_CPLUSPLUS
--   kde_save_LIBS="$LIBS"
--   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
--   kde_save_CXXFLAGS="$CXXFLAGS"
--   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
--
--   AC_TRY_LINK(dnl
--   [
--   #define BZ_NO_STDIO
--   #include<bzlib.h>
--   ],
--               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
--               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
--               eval "ac_cv_lib_bzip2_prefix=no")
--   LIBS="$kde_save_LIBS"
--   CXXFLAGS="$kde_save_CXXFLAGS"
--   AC_LANG_RESTORE
--   ])dnl
--
--   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
--   
--   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
--     BZIP2DIR=bzip2
--    
--     LIBBZ2="$ac_cv_lib_bzip2_prefix"
--     AC_SUBST(LIBBZ2)
--
--     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
--   dnl else, we just ignore this
--   fi
--
--fi
--AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
--])
--
--dnl ------------------------------------------------------------------------
--dnl Try to find the SSL headers and libraries.
--dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
--dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
--dnl ------------------------------------------------------------------------
--dnl
--AC_DEFUN([KDE_CHECK_SSL],
--[
--LIBSSL="-lssl -lcrypto"
--AC_REQUIRE([KDE_CHECK_LIB64])
--
--ac_ssl_includes=NO ac_ssl_libraries=NO
--ssl_libraries=""
--ssl_includes=""
--AC_ARG_WITH(ssl-dir,
--    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
--    [  ac_ssl_includes="$withval"/include
--       ac_ssl_libraries="$withval"/lib$kdelibsuff
--    ])
--
--want_ssl=yes
--AC_ARG_WITH(ssl,
--    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
--    [want_ssl=$withval])
--
--if test $want_ssl = yes; then
--
--AC_MSG_CHECKING(for OpenSSL)
--
--AC_CACHE_VAL(ac_cv_have_ssl,
--[#try to guess OpenSSL locations
--  
--  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
--  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
--  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
--  ac_ssl_includes="$ssl_incdir"
--
--  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
--  if test ! "$ac_ssl_libraries" = "NO"; then
--    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
--  fi
--
--  test=NONE
--  ssl_libdir=NONE
--  for dir in $ssl_libdirs; do
--    try="ls -1 $dir/libssl*"
--    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
--  done
--
--  ac_ssl_libraries="$ssl_libdir"
--
--  ac_ldflags_safe="$LDFLAGS"
--  ac_libs_safe="$LIBS"
--
--  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
--  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
--
--  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
--  ac_ssl_rsaref="yes"
--  ,
--  ac_ssl_rsaref="no"
--  )
--
--  LDFLAGS="$ac_ldflags_safe"
--  LIBS="$ac_libs_safe"
--
--  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
--    have_ssl=no
--  else
--    have_ssl=yes;
--  fi
--
--  ])
--
--  eval "$ac_cv_have_ssl"
--
--  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
--
--  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
--  AC_MSG_RESULT($ac_ssl_rsaref)
--
--  AC_MSG_CHECKING([for easter eggs])
--  AC_MSG_RESULT([none found])
--
--else
--  have_ssl=no
--fi
--
--if test "$have_ssl" = yes; then
--  AC_MSG_CHECKING(for OpenSSL version)
--  dnl Check for SSL version
--  AC_CACHE_VAL(ac_cv_ssl_version,
--  [
--
--    cat >conftest.$ac_ext <<EOF
--#include <openssl/opensslv.h>
--#include <stdio.h>
--    int main() {
-- 
--#ifndef OPENSSL_VERSION_NUMBER
--      printf("ssl_version=\\"error\\"\n");
--#else
--      if (OPENSSL_VERSION_NUMBER < 0x00906000)
--        printf("ssl_version=\\"old\\"\n");
--      else
--        printf("ssl_version=\\"ok\\"\n");
--#endif
--     return (0);
--    }
--EOF
--
--    ac_save_CPPFLAGS=$CPPFLAGS
--    if test "$ac_ssl_includes" != "/usr/include"; then
--        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
--    fi
--
--    if AC_TRY_EVAL(ac_link); then 
--
--      if eval `./conftest 2>&5`; then
--        if test $ssl_version = error; then
--          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
--        else
--          if test $ssl_version = old; then
--            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
--            have_ssl=no
--          fi
--        fi
--        ac_cv_ssl_version="ssl_version=$ssl_version"
--      else
--        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
--        Check config.log, and if you can't figure it out, send a mail to 
--        David Faure <faure@kde.org>, attaching your config.log])
--      fi
--
--    else
--      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
--      Check config.log, and if you can't figure it out, send a mail to 
--      David Faure <faure@kde.org>, attaching your config.log])
--    fi 
--    CPPFLAGS=$ac_save_CPPFLAGS
--
--  ])
--
--  eval "$ac_cv_ssl_version"
--  AC_MSG_RESULT($ssl_version)
--fi
--
--if test "$have_ssl" != yes; then
--  LIBSSL="";
--else
--  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
--  ac_cv_have_ssl="have_ssl=yes \
--    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
--  
--  
--  ssl_libraries="$ac_ssl_libraries"
--  ssl_includes="$ac_ssl_includes"
--
--  if test "$ac_ssl_rsaref" = yes; then
--    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
--  fi
--
--  if test $ssl_version = "old"; then
--    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
--  fi
--fi
--
--SSL_INCLUDES=
--
--if test "$ssl_includes" = "/usr/include"; then
--  if test -f /usr/kerberos/include/krb5.h; then
--	SSL_INCLUDES="-I/usr/kerberos/include"
--  fi
--elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
--  SSL_INCLUDES="-I$ssl_includes"
--fi
--
--if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
-- SSL_LDFLAGS=""
--else
-- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
--fi
--
--AC_SUBST(SSL_INCLUDES)
--AC_SUBST(SSL_LDFLAGS)
--AC_SUBST(LIBSSL)
--])
--
--AC_DEFUN([KDE_CHECK_STRLCPY],
--[
--  AC_REQUIRE([AC_CHECK_STRLCAT])
--  AC_REQUIRE([AC_CHECK_STRLCPY])
--  AC_CHECK_SIZEOF(size_t)
--  AC_CHECK_SIZEOF(unsigned long)
--
--  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
--  AC_TRY_COMPILE(,[
--    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
--       choke me
--    #endif
--    ],AC_MSG_RESULT([yes]),[
--      AC_MSG_RESULT(no)
--      AC_MSG_ERROR([
--       Apparently on your system our assumption sizeof size_t == sizeof unsigned long 
--       does not apply. Please mail kde-devel@kde.org with a description of your system!
--      ])
--  ])
--])
--
--AC_DEFUN([KDE_CHECK_BINUTILS],
--[
--  AC_MSG_CHECKING([if ld supports unversioned version maps])
--
--  kde_save_LDFLAGS="$LDFLAGS"
--  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
--  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
--  AC_TRY_LINK([int foo;],
--[
--#ifdef __INTEL_COMPILER
--icc apparently does not support libtools version-info and version-script
--at the same time. Dunno where the bug is, but until somebody figured out,
--better disable the optional version scripts.
--#endif
--
--  foo = 42;
--], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
--  LDFLAGS="$kde_save_LDFLAGS"
--  rm -f conftest.map
--  AM_CONDITIONAL(include_VERSION_SCRIPT, 
--    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
--
--  AC_MSG_RESULT($kde_supports_versionmaps)
--])
--
--AC_DEFUN([AM_PROG_OBJC],[
--AC_CHECK_PROGS(OBJC, gcc, gcc)
--test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
--if test "x${OBJCFLAGS-unset}" = xunset; then
--   OBJCFLAGS="-g -O2"
--fi
--AC_SUBST(OBJCFLAGS)
--_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
--])
--
--AC_DEFUN([KDE_CHECK_PERL],
--[
--	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
--		    AC_MSG_ERROR([No Perl found in your $PATH.
--We need perl to generate some code.])
--	])
--    AC_SUBST(PERL)
--])
--
--AC_DEFUN([KDE_CHECK_LARGEFILE],
--[
--AC_SYS_LARGEFILE
--if test "$ac_cv_sys_file_offset_bits" != no; then
--  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
--fi
--
--if test "x$ac_cv_sys_large_files" != "xno"; then
--  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
--fi
--
--])
--
--dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
--dnl which allows to search for libs that get installed into the KDE prefix.
--dnl
--dnl Syntax:  KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
--dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
--dnl also defines KSTUFF_PKG_ERRORS on error
--AC_DEFUN([KDE_PKG_CHECK_MODULES], [
--
--   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
--   if test "$prefix" != "$kde_libs_prefix"; then
--       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
--   fi
--   export PKG_CONFIG_PATH
--   PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
--])
--
--
--dnl Check for PIE support in the compiler and linker
--AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
--[
--  AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
--  [
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    safe_CXXFLAGS=$CXXFLAGS
--    safe_LDFLAGS=$LDFLAGS
--    CXXFLAGS="$CXXFLAGS -fPIE"
--    LDFLAGS="$LDFLAGS -pie"
--
--    AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
--
--    CXXFLAGS=$safe_CXXFLAGS
--    LDFLAGS=$safe_LDFLAGS
--    AC_LANG_RESTORE
--  ])
--
--  AC_MSG_CHECKING(if enabling -pie/fPIE support)
--
--  AC_ARG_ENABLE(pie,
--    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
--      [kde_has_pie_support=$enableval],
--      [kde_has_pie_support=detect])
--
--  if test "$kde_has_pie_support" = "detect"; then
--    kde_has_pie_support=$kde_cv_val_pie_support
--  fi
--
--  AC_MSG_RESULT([$kde_has_pie_support])
--
--  KDE_USE_FPIE=""
--  KDE_USE_PIE=""
--
--  AC_SUBST([KDE_USE_FPIE])
--  AC_SUBST([KDE_USE_PIE])
--
--  if test "$kde_has_pie_support" = "yes"; then
--    KDE_USE_FPIE="-fPIE"
--    KDE_USE_PIE="-pie"
--  fi
--])
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--## Free Software Foundation, Inc.
--## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
--##
--## This file is free software; the Free Software Foundation gives
--## unlimited permission to copy and/or distribute it, with or without
--## modifications, as long as this notice is preserved.
--
--# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
--
--
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
--         [],
--         [m4_define([AC_PROVIDE_IFELSE],
--	         [m4_ifdef([AC_PROVIDE_$1],
--		           [$2], [$3])])])
--
--
--# AC_PROG_LIBTOOL
--# ---------------
--AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
--dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
--dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
--  AC_PROVIDE_IFELSE([AC_PROG_CXX],
--    [AC_LIBTOOL_CXX],
--    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
--  ])])
--dnl And a similar setup for Fortran 77 support
--  AC_PROVIDE_IFELSE([AC_PROG_F77],
--    [AC_LIBTOOL_F77],
--    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
--])])
--
--dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
--dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
--dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
--  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
--    [AC_LIBTOOL_GCJ],
--    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
--      [AC_LIBTOOL_GCJ],
--      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
--	[AC_LIBTOOL_GCJ],
--      [ifdef([AC_PROG_GCJ],
--	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([A][M_PROG_GCJ],
--	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([LT_AC_PROG_GCJ],
--	     [define([LT_AC_PROG_GCJ],
--		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
--
--
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
--
--
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
--AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
--dnl
--
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
--
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
--
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
--
--# Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
--# Constants:
--rm="rm -f"
--
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
--
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
--
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
--
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
--
--# Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$LTCC" && LTCC=$CC
--test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$SED" && SED=sed
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
--
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
--
--if test -n "$RANLIB"; then
--  case $host_os in
--  openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
--    ;;
--  *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
--    ;;
--  esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
--
--_LT_CC_BASENAME([$compiler])
--
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    AC_PATH_MAGIC
--  fi
--  ;;
--esac
--
--AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
--
--AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
--
--AC_ARG_WITH([pic],
--    [AC_HELP_STRING([--with-pic],
--	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
--    [pic_mode=default])
--test -z "$pic_mode" && pic_mode=default
--
--# Use C for the default configuration in the libtool script
--tagname=
--AC_LIBTOOL_LANG_C_CONFIG
--_LT_AC_TAGCONFIG
--])# AC_LIBTOOL_SETUP
--
--
--# _LT_AC_SYS_COMPILER
--# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
--
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
--
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
--
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_AC_SYS_COMPILER
--
--
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
--AC_DEFUN([_LT_CC_BASENAME],
--[for cc_temp in $1""; do
--  case $cc_temp in
--    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
--    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
--    \-*) ;;
--    *) break;;
--  esac
--done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--])
--
--
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
--# the simple compiler test code.
--AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_compiler_boilerplate=`cat conftest.err`
--$rm conftest*
--])# _LT_COMPILER_BOILERPLATE
--
--
--# _LT_LINKER_BOILERPLATE
--# ----------------------
--# Check for linker boilerplate output or warnings with
--# the simple link test code.
--AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
--])# _LT_LINKER_BOILERPLATE
--
--
--# _LT_AC_SYS_LIBPATH_AIX
--# ----------------------
--# Links a minimal program and checks the executable
--# for the system default hardcoded library path. In most cases,
--# this is /usr/lib:/lib, but when the MPI compilers are used
--# the location of the communication and MPI libs are included too.
--# If we don't find anything, use the default library path according
--# to the aix ld manual.
--AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--])# _LT_AC_SYS_LIBPATH_AIX
--
--
--# _LT_AC_SHELL_INIT(ARG)
--# ----------------------
--AC_DEFUN([_LT_AC_SHELL_INIT],
--[ifdef([AC_DIVERSION_NOTICE],
--	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--	 [AC_DIVERT_PUSH(NOTICE)])
--$1
--AC_DIVERT_POP
--])# _LT_AC_SHELL_INIT
--
--
--# _LT_AC_PROG_ECHO_BACKSLASH
--# --------------------------
--# Add some code to the start of the generated configure script which
--# will find an echo command which doesn't interpret backslashes.
--AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
--[_LT_AC_SHELL_INIT([
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--case X$ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
--  ;;
--esac
--
--echo=${ECHO-echo}
--if test "X[$]1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X[$]1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
--  # Yippee, $echo works!
--  :
--else
--  # Restart under the correct shell.
--  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
--
--if test "X[$]1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<EOF
--[$]*
--EOF
--  exit 0
--fi
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--if test -z "$ECHO"; then
--if test "X${echo_test_string+set}" != Xset; then
--# find a string as large as possible, as long as the shell can cope with it
--  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
--    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
--       echo_test_string=`eval $cmd` &&
--       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
--    then
--      break
--    fi
--  done
--fi
--
--if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
--   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
--   test "X$echo_testing_string" = "X$echo_test_string"; then
--  :
--else
--  # The Solaris, AIX, and Digital Unix default echo programs unquote
--  # backslashes.  This makes it impossible to quote backslashes using
--  #   echo "$something" | sed 's/\\/\\\\/g'
--  #
--  # So, first we look for a working echo in the user's PATH.
--
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for dir in $PATH /usr/ucb; do
--    IFS="$lt_save_ifs"
--    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
--       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
--       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
--       test "X$echo_testing_string" = "X$echo_test_string"; then
--      echo="$dir/echo"
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--
--  if test "X$echo" = Xecho; then
--    # We didn't find a better echo, so look for alternatives.
--    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
--       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
--       test "X$echo_testing_string" = "X$echo_test_string"; then
--      # This shell has a builtin print -r that does the trick.
--      echo='print -r'
--    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
--	 test "X$CONFIG_SHELL" != X/bin/ksh; then
--      # If we have ksh, try running configure again with it.
--      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--      export ORIGINAL_CONFIG_SHELL
--      CONFIG_SHELL=/bin/ksh
--      export CONFIG_SHELL
--      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
--    else
--      # Try using printf.
--      echo='printf %s\n'
--      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
--	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
--	 test "X$echo_testing_string" = "X$echo_test_string"; then
--	# Cool, printf works
--	:
--      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	   test "X$echo_testing_string" = 'X\t' &&
--	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
--	export CONFIG_SHELL
--	SHELL="$CONFIG_SHELL"
--	export SHELL
--	echo="$CONFIG_SHELL [$]0 --fallback-echo"
--      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	   test "X$echo_testing_string" = 'X\t' &&
--	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	echo="$CONFIG_SHELL [$]0 --fallback-echo"
--      else
--	# maybe with a smaller string...
--	prev=:
--
--	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
--	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
--	  then
--	    break
--	  fi
--	  prev="$cmd"
--	done
--
--	if test "$prev" != 'sed 50q "[$]0"'; then
--	  echo_test_string=`eval $prev`
--	  export echo_test_string
--	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
--	else
--	  # Oops.  We lost completely, so just stick with echo.
--	  echo=echo
--	fi
--      fi
--    fi
--  fi
--fi
--fi
--
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--ECHO=$echo
--if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
--   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
--
--AC_SUBST(ECHO)
--])])# _LT_AC_PROG_ECHO_BACKSLASH
--
--
--# _LT_AC_LOCK
--# -----------
--AC_DEFUN([_LT_AC_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
--
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--ia64-*-hpux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *ELF-32*)
--      HPUX_IA64_MODE="32"
--      ;;
--    *ELF-64*)
--      HPUX_IA64_MODE="64"
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--   if test "$lt_cv_prog_gnu_ld" = yes; then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -melf32bsmip"
--      ;;
--    *N32*)
--      LD="${LD-ld} -melf32bmipn32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -melf64bmip"
--      ;;
--    esac
--   else
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -32"
--      ;;
--    *N32*)
--      LD="${LD-ld} -n32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -64"
--      ;;
--    esac
--   fi
--  fi
--  rm -rf conftest*
--  ;;
--
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--    *32-bit*)
--      case $host in
--        x86_64-*linux*)
--          LD="${LD-ld} -m elf_i386"
--          ;;
--        ppc64-*linux*|powerpc64-*linux*)
--          LD="${LD-ld} -m elf32ppclinux"
--          ;;
--        s390x-*linux*)
--          LD="${LD-ld} -m elf_s390"
--          ;;
--        sparc64-*linux*)
--          LD="${LD-ld} -m elf32_sparc"
--          ;;
--      esac
--      ;;
--    *64-bit*)
--      case $host in
--        x86_64-*linux*)
--          LD="${LD-ld} -m elf_x86_64"
--          ;;
--        ppc*-*linux*|powerpc*-*linux*)
--          LD="${LD-ld} -m elf64ppc"
--          ;;
--        s390*-*linux*)
--          LD="${LD-ld} -m elf64_s390"
--          ;;
--        sparc*-*linux*)
--          LD="${LD-ld} -m elf64_sparc"
--          ;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_LANG_PUSH(C)
--     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
--     AC_LANG_POP])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
--sparc*-*solaris*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--    *64-bit*)
--      case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--  ])
--esac
--
--need_locks="$enable_libtool_lock"
--
--])# _LT_AC_LOCK
--
--
--# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
--[AC_REQUIRE([LT_AC_PROG_SED])
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$3"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   # The option is referenced via a variable to avoid confusing sed.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       $2=yes
--     fi
--   fi
--   $rm conftest*
--])
--
--if test x"[$]$2" = xyes; then
--    ifelse([$5], , :, [$5])
--else
--    ifelse([$6], , :, [$6])
--fi
--])# AC_LIBTOOL_COMPILER_OPTION
--
--
--# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#                          [ACTION-SUCCESS], [ACTION-FAILURE])
--# ------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $3"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&AS_MESSAGE_LOG_FD
--       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         $2=yes
--       fi
--     else
--       $2=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
--])
--
--if test x"[$]$2" = xyes; then
--    ifelse([$4], , :, [$4])
--else
--    ifelse([$5], , :, [$5])
--fi
--])# AC_LIBTOOL_LINKER_OPTION
--
--
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
--  i=0
--  teststring="ABCD"
--
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
--
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
--
--  cygwin* | mingw*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  amigaos*)
--    # On AmigaOS with pdksh, this test takes hours, literally.
--    # So we just punt and use a minimum line length of 8192.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
--    # This has been around since 386BSD, at least.  Likely further.
--    if test -x /sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
--    elif test -x /usr/sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
--    else
--      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
--    fi
--    # And add a safety zone
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
--    ;;
--
--  interix*)
--    # We know the value 262144 and hardcode it with a safety zone (like BSD)
--    lt_cv_sys_max_cmd_len=196608
--    ;;
--
--  osf*)
--    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
--    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
--    # nice to cause kernel panics so lets avoid the loop below.
--    # First set a reasonable default.
--    lt_cv_sys_max_cmd_len=16384
--    #
--    if test -x /sbin/sysconfig; then
--      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
--        *1*) lt_cv_sys_max_cmd_len=-1 ;;
--      esac
--    fi
--    ;;
--  sco3.2v5*)
--    lt_cv_sys_max_cmd_len=102400
--    ;;
--  sysv5* | sco5v6* | sysv4.2uw2*)
--    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
--    if test -n "$kargmax"; then
--      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
--    else
--      lt_cv_sys_max_cmd_len=32768
--    fi
--    ;;
--  *)
--    # If test is not a shell built-in, we'll probably end up computing a
--    # maximum length that is only half of the actual maximum length, but
--    # we can't tell.
--    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
--    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
--	       = "XX$teststring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      teststring=$teststring$teststring
--    done
--    teststring=
--    # Add a significant safety factor because C++ compilers can tack on massive
--    # amounts of additional arguments before passing them to the linker.
--    # It appears as though 1/2 is a usable value.
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
--    ;;
--  esac
--])
--if test -n $lt_cv_sys_max_cmd_len ; then
--  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
--else
--  AC_MSG_RESULT(none)
--fi
--])# AC_LIBTOOL_SYS_MAX_CMD_LEN
--
--
--# _LT_AC_CHECK_DLFCN
--# ------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)dnl
--])# _LT_AC_CHECK_DLFCN
--
--
--# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ---------------------------------------------------------------------
--AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "$cross_compiling" = yes; then :
--  [$4]
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--[#line __oline__ "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
--
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
--  else
--    puts (dlerror ());
--
--    exit (status);
--}]
--EOF
--  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) $1 ;;
--      x$lt_dlneed_uscore) $2 ;;
--      x$lt_dlunknown|x*) $3 ;;
--    esac
--  else :
--    # compilation failed
--    $3
--  fi
--fi
--rm -fr conftest*
--])# _LT_AC_TRY_DLOPEN_SELF
--
--
--# AC_LIBTOOL_DLOPEN_SELF
--# ----------------------
--AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
--
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
--
--  mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
--
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--   ;;
--
--  darwin*)
--  # if libdl is installed we need to link against it
--    AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ])
--   ;;
--
--  *)
--    AC_CHECK_FUNC([shl_load],
--	  [lt_cv_dlopen="shl_load"],
--      [AC_CHECK_LIB([dld], [shl_load],
--	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
--	[AC_CHECK_FUNC([dlopen],
--	      [lt_cv_dlopen="dlopen"],
--	  [AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
--	    [AC_CHECK_LIB([svld], [dlopen],
--		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
--	      [AC_CHECK_LIB([dld], [dld_link],
--		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
--	      ])
--	    ])
--	  ])
--	])
--      ])
--    ;;
--  esac
--
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
--
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
--
--    AC_CACHE_CHECK([whether a program can dlopen itself],
--	  lt_cv_dlopen_self, [dnl
--	  _LT_AC_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
--	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
--    ])
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
--    	  lt_cv_dlopen_self_static, [dnl
--	  _LT_AC_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
--	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
--      ])
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
--
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
--fi
--])# AC_LIBTOOL_DLOPEN_SELF
--
--
--# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
--# ---------------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler
--AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s out/conftest2.$ac_objext
--   then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
--     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
--     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
--       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--     fi
--   fi
--   chmod u+w . 2>&AS_MESSAGE_LOG_FD
--   $rm conftest*
--   # SGI C++ compiler will create directory out/ii_files/ for
--   # template instantiation
--   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
--   $rm out/* && rmdir out
--   cd ..
--   rmdir conftest
--   $rm conftest*
--])
--])# AC_LIBTOOL_PROG_CC_C_O
--
--
--# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
--# -----------------------------------------
--# Check to see if we can do hard links to lock some files if needed
--AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
--[AC_REQUIRE([_LT_AC_LOCK])dnl
--
--hard_links="nottested"
--if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  AC_MSG_CHECKING([if we can lock with hard links])
--  hard_links=yes
--  $rm conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  AC_MSG_RESULT([$hard_links])
--  if test "$hard_links" = no; then
--    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
--])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
--
--
--# AC_LIBTOOL_OBJDIR
--# -----------------
--AC_DEFUN([AC_LIBTOOL_OBJDIR],
--[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
--[rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  lt_cv_objdir=.libs
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  lt_cv_objdir=_libs
--fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--])# AC_LIBTOOL_OBJDIR
--
--
--# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
--# ----------------------------------------------
--# Check hardcoding attributes.
--AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
--[AC_MSG_CHECKING([how to hardcode library paths into programs])
--_LT_AC_TAGVAR(hardcode_action, $1)=
--if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
--     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
--    # Linking always hardcodes the temporary library directory.
--    _LT_AC_TAGVAR(hardcode_action, $1)=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
--
--if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
--])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
--
--
--# AC_LIBTOOL_SYS_LIB_STRIP
--# ------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
--[striplib=
--old_striplib=
--AC_MSG_CHECKING([whether stripping libraries is possible])
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  AC_MSG_RESULT([yes])
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         AC_MSG_RESULT([yes])
--       else
--  AC_MSG_RESULT([no])
--fi
--       ;;
--   *)
--  AC_MSG_RESULT([no])
--    ;;
--  esac
--fi
--])# AC_LIBTOOL_SYS_LIB_STRIP
--
--
--# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--# -----------------------------
--# PORTME Fill in your ld.so characteristics
--AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
--shrext_cmds=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
--  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
--    # if the path contains ";" then we assume it to be the separator
--    # otherwise default to the standard path separator (i.e. ":") - it is
--    # assumed that no part of a normal pathname contains ";" but that should
--    # okay in the real world where ";" in dirpaths is itself problematic.
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--  else
--    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--  fi
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
--aix4* | aix5*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[[01]] | aix4.[[01]].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	:
--      else
--	can_build_shared=no
--      fi
--      ;;
--    esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}${shared_ext}$major'
--    fi
--    shlibpath_var=LIBPATH
--  fi
--  ;;
--
--amigaos*)
--  library_names_spec='$libname.ixlibrary $libname.a'
--  # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
--  ;;
--
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
--
--bsdi[[45]]*)
--  version_type=linux
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
--  ;;
--
--cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    library_names_spec='$libname.dll.a'
--    # DLL is installed to $(libdir)/../bin by postinstall_cmds
--    postinstall_cmds='base_file=`basename \${file}`~
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog $dir/$dlname \$dldir/$dlname~
--      chmod a+x \$dldir/$dlname'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
--       $rm \$dlpath'
--    shlibpath_overrides_runpath=yes
--
--    case $host_os in
--    cygwin*)
--      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
--      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
--      ;;
--    mingw*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
--      ;;
--    pw32*)
--      # pw32 DLLs use 'pw' prefix rather than 'lib'
--      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      ;;
--    esac
--    ;;
--
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
--
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
--  soname_spec='${libname}${release}${major}$shared_ext'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
--  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
--freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
--  if test -x /usr/bin/objformat; then
--    objformat=`/usr/bin/objformat`
--  else
--    case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
--    *) objformat=elf ;;
--    esac
--  fi
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
--  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  freebsd*) # from 4.6 on
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  ;;
--
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  case $host_cpu in
--  ia64*)
--    shrext_cmds='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
--   hppa*64*)
--     shrext_cmds='.sl'
--     hardcode_into_libs=yes
--     dynamic_linker="$host_os dld.sl"
--     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--     soname_spec='${libname}${release}${shared_ext}$major'
--     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
--     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--     ;;
--   *)
--    shrext_cmds='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    ;;
--  esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
--  ;;
--
--interix3*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
--    ;;
--  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
--
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
--  fi
--
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
--  # powerpc, because MkLinux only supported shared libraries with the
--  # GNU dynamic linker.  Since this was broken with cross compilers,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
--
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--nto-qnx*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--openbsd*)
--  version_type=sunos
--  sys_lib_dlsearch_path_spec="/usr/lib"
--  need_lib_prefix=no
--  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
--  case $host_os in
--    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
--    *)                         need_version=no  ;;
--  esac
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[[89]] | openbsd2.[[89]].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
--  shrext_cmds=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
--
--sysv4 | sysv4.3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
--
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  version_type=freebsd-elf
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  if test "$with_gnu_ld" = yes; then
--    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    case $host_os in
--      sco3.2v5*)
--        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
--	;;
--    esac
--  fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
--  ;;
--
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--*)
--  dynamic_linker=no
--  ;;
--esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
--
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--
--
--# _LT_AC_TAGCONFIG
--# ----------------
--AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
--    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
--        [include additional configurations @<:@automatic@:>@])],
--    [tagnames="$withval"])
--
--if test -f "$ltmain" && test -n "$tagnames"; then
--  if test ! -f "${ofile}"; then
--    AC_MSG_WARN([output file `$ofile' does not exist])
--  fi
--
--  if test -z "$LTCC"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
--    if test -z "$LTCC"; then
--      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
--    else
--      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
--    fi
--  fi
--  if test -z "$LTCFLAGS"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
--  fi
--
--  # Extract list of available tagged configurations in $ofile.
--  # Note that this assumes the entire list is on one line.
--  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
--
--  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--  for tagname in $tagnames; do
--    IFS="$lt_save_ifs"
--    # Check whether tagname contains only valid characters
--    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
--    "") ;;
--    *)  AC_MSG_ERROR([invalid tag name: $tagname])
--	;;
--    esac
--
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
--    fi
--
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
--
--      case $tagname in
--      CXX)
--	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--	    (test "X$CXX" != "Xg++"))) ; then
--	  AC_LIBTOOL_LANG_CXX_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
--	  AC_LIBTOOL_LANG_F77_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--	  AC_LIBTOOL_LANG_GCJ_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      RC)
--	AC_LIBTOOL_LANG_RC_CONFIG
--	;;
--
--      *)
--	AC_MSG_ERROR([Unsupported tag name: $tagname])
--	;;
--      esac
--
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
--    fi
--  done
--  IFS="$lt_save_ifs"
--
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    AC_MSG_ERROR([unable to update list of available tagged configurations.])
--  fi
--fi
--])# _LT_AC_TAGCONFIG
--
--
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
--
--
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 DLLs
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
--
--
--# AC_ENABLE_SHARED([DEFAULT])
--# ---------------------------
--# implement the --enable-shared flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([shared],
--    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
--
--
--# AC_DISABLE_SHARED
--# -----------------
--# set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)
--])# AC_DISABLE_SHARED
--
--
--# AC_ENABLE_STATIC([DEFAULT])
--# ---------------------------
--# implement the --enable-static flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_STATIC],
--[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([static],
--    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
--	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
--])# AC_ENABLE_STATIC
--
--
--# AC_DISABLE_STATIC
--# -----------------
--# set the default static flag to --disable-static
--AC_DEFUN([AC_DISABLE_STATIC],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)
--])# AC_DISABLE_STATIC
--
--
--# AC_ENABLE_FAST_INSTALL([DEFAULT])
--# ---------------------------------
--# implement the --enable-fast-install flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_FAST_INSTALL],
--[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([fast-install],
--    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
--    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_fast_install=yes ;;
--    no) enable_fast_install=no ;;
--    *)
--      enable_fast_install=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_fast_install=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
--])# AC_ENABLE_FAST_INSTALL
--
--
--# AC_DISABLE_FAST_INSTALL
--# -----------------------
--# set the default to --disable-fast-install
--AC_DEFUN([AC_DISABLE_FAST_INSTALL],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)
--])# AC_DISABLE_FAST_INSTALL
--
--
--# AC_LIBTOOL_PICMODE([MODE])
--# --------------------------
--# implement the --with-pic flag
--# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
--AC_DEFUN([AC_LIBTOOL_PICMODE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--pic_mode=ifelse($#,1,$1,default)
--])# AC_LIBTOOL_PICMODE
--
--
--# AC_PROG_EGREP
--# -------------
--# This is predefined starting with Autoconf 2.54, so this conditional
--# definition can be removed once we require Autoconf 2.54 or later.
--m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
--[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
--   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
--    fi])
-- EGREP=$ac_cv_prog_egrep
-- AC_SUBST([EGREP])
--])])
--
--
--# AC_PATH_TOOL_PREFIX
--# -------------------
--# find a file program which can recognise shared library
--AC_DEFUN([AC_PATH_TOOL_PREFIX],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_MSG_CHECKING([for $1])
--AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
--[case $MAGIC_CMD in
--[[\\/*] |  ?:[\\/]*])
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--*)
--  lt_save_MAGIC_CMD="$MAGIC_CMD"
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--dnl $ac_dummy forces splitting on constant user-supplied paths.
--dnl POSIX.2 word splitting is done only on the output of word expansions,
--dnl not every word.  This closes a longstanding sh security hole.
--  ac_dummy="ifelse([$2], , $PATH, [$2])"
--  for ac_dir in $ac_dummy; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$1; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    $EGREP "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<EOF 1>&2
--
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool@gnu.org
--
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
--esac])
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  AC_MSG_RESULT($MAGIC_CMD)
--else
--  AC_MSG_RESULT(no)
--fi
--])# AC_PATH_TOOL_PREFIX
--
--
--# AC_PATH_MAGIC
--# -------------
--# find a file program which can recognise a shared library
--AC_DEFUN([AC_PATH_MAGIC],
--[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
--  else
--    MAGIC_CMD=:
--  fi
--fi
--])# AC_PATH_MAGIC
--
--
--# AC_PROG_LD
--# ----------
--# find the pathname to the GNU or non-GNU linker
--AC_DEFUN([AC_PROG_LD],
--[AC_ARG_WITH([gnu-ld],
--    [AC_HELP_STRING([--with-gnu-ld],
--	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
--    [test "$withval" = no || with_gnu_ld=yes],
--    [with_gnu_ld=no])
--AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by $CC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]]* | ?:[[\\/]]*)
--      re_direlt='/[[^/]][[^/]]*/\.\./'
--      # Canonicalize the pathname of ld
--      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(lt_cv_path_LD,
--[if test -z "$LD"; then
--  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      lt_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some variants of GNU ld only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break
--	;;
--      *)
--	test "$with_gnu_ld" != yes && break
--	;;
--      esac
--    fi
--  done
--  IFS="$lt_save_ifs"
--else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])# AC_PROG_LD
--
--
--# AC_PROG_LD_GNU
--# --------------
--AC_DEFUN([AC_PROG_LD_GNU],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  lt_cv_prog_gnu_ld=yes
--  ;;
--*)
--  lt_cv_prog_gnu_ld=no
--  ;;
--esac])
--with_gnu_ld=$lt_cv_prog_gnu_ld
--])# AC_PROG_LD_GNU
--
--
--# AC_PROG_LD_RELOAD_FLAG
--# ----------------------
--# find reload flag for linker
--#   -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
--[AC_CACHE_CHECK([for $LD option to reload object files],
--  lt_cv_ld_reload_flag,
--  [lt_cv_ld_reload_flag='-r'])
--reload_flag=$lt_cv_ld_reload_flag
--case $reload_flag in
--"" | " "*) ;;
--*) reload_flag=" $reload_flag" ;;
--esac
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--case $host_os in
--  darwin*)
--    if test "$GCC" = yes; then
--      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
--    else
--      reload_cmds='$LD$reload_flag -o $output$reload_objs'
--    fi
--    ;;
--esac
--])# AC_PROG_LD_RELOAD_FLAG
--
--
--# AC_DEPLIBS_CHECK_METHOD
--# -----------------------
--# how to check for library dependencies
--#  -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
--lt_cv_deplibs_check_method,
--[lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given extended regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
--
--case $host_os in
--aix4* | aix5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--bsdi[[45]]*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  ;;
--
--cygwin*)
--  # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_file_magic_cmd='func_win32_libid'
--  ;;
--
--mingw* | pw32*)
--  # Base MSYS/MinGW do not provide the 'file' command needed by
--  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
--
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--freebsd* | dragonfly*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    case $host_cpu in
--    i*86 )
--      # Not sure whether the presence of OpenBSD here was a mistake.
--      # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
--      lt_cv_file_magic_cmd=/usr/bin/file
--      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--      ;;
--    esac
--  else
--    lt_cv_deplibs_check_method=pass_all
--  fi
--  ;;
--
--gnu*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--hpux10.20* | hpux11*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  case $host_cpu in
--  ia64*)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
--    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
--    ;;
--  hppa*64*)
--    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
--    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
--    ;;
--  *)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
--    lt_cv_file_magic_test_file=/usr/lib/libc.sl
--    ;;
--  esac
--  ;;
--
--interix3*)
--  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
--  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $LD in
--  *-32|*"-32 ") libmagic=32-bit;;
--  *-n32|*"-n32 ") libmagic=N32;;
--  *-64|*"-64 ") libmagic=64-bit;;
--  *) libmagic=never-match;;
--  esac
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--netbsd* | netbsdelf*-gnu)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
--  fi
--  ;;
--
--newos6*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=/usr/lib/libnls.so
--  ;;
--
--nto-qnx*)
--  lt_cv_deplibs_check_method=unknown
--  ;;
--
--openbsd*)
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
--  fi
--  ;;
--
--osf3* | osf4* | osf5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--sysv4 | sysv4.3*)
--  case $host_vendor in
--  motorola)
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
--    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
--    ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  sequent)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
--    ;;
--  sni)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
--    lt_cv_file_magic_test_file=/lib/libc.so
--    ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  pc)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  esac
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--esac
--])
--file_magic_cmd=$lt_cv_file_magic_cmd
--deplibs_check_method=$lt_cv_deplibs_check_method
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
--])# AC_DEPLIBS_CHECK_METHOD
--
--
--# AC_PROG_NM
--# ----------
--# find the pathname to a BSD-compatible name lister
--AC_DEFUN([AC_PROG_NM],
--[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
--[if test -n "$NM"; then
--  # Let the user override the test.
--  lt_cv_path_NM="$NM"
--else
--  lt_nm_to_check="${ac_tool_prefix}nm"
--  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
--    lt_nm_to_check="$lt_nm_to_check nm"
--  fi
--  for lt_tmp_nm in $lt_nm_to_check; do
--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
--      IFS="$lt_save_ifs"
--      test -z "$ac_dir" && ac_dir=.
--      tmp_nm="$ac_dir/$lt_tmp_nm"
--      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
--	# Check to see if the nm accepts a BSD-compat flag.
--	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
--	#   nm: unknown option "B" ignored
--	# Tru64's nm complains that /dev/null is an invalid object file
--	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--	*/dev/null* | *'Invalid file or object type'*)
--	  lt_cv_path_NM="$tmp_nm -B"
--	  break
--	  ;;
--	*)
--	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	  */dev/null*)
--	    lt_cv_path_NM="$tmp_nm -p"
--	    break
--	    ;;
--	  *)
--	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	    continue # so that we can try to find one that supports BSD flags
--	    ;;
--	  esac
--	  ;;
--	esac
--      fi
--    done
--    IFS="$lt_save_ifs"
--  done
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
--fi])
--NM="$lt_cv_path_NM"
--])# AC_PROG_NM
--
--
--# AC_CHECK_LIBM
--# -------------
--# check for math library
--AC_DEFUN([AC_CHECK_LIBM],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
--  # These system don't have libm, or don't need it
--  ;;
--*-ncr-sysv4.3*)
--  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
--  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
--  ;;
--*)
--  AC_CHECK_LIB(m, cos, LIBM="-lm")
--  ;;
--esac
--])# AC_CHECK_LIBM
--
--
--# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl convenience library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that
--# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
--# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
--# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
--# (note the single quotes!).  If your package is not flat and you're not
--# using automake, define top_builddir and top_srcdir appropriately in
--# the Makefiles.
--AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  case $enable_ltdl_convenience in
--  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
--  "") enable_ltdl_convenience=yes
--      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
--  esac
--  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
--  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_CONVENIENCE
--
--
--# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl installable library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that
--# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
--# and an installed libltdl is not found, it is assumed to be `libltdl'.
--# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and top_srcdir
--# appropriately in the Makefiles.
--# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  AC_CHECK_LIB(ltdl, lt_dlinit,
--  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
--  [if test x"$enable_ltdl_install" = xno; then
--     AC_MSG_WARN([libltdl not installed, but installation disabled])
--   else
--     enable_ltdl_install=yes
--   fi
--  ])
--  if test x"$enable_ltdl_install" = x"yes"; then
--    ac_configure_args="$ac_configure_args --enable-ltdl-install"
--    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
--    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  else
--    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
--    LIBLTDL="-lltdl"
--    LTDLINCL=
--  fi
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_INSTALLABLE
--
--
--# AC_LIBTOOL_CXX
--# --------------
--# enable support for C++ libraries
--AC_DEFUN([AC_LIBTOOL_CXX],
--[AC_REQUIRE([_LT_AC_LANG_CXX])
--])# AC_LIBTOOL_CXX
--
--
--# _LT_AC_LANG_CXX
--# ---------------
--AC_DEFUN([_LT_AC_LANG_CXX],
--[AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
--])# _LT_AC_LANG_CXX
--
--# _LT_AC_PROG_CXXCPP
--# ------------------
--AC_DEFUN([_LT_AC_PROG_CXXCPP],
--[
--AC_REQUIRE([AC_PROG_CXX])
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  AC_PROG_CXXCPP
--fi
--])# _LT_AC_PROG_CXXCPP
--
--# AC_LIBTOOL_F77
--# --------------
--# enable support for Fortran 77 libraries
--AC_DEFUN([AC_LIBTOOL_F77],
--[AC_REQUIRE([_LT_AC_LANG_F77])
--])# AC_LIBTOOL_F77
--
--
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
--
--
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
--
--
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
--  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
--    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
--      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
--	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
--	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
--
--
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
--
--
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[lt_save_CC="$CC"
--AC_LANG_PUSH(C)
--
--# Source file extension for C test sources.
--ac_ext=c
--
--# Object file extension for compiled C test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
--
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF
--
--# Report which library types will actually be built
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
--
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
--
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
--  ;;
--
--aix4* | aix5*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--    ;;
--esac
--AC_MSG_RESULT([$enable_shared])
--
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_C_CONFIG
--
--
--# AC_LIBTOOL_LANG_CXX_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
--AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
--[AC_LANG_PUSH(C++)
--AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Dependencies to place before and after the object being linked:
--_LT_AC_TAGVAR(predep_objects, $1)=
--_LT_AC_TAGVAR(postdep_objects, $1)=
--_LT_AC_TAGVAR(predeps, $1)=
--_LT_AC_TAGVAR(postdeps, $1)=
--_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
--
--# Source file extension for C++ test sources.
--ac_ext=cpp
--
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC=$CC
--lt_save_LD=$LD
--lt_save_GCC=$GCC
--GCC=$GXX
--lt_save_with_gnu_ld=$with_gnu_ld
--lt_save_path_LD=$lt_cv_path_LD
--if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
--  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--else
--  $as_unset lt_cv_prog_gnu_ld
--fi
--if test -n "${lt_cv_path_LDCXX+set}"; then
--  lt_cv_path_LD=$lt_cv_path_LDCXX
--else
--  $as_unset lt_cv_path_LD
--fi
--test -z "${LDCXX+set}" || LD=$LDCXX
--CC=${CXX-"c++"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--else
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--fi
--
--if test "$GXX" = yes; then
--  # Set up default GNU C++ configuration
--
--  AC_PROG_LD
--
--  # Check if GNU C++ uses GNU ld as the underlying linker, since the
--  # archiving commands below assume that GNU ld is being used.
--  if test "$with_gnu_ld" = yes; then
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
--    #     investigate it a little bit more. (MM)
--    wlarc='${wl}'
--
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
--	grep 'no-whole-archive' > /dev/null; then
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    with_gnu_ld=no
--    wlarc=
--
--    # A generic and very simple default shared library creation
--    # command for GNU C++ for the case where it uses the native
--    # linker, instead of GNU ld.  If possible, this setting should
--    # overridden to take advantage of the native linker features on
--    # the platform it is being used on.
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--  fi
--
--  # Commands to make compiler produce verbose output that lists
--  # what "hidden" libraries, object files and flags are used when
--  # linking a shared library.
--  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
--else
--  GXX=no
--  with_gnu_ld=no
--  wlarc=
--fi
--
--# PORTME: fill in a description of your system's C++ link characteristics
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
--  aix3*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  aix4* | aix5*)
--    if test "$host_cpu" = ia64; then
--      # On IA64, the linker does run time linking by default, so we don't
--      # have to do anything special.
--      aix_use_runtimelinking=no
--      exp_sym_flag='-Bexport'
--      no_entry_flag=""
--    else
--      aix_use_runtimelinking=no
--
--      # Test if we are trying to use run time linking or normal
--      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--      # need to do runtime linking.
--      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--	for ld_flag in $LDFLAGS; do
--	  case $ld_flag in
--	  *-brtl*)
--	    aix_use_runtimelinking=yes
--	    break
--	    ;;
--	  esac
--	done
--	;;
--      esac
--
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
--    fi
--
--    # When large executables or shared objects are built, AIX ld can
--    # have problems creating the table of contents.  If linking a library
--    # or program results in "error TOC overflow" add -mminimal-toc to
--    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
--    _LT_AC_TAGVAR(archive_cmds, $1)=''
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    if test "$GXX" = yes; then
--      case $host_os in aix4.[[012]]|aix4.[[012]].*)
--      # We only want to do this on AIX 4.2 and lower, the check
--      # below for broken collect2 doesn't work under 4.3+
--	collect2name=`${CC} -print-prog-name=collect2`
--	if test -f "$collect2name" && \
--	   strings "$collect2name" | grep resolve_lib_name >/dev/null
--	then
--	  # We have reworked collect2
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	else
--	  # We have old collect2
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--	fi
--	;;
--      esac
--      shared_flag='-shared'
--      if test "$aix_use_runtimelinking" = yes; then
--	shared_flag="$shared_flag "'${wl}-G'
--      fi
--    else
--      # not using gcc
--      if test "$host_cpu" = ia64; then
--	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	# chokes on -Wl,-G. The following line is correct:
--	shared_flag='-G'
--      else
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
--	else
--	  shared_flag='${wl}-bM:SRE'
--	fi
--      fi
--    fi
--
--    # It seems that -bexpall does not export symbols beginning with
--    # underscore (_), so it is better to generate a list of symbols to export.
--    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
--    if test "$aix_use_runtimelinking" = yes; then
--      # Warning - without using the other runtime loading flags (-brtl),
--      # -berok will link without error, but may produce a broken library.
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
--      # Determine the default libpath from the value encoded in an empty executable.
--      _LT_AC_SYS_LIBPATH_AIX
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--     else
--      if test "$host_cpu" = ia64; then
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--      else
--	# Determine the default libpath from the value encoded in an empty executable.
--	_LT_AC_SYS_LIBPATH_AIX
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	# Warning - without using the other run time loading flags,
--	# -berok will link without error, but may produce a broken library.
--	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	# Exported symbols can be pulled into shared objects from archives
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds its shared libraries.
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--      fi
--    fi
--    ;;
--
--  beos*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
--      # support --undefined.  This deserves some investigation.  FIXME
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
--  chorus*)
--    case $cc_basename in
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--
--  cygwin* | mingw* | pw32*)
--    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--    # as there is no search path for DLLs.
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--    _LT_AC_TAGVAR(always_export_symbols, $1)=no
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--      # If the export-symbols file already is a .def file (1st line
--      # is EXPORTS), use it as is; otherwise, prepend...
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	cp $export_symbols $output_objdir/$soname.def;
--      else
--	echo EXPORTS > $output_objdir/$soname.def;
--	cat $export_symbols >> $output_objdir/$soname.def;
--      fi~
--      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--  ;;
--      darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
--      output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
--      fi
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--        fi
--        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         _LT_AC_TAGVAR(ld_shlibs, $1)=no
--          ;;
--      esac
--      fi
--        ;;
--
--  dgux*)
--    case $cc_basename in
--      ec++*)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      ghcx*)
--	# Green Hills C++ Compiler
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  freebsd[[12]]*)
--    # C++ shared libraries reported to be fairly broken before switch to ELF
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  freebsd-elf*)
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    ;;
--  freebsd* | dragonfly*)
--    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--    # conventions
--    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
--    ;;
--  gnu*)
--    ;;
--  hpux9*)
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--				# but as the default
--				# location of the library.
--
--    case $cc_basename in
--    CC*)
--      # FIXME: insert proper C++ library support
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    aCC*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      # Commands to make compiler produce verbose output that lists
--      # what "hidden" libraries, object files and flags are used when
--      # linking a shared library.
--      #
--      # There doesn't appear to be a way to prevent this compiler from
--      # explicitly linking system object files so we need to strip them
--      # from the output so that they don't get included in the library
--      # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--      ;;
--    *)
--      if test "$GXX" = yes; then
--        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
--        # FIXME: insert proper C++ library support
--        _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--    ;;
--  hpux10*|hpux11*)
--    if test $with_gnu_ld = no; then
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--      case $host_cpu in
--      hppa*64*|ia64*)
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--        ;;
--      *)
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        ;;
--      esac
--    fi
--    case $host_cpu in
--    hppa*64*|ia64*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--    *)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--					      # but as the default
--					      # location of the library.
--      ;;
--    esac
--
--    case $cc_basename in
--      CC*)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      aCC*)
--	case $host_cpu in
--	hppa*64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	esac
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test $with_gnu_ld = no; then
--	    case $host_cpu in
--	    hppa*64*)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    ia64*)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    *)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    esac
--	  fi
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  interix3*)
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--    # Instead, shared libraries are loaded at an image base (0x10000000 by
--    # default) and relocated if they conflict, which is a slow very memory
--    # consuming and fragmenting process.  To avoid this, we pick a random,
--    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--    ;;
--  irix5* | irix6*)
--    case $cc_basename in
--      CC*)
--	# SGI C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	# Archives containing C++ object files must be created using
--	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test "$with_gnu_ld" = no; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	  else
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
--	  fi
--	fi
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--	;;
--    esac
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    ;;
--  linux* | k*bsd*-gnu)
--    case $cc_basename in
--      KCC*)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--	;;
--      icpc*)
--	# Intel C++
--	with_gnu_ld=yes
--	# version 8.0 and above of icpc choke on multiply defined symbols
--	# if we add $predep_objects and $postdep_objects, however 7.1 and
--	# earlier do not add the objects themselves.
--	case `$CC -V 2>&1` in
--	*"Version 7."*)
--  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--	  ;;
--	*)  # Version 8.0 or newer
--	  tmp_idyn=
--	  case $host_cpu in
--	    ia64*) tmp_idyn=' -i_dynamic';;
--	  esac
--  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--	  ;;
--	esac
--	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	;;
--      pgCC*)
--        # Portland Group C++ compiler
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--        ;;
--      cxx*)
--	# Compaq C++
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--
--	runpath_var=LD_RUN_PATH
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--    esac
--    ;;
--  lynxos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  m88k*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  mvs*)
--    case $cc_basename in
--      cxx*)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  netbsd* | netbsdelf*-gnu)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    fi
--    # Workaround some broken pre-1.5 toolchains
--    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
--    ;;
--  openbsd2*)
--    # C++ shared libraries are fairly broken
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  openbsd*)
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    fi
--    output_verbose_link_cmd='echo'
--    ;;
--  osf3*)
--    case $cc_basename in
--      KCC*)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx*)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	  # Commands to make compiler produce verbose output that lists
--	  # what "hidden" libraries, object files and flags are used when
--	  # linking a shared library.
--	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  osf4* | osf5*)
--    case $cc_basename in
--      KCC*)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx*)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
--	  $rm $lib.exp'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Commands to make compiler produce verbose output that lists
--	# what "hidden" libraries, object files and flags are used when
--	# linking a shared library.
--	#
--	# There doesn't appear to be a way to prevent this compiler from
--	# explicitly linking system object files so we need to strip them
--	# from the output so that they don't get included in the library
--	# dependencies.
--	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	  # Commands to make compiler produce verbose output that lists
--	  # what "hidden" libraries, object files and flags are used when
--	  # linking a shared library.
--	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
--	else
--	  # FIXME: insert proper C++ library support
--	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  psos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  sunos4*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.x
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      lcc*)
--	# Lucid
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  solaris*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.2, 5.x and Centerline C++
--        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
--	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	case $host_os in
--	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	  *)
--	    # The C++ compiler is used as linker so we must use $wl
--	    # flag to pass the commands to the underlying system
--	    # linker. We must also pass each convience library through
--	    # to the system linker between allextract/defaultextract.
--	    # The C++ compiler will combine linker options so we
--	    # cannot just pass the convience library names through
--	    # without $wl.
--	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
--	    ;;
--	esac
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--	output_verbose_link_cmd='echo'
--
--	# Archives containing C++ object files must be created using
--	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	;;
--      gcx*)
--	# Green Hills C++ Compiler
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--
--	# The C++ compiler must be used to create the archive.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--	;;
--      *)
--	# GNU C++ compiler with Solaris linker
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
--	  if $CC --version | grep -v '^2\.7' > /dev/null; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
--	  else
--	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
--	    # platform.
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
--	  fi
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
--	fi
--	;;
--    esac
--    ;;
--  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      CC*)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--      *)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--    esac
--    ;;
--  sysv5* | sco3.2v5* | sco5v6*)
--    # Note: We can NOT use -z defs as we might desire, because we do not
--    # link with -lc, and that would cause any symbols used from libc to
--    # always be unresolved, which means just about no library would
--    # ever link correctly.  If we're not using GNU ld we use -z text
--    # though, which does catch some bad symbols but isn't as heavy-handed
--    # as -z defs.
--    # For security reasons, it is highly recommended that you always
--    # use absolute paths for naming shared libraries, and exclude the
--    # DT_RUNPATH tag from executables and libraries.  But doing so
--    # requires that you compile everything twice, which is a pain.
--    # So that behaviour is only enabled if SCOABSPATH is set to a
--    # non-empty value in the environment.  Most likely only useful for
--    # creating official distributions of packages.
--    # This is a hack until libtool officially supports absolute path
--    # names for shared libraries.
--    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      CC*)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--      *)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--    esac
--    ;;
--  tandem*)
--    case $cc_basename in
--      NCC*)
--	# NonStop-UX NCC 3.20
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  vxworks*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  *)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--esac
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--_LT_AC_TAGVAR(GCC, $1)="$GXX"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
--AC_LIBTOOL_POSTDEP_PREDEP($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--])# AC_LIBTOOL_LANG_CXX_CONFIG
--
--# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
--# ------------------------------------
--# Figure out "hidden" library dependencies from verbose
--# compiler output when linking a shared library.
--# Parse the compiler output and extract the necessary
--# objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
--dnl we can't use the lt_simple_compile_test_code here,
--dnl because it contains code intended for an executable,
--dnl not a library.  It's possible we should let each
--dnl tag define a new lt_????_link_test_code variable,
--dnl but it's only used here...
--ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
--int a;
--void foo (void) { a = 0; }
--EOF
--],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--EOF
--],[$1],[F77],[cat > conftest.$ac_ext <<EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--EOF
--],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--EOF
--])
--dnl Parse the compiler output and extract the necessary
--dnl objects, libraries and library flags.
--if AC_TRY_EVAL(ac_compile); then
--  # Parse the compiler output and extract the necessary
--  # objects, libraries and library flags.
--
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
--
--  # The `*' in the case matches for architectures that use `case' in
--  # $output_verbose_cmd can trigger glob expansion during the loop
--  # eval without this substitution.
--  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
--
--  for p in `eval $output_verbose_link_cmd`; do
--    case $p in
--
--    -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" \
--	  || test $p = "-R"; then
--	 prev=$p
--	 continue
--       else
--	 prev=
--       fi
--
--       if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
--	   # Internal compiler library paths should come after those
--	   # provided the user.  The postdeps already come after the
--	   # user supplied libs so there is no need to process them.
--	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
--	   fi
--	   ;;
--	 # The "-l" case would never come before the object being
--	 # linked, so don't bother handling this case.
--	 esac
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
--	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
--	 fi
--       fi
--       ;;
--
--    *.$objext)
--       # This assumes that the test object file only shows up
--       # once in the compiler output.
--       if test "$p" = "conftest.$objext"; then
--	 pre_test_object_deps_done=yes
--	 continue
--       fi
--
--       if test "$pre_test_object_deps_done" = no; then
--	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
--	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
--	 fi
--       fi
--       ;;
--
--    *) ;; # Ignore the rest.
--
--    esac
--  done
--
--  # Clean up.
--  rm -f a.out a.exe
--else
--  echo "libtool.m4: error: problem compiling $1 test program"
--fi
--
--$rm -f confest.$objext
--
--# PORTME: override above test on systems where it is broken
--ifelse([$1],[CXX],
--[case $host_os in
--interix3*)
--  # Interix 3.5 installs completely hosed .la files for C++, so rather than
--  # hack all around it, let's just trust "g++" to DTRT.
--  _LT_AC_TAGVAR(predep_objects,$1)=
--  _LT_AC_TAGVAR(postdep_objects,$1)=
--  _LT_AC_TAGVAR(postdeps,$1)=
--  ;;
--
--solaris*)
--  case $cc_basename in
--  CC*)
--    # Adding this requires a known-good setup of shared libraries for
--    # Sun compiler versions before 5.6, else PIC objects from an old
--    # archive will be linked into the output, leading to subtle bugs.
--    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
--    ;;
--  esac
--  ;;
--esac
--])
--
--case " $_LT_AC_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
--])# AC_LIBTOOL_POSTDEP_PREDEP
--
--# AC_LIBTOOL_LANG_F77_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
--
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="      program t\n      end\n"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
--
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
--
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
--  ;;
--aix4* | aix5*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--  ;;
--esac
--AC_MSG_RESULT([$enable_shared])
--
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
--
--_LT_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
--
--
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
--
--
--# AC_LIBTOOL_LANG_RC_CONFIG
--# -------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
--
--
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then create an initial libtool script
--# with a default configuration from the untagged config vars.  Otherwise
--# add code to config.status for appending the configuration named by
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # See if we are running on zsh, and set the options which allow our commands through
--  # without removal of \ escapes.
--  if test -n "${ZSH_VERSION+set}" ; then
--    setopt NO_GLOB_SUBST
--  fi
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    _LT_AC_TAGVAR(compiler, $1) \
--    _LT_AC_TAGVAR(CC, $1) \
--    _LT_AC_TAGVAR(LD, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
--    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
--    _LT_AC_TAGVAR(old_archive_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
--    _LT_AC_TAGVAR(predep_objects, $1) \
--    _LT_AC_TAGVAR(postdep_objects, $1) \
--    _LT_AC_TAGVAR(predeps, $1) \
--    _LT_AC_TAGVAR(postdeps, $1) \
--    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
--    _LT_AC_TAGVAR(archive_cmds, $1) \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(postinstall_cmds, $1) \
--    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
--    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
--    _LT_AC_TAGVAR(no_undefined_flag, $1) \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
--    _LT_AC_TAGVAR(hardcode_automatic, $1) \
--    _LT_AC_TAGVAR(module_cmds, $1) \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
--    _LT_AC_TAGVAR(exclude_expsyms, $1) \
--    _LT_AC_TAGVAR(include_expsyms, $1); do
--
--    case $var in
--    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(module_cmds, $1) | \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
--
--  case $lt_echo in
--  *'\[$]0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
--    ;;
--  esac
--
--ifelse([$1], [],
--  [cfgfile="${ofile}T"
--  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
--  $rm -f "$cfgfile"
--  AC_MSG_NOTICE([creating $ofile])],
--  [cfgfile="$ofile"])
--
--  cat <<__EOF__ >> "$cfgfile"
--ifelse([$1], [],
--[#! $SHELL
--
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# A sed program that does not truncate output.
--SED=$lt_SED
--
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--# The names of the tagged configurations supported by this script.
--available_tags=
--
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
--
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
--
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
--
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
--
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
--
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
--STRIP=$lt_STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS="$AS"
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
--
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
--
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
--
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
--
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
--
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
--
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
--
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
--
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
--
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
--
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
--
--__EOF__
--
--ifelse([$1],[], [
--  case $host_os in
--  aix3*)
--    cat <<\EOF >> "$cfgfile"
--
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
--fi
--EOF
--    ;;
--  esac
--
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
--
--  mv -f "$cfgfile" "$ofile" || \
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--])
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
--])# AC_LIBTOOL_CONFIG
--
--
--# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
--# -------------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--
--_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--
--if test "$GCC" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--
--  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
--    lt_cv_prog_compiler_rtti_exceptions,
--    [-fno-rtti -fno-exceptions], [],
--    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
--fi
--])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
--
--
--# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--# ---------------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
--[AC_REQUIRE([AC_CANONICAL_HOST])
--AC_REQUIRE([AC_PROG_NM])
--AC_REQUIRE([AC_OBJEXT])
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--AC_MSG_CHECKING([command to parse $NM output from $compiler object])
--AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
--[
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
--
--# Character class describing NM global symbol codes.
--symcode='[[BCDEGRST]]'
--
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
--
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
--
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[[BCDT]]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[[ABCDGISTW]]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDEGRST]]'
--  fi
--  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  ;;
--linux* | k*bsd*-gnu)
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDGIRSTW]]'
--    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  fi
--  ;;
--irix* | nonstopux*)
--  symcode='[[BCDEGRST]]'
--  ;;
--osf*)
--  symcode='[[BCDEGQRST]]'
--  ;;
--solaris*)
--  symcode='[[BDRT]]'
--  ;;
--sco3.2v5*)
--  symcode='[[DT]]'
--  ;;
--sysv4.2uw2*)
--  symcode='[[DT]]'
--  ;;
--sysv5* | sco5v6* | unixware* | OpenUNIX*)
--  symcode='[[ABDT]]'
--  ;;
--sysv4)
--  symcode='[[DFNSTU]]'
--  ;;
--esac
--
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $build_os in
--mingw*)
--  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
--  ;;
--esac
--
--# If we're using GNU nm, then use its standard symbol codes.
--case `$NM -V 2>&1` in
--*GNU* | *'with BFD'*)
--  symcode='[[ABCDGIRSTW]]' ;;
--esac
--
--# Try without a prefix undercore, then with it.
--for ac_symprfx in "" "_"; do
--
--  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
--  symxfrm="\\1 $ac_symprfx\\2 \\2"
--
--  # Write the raw and C identifiers.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
--
--  # Check to see that the pipe works correctly.
--  pipe_works=no
--
--  rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
--
--  if AC_TRY_EVAL(ac_compile); then
--    # Now try to grab the symbols.
--    nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
--      # Try sorting and uniquifying the output.
--      if sort "$nlist" | uniq > "$nlist"T; then
--	mv -f "$nlist"T "$nlist"
--      else
--	rm -f "$nlist"T
--      fi
--
--      # Make sure that we snagged all the symbols we need.
--      if grep ' nm_test_var$' "$nlist" >/dev/null; then
--	if grep ' nm_test_func$' "$nlist" >/dev/null; then
--	  cat <<EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
--
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
--#else
--# define lt_ptr_t char *
--# define const
--#endif
--
--/* The mapping between symbol names and symbols. */
--const struct {
--  const char *name;
--  lt_ptr_t address;
--}
--lt_preloaded_symbols[[]] =
--{
--EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr_t) 0}
--};
--
--#ifdef __cplusplus
--}
--#endif
--EOF
--	  # Now try linking the two files.
--	  mv conftest.$ac_objext conftstm.$ac_objext
--	  lt_save_LIBS="$LIBS"
--	  lt_save_CFLAGS="$CFLAGS"
--	  LIBS="conftstm.$ac_objext"
--	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
--	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
--	    pipe_works=yes
--	  fi
--	  LIBS="$lt_save_LIBS"
--	  CFLAGS="$lt_save_CFLAGS"
--	else
--	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
--	fi
--      else
--	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
--      fi
--    else
--      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
--    fi
--  else
--    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
--    cat conftest.$ac_ext >&5
--  fi
--  rm -f conftest* conftst*
--
--  # Do not use the global_symbol_pipe unless it works.
--  if test "$pipe_works" = yes; then
--    break
--  else
--    lt_cv_sys_global_symbol_pipe=
--  fi
--done
--])
--if test -z "$lt_cv_sys_global_symbol_pipe"; then
--  lt_cv_sys_global_symbol_to_cdecl=
--fi
--if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  AC_MSG_RESULT(failed)
--else
--  AC_MSG_RESULT(ok)
--fi
--]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--
--
--# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
--# ---------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
--[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
--
--AC_MSG_CHECKING([for $compiler option to produce PIC])
-- ifelse([$1],[CXX],[
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--
--    case $host_os in
--    aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    mingw* | os2* | pw32*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--    *djgpp*)
--      # DJGPP does not support shared libraries at all
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--      ;;
--    interix3*)
--      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
--      # Instead, we relocate shared libraries at runtime.
--      ;;
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--    hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case $host_cpu in
--      hppa*64*|ia64*)
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--  else
--    case $host_os in
--      aix4* | aix5*)
--	# All AIX code is PIC.
--	if test "$host_cpu" = ia64; then
--	  # AIX 5 now supports IA64 processor
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	else
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--	fi
--	;;
--      chorus*)
--	case $cc_basename in
--	cxch68*)
--	  # Green Hills C++ Compiler
--	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
--	  ;;
--	esac
--	;;
--       darwin*)
--         # PIC is the default on this platform
--         # Common symbols not allowed in MH_DYLIB files
--         case $cc_basename in
--           xlc*)
--           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
--           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--           ;;
--         esac
--       ;;
--      dgux*)
--	case $cc_basename in
--	  ec++*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  ghcx*)
--	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      freebsd* | dragonfly*)
--	# FreeBSD uses GNU C++
--	;;
--      hpux9* | hpux10* | hpux11*)
--	case $cc_basename in
--	  CC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    if test "$host_cpu" != ia64; then
--	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	    fi
--	    ;;
--	  aCC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    case $host_cpu in
--	    hppa*64*|ia64*)
--	      # +Z the default
--	      ;;
--	    *)
--	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	      ;;
--	    esac
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      interix*)
--	# This is c89, which is MS Visual C++ (no shared libs)
--	# Anyone wants to do a port?
--	;;
--      irix5* | irix6* | nonstopux*)
--	case $cc_basename in
--	  CC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    # CC pic flag -KPIC is the default.
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      linux* | k*bsd*-gnu)
--	case $cc_basename in
--	  KCC*)
--	    # KAI C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	    ;;
--	  icpc* | ecpc*)
--	    # Intel C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--	    ;;
--	  pgCC*)
--	    # Portland Group C++ compiler.
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  cxx*)
--	    # Compaq C++
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      lynxos*)
--	;;
--      m88k*)
--	;;
--      mvs*)
--	case $cc_basename in
--	  cxx*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      netbsd* | netbsdelf*-gnu)
--	;;
--      osf3* | osf4* | osf5*)
--	case $cc_basename in
--	  KCC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    ;;
--	  RCC*)
--	    # Rational C++ 2.4.1
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  cxx*)
--	    # Digital/Compaq C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      psos*)
--	;;
--      solaris*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.2, 5.x and Centerline C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--	    ;;
--	  gcx*)
--	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sunos4*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.x
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  lcc*)
--	    # Lucid
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      tandem*)
--	case $cc_basename in
--	  NCC*)
--	    # NonStop-UX NCC 3.20
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--	case $cc_basename in
--	  CC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	esac
--	;;
--      vxworks*)
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--	;;
--    esac
--  fi
--],
--[
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
--
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--
--    interix3*)
--      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
--      # Instead, we relocate shared libraries at runtime.
--      ;;
--
--    msdosdjgpp*)
--      # Just because we use GCC doesn't mean we suddenly get shared libraries
--      # on systems that don't support them.
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      enable_shared=no
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--
--    hpux*)
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case $host_cpu in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      else
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--      darwin*)
--        # PIC is the default on this platform
--        # Common symbols not allowed in MH_DYLIB files
--       case $cc_basename in
--         xlc*)
--         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
--         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--         ;;
--       esac
--       ;;
--
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--
--    hpux9* | hpux10* | hpux11*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
--      # not for PA HP-UX.
--      case $host_cpu in
--      hppa*64*|ia64*)
--	# +Z the default
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC (with -KPIC) is the default.
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    newsos6)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    linux* | k*bsd*-gnu)
--      case $cc_basename in
--      icc* | ecc*)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--        ;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
--        # Portland Group compilers (*not* the Pentium gcc compiler,
--	# which looks to be a dead project)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--        ;;
--      ccc*)
--        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--        # All Alpha code is PIC.
--        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--        ;;
--      esac
--      ;;
--
--    osf3* | osf4* | osf5*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # All OSF/1 code is PIC.
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    unicos*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--
--    uts4*)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--    esac
--  fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
--
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
--  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
--    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
--    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
--    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
--     "" | " "*) ;;
--     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
--     esac],
--    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
--fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--    ;;
--  *)
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
--    ;;
--esac
--
--#
--# Check to make sure the static flag actually works.
--#
--wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
--AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
--  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
--  $lt_tmp_static_flag,
--  [],
--  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
--])
--
--
--# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
--# ------------------------------------
--# See if the linker supports building shared libraries.
--AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--ifelse([$1],[CXX],[
--  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  case $host_os in
--  aix4* | aix5*)
--    # If we're using GNU nm, then we don't want the "-C" option.
--    # -C means demangle to AIX nm, but means don't demangle with GNU nm
--    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
--    else
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
--    fi
--    ;;
--  pw32*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
--  ;;
--  cygwin* | mingw*)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  linux* | k*bsd*-gnu)
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--  ;;
--  *)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  esac
--],[
--  runpath_var=
--  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
--  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--  _LT_AC_TAGVAR(archive_cmds, $1)=
--  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
--  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
--  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
--  _LT_AC_TAGVAR(module_cmds, $1)=
--  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
--  _LT_AC_TAGVAR(always_export_symbols, $1)=no
--  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  _LT_AC_TAGVAR(include_expsyms, $1)=
--  # exclude_expsyms can be an extended regexp of symbols to exclude
--  # it will be wrapped by ` (' and `)$', so one must not match beginning or
--  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
--  # as well as any symbol that contains `d'.
--  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
--  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
--  # platforms (ab)use it in PIC code, but their linkers get confused if
--  # the symbol is explicitly referenced.  Since portable code cannot
--  # rely on this symbol name, it's probably fine to never include it in
--  # preloaded symbol tables.
--  extract_expsyms_cmds=
--  # Just being paranoid about ensuring that cc_basename is set.
--  _LT_CC_BASENAME([$compiler])
--  case $host_os in
--  cygwin* | mingw* | pw32*)
--    # FIXME: the MSVC++ port hasn't been tested in a loooong time
--    # When not using gcc, we currently assume that we are using
--    # Microsoft Visual C++.
--    if test "$GCC" != yes; then
--      with_gnu_ld=no
--    fi
--    ;;
--  interix*)
--    # we just hope/assume this is gcc and not c89 (= MSVC++)
--    with_gnu_ld=yes
--    ;;
--  openbsd*)
--    with_gnu_ld=no
--    ;;
--  esac
--
--  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
--  if test "$with_gnu_ld" = yes; then
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    wlarc='${wl}'
--
--    # Set some defaults for GNU ld with shared library support. These
--    # are reset later if shared libraries are not supported. Putting them
--    # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
--      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--      *\ 2.11.*) ;; # other 2.11 versions
--      *) supports_anon_versioning=yes ;;
--    esac
--
--    # See if GNU ld supports shared libraries.
--    case $host_os in
--    aix3* | aix4* | aix5*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<EOF 1>&2
--
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
--
--EOF
--      fi
--      ;;
--
--    amigaos*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--
--      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--      # as there is no search path for DLLs.
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_TAGVAR(always_export_symbols, $1)=no
--      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
--
--      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	  cp $export_symbols $output_objdir/$soname.def;
--	else
--	  echo EXPORTS > $output_objdir/$soname.def;
--	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    interix3*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      ;;
--
--    linux* | k*bsd*-gnu)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	tmp_addflag=
--	case $cc_basename,$host_cpu in
--	pgcc*)				# Portland Group C compiler
--	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag'
--	  ;;
--	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
--	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag -Mnomain' ;;
--	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
--	  tmp_addflag=' -i_dynamic' ;;
--	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
--	  tmp_addflag=' -i_dynamic -nofor_main' ;;
--	ifc* | ifort*)			# Intel Fortran compiler
--	  tmp_addflag=' -nofor_main' ;;
--	esac
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
--	if test $supports_anon_versioning = yes; then
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--  $echo "local: *; };" >> $output_objdir/$libname.ver~
--	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	fi
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    netbsd* | netbsdelf*-gnu)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      fi
--      ;;
--
--    solaris*)
--      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<EOF 1>&2
--
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
--
--*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
--*** reliably create shared libraries on SCO systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--_LT_EOF
--	;;
--	*)
--	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
--	  else
--	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	  fi
--	;;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
--      runpath_var=
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
--      # Note: this linker hardcodes the directories in LIBPATH if there
--      # are no directories specified by -L.
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
--      fi
--      ;;
--
--    aix4* | aix5*)
--      if test "$host_cpu" = ia64; then
--	# On IA64, the linker does run time linking by default, so we don't
--	# have to do anything special.
--	aix_use_runtimelinking=no
--	exp_sym_flag='-Bexport'
--	no_entry_flag=""
--      else
--	# If we're using GNU nm, then we don't want the "-C" option.
--	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
--	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
--	else
--	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
--	fi
--	aix_use_runtimelinking=no
--
--	# Test if we are trying to use run time linking or normal
--	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
--	# need to do runtime linking.
--	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--	  for ld_flag in $LDFLAGS; do
--  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
--  	    aix_use_runtimelinking=yes
--  	    break
--  	  fi
--	  done
--	  ;;
--	esac
--
--	exp_sym_flag='-bexport'
--	no_entry_flag='-bnoentry'
--      fi
--
--      # When large executables or shared objects are built, AIX ld can
--      # have problems creating the table of contents.  If linking a library
--      # or program results in "error TOC overflow" add -mminimal-toc to
--      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
--      _LT_AC_TAGVAR(archive_cmds, $1)=''
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--      if test "$GCC" = yes; then
--	case $host_os in aix4.[[012]]|aix4.[[012]].*)
--	# We only want to do this on AIX 4.2 and lower, the check
--	# below for broken collect2 doesn't work under 4.3+
--	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" && \
--  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
--	  then
--  	  # We have reworked collect2
--  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	  else
--  	  # We have old collect2
--  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
--  	  # It fails to find uninstalled libraries when the uninstalled
--  	  # path is not listed in the libpath.  Setting hardcode_minus_L
--  	  # to unsupported forces relinking
--  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--	  fi
--	  ;;
--	esac
--	shared_flag='-shared'
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag="$shared_flag "'${wl}-G'
--	fi
--      else
--	# not using gcc
--	if test "$host_cpu" = ia64; then
--  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--  	# chokes on -Wl,-G. The following line is correct:
--	  shared_flag='-G'
--	else
--	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag='${wl}-G'
--	  else
--	    shared_flag='${wl}-bM:SRE'
--	  fi
--	fi
--      fi
--
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
--      if test "$aix_use_runtimelinking" = yes; then
--	# Warning - without using the other runtime loading flags (-brtl),
--	# -berok will link without error, but may produce a broken library.
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       _LT_AC_SYS_LIBPATH_AIX
--       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--       else
--	if test "$host_cpu" = ia64; then
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--	else
--	 # Determine the default libpath from the value encoded in an empty executable.
--	 _LT_AC_SYS_LIBPATH_AIX
--	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--	fi
--      fi
--      ;;
--
--    amigaos*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      # see comment about different semantics on the GNU ld section
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    bsdi[[45]]*)
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
--      ;;
--
--    cygwin* | mingw* | pw32*)
--      # When not using gcc, we currently assume that we are using
--      # Microsoft Visual C++.
--      # hardcode_libdir_flag_spec is actually meaningless, as there is
--      # no search path for DLLs.
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      ;;
--
--    darwin* | rhapsody*)
--      case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--      esac
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--    if test "$GCC" = yes ; then
--    	output_verbose_link_cmd='echo'
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         _LT_AC_TAGVAR(ld_shlibs, $1)=no
--          ;;
--      esac
--    fi
--      ;;
--
--    dgux*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    freebsd1*)
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--    # support.  Future versions do this automatically, but an explicit c++rt0.o
--    # does not break anything, and helps significantly (at the cost of a little
--    # extra space).
--    freebsd2.2*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | dragonfly*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    hpux9*)
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      ;;
--
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      fi
--      ;;
--
--    hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      else
--	case $host_cpu in
--	hppa*64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  ;;
--	esac
--      fi
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    netbsd* | netbsdelf*-gnu)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    newsos6)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    openbsd*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      else
--       case $host_os in
--	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	   ;;
--	 *)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	   ;;
--       esac
--      fi
--      ;;
--
--    os2*)
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
--
--    osf3*)
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      else
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
--	# Both c and cxx compiler support -rpath directly
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    solaris*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      case $host_os in
--      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- 	esac ;;
--      esac
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    sunos4*)
--      if test "x$host_vendor" = xsequent; then
--	# Use $CC to link under sequent, because it throws in some extra .o
--	# files that make .init and .fini sections work.
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4)
--      case $host_vendor in
--	sni)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--        ;;
--	motorola)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4.3*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--      fi
--      ;;
--
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    sysv5* | sco3.2v5* | sco5v6*)
--      # Note: We can NOT use -z defs as we might desire, because we do not
--      # link with -lc, and that would cause any symbols used from libc to
--      # always be unresolved, which means just about no library would
--      # ever link correctly.  If we're not using GNU ld we use -z text
--      # though, which does catch some bad symbols but isn't as heavy-handed
--      # as -z defs.
--      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    uts4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    esac
--  fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--#
--# Do we need to explicitly link libc?
--#
--case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
--x|xyes)
--  # Assume -lc should be added
--  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $_LT_AC_TAGVAR(archive_cmds, $1) in
--    *'~'*)
--      # FIXME: we may have to deal with multi-command sequences.
--      ;;
--    '$CC '*)
--      # Test whether the compiler implicitly links with -lc since on some
--      # systems, -lgcc has to come before -lc. If gcc already passes -lc
--      # to ld, don't add -lc before -lgcc.
--      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
--	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
--        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
--        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
--        then
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--        else
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--        fi
--        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
--      ;;
--    esac
--  fi
--  ;;
--esac
--])# AC_LIBTOOL_PROG_LD_SHLIBS
--
--
--# _LT_AC_FILE_LTDLL_C
--# -------------------
--# Be careful that the start marker always follows a newline.
--AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# #  ifdef __CYGWIN32__
--# #    define __CYGWIN__ __CYGWIN32__
--# #  endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--#   __hDllInstance_base = hInst;
--#   return TRUE;
--# }
--# /* ltdll.c ends here */
--])# _LT_AC_FILE_LTDLL_C
--
--
--# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
--# ---------------------------------
--AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
--
--
--# old names
--AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
--AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
--AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
--AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
--AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
--
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
--
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
--  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--  AC_SUBST(GCJFLAGS)
--])
--
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
--
--############################################################
--# NOTE: This macro has been submitted for inclusion into   #
--#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
--#  a released version of Autoconf we should remove this    #
--#  macro and use it instead.                               #
--############################################################
--# LT_AC_PROG_SED
--# --------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--AC_DEFUN([LT_AC_PROG_SED],
--[AC_MSG_CHECKING([for a sed that does not truncate output])
--AC_CACHE_VAL(lt_cv_path_SED,
--[# Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for lt_ac_prog in sed gsed; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
--        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
--      fi
--    done
--  done
--done
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && continue
--  cat /dev/null > conftest.in
--  lt_ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--  # Check for GNU sed and select it if it is found.
--  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
--    lt_cv_path_SED=$lt_ac_sed
--    break
--  fi
--  while true; do
--    cat conftest.in conftest.in >conftest.tmp
--    mv conftest.tmp conftest.in
--    cp conftest.in conftest.nl
--    echo >>conftest.nl
--    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
--    cmp -s conftest.out conftest.nl || break
--    # 10000 chars as input seems more than enough
--    test $lt_ac_count -gt 10 && break
--    lt_ac_count=`expr $lt_ac_count + 1`
--    if test $lt_ac_count -gt $lt_ac_max; then
--      lt_ac_max=$lt_ac_count
--      lt_cv_path_SED=$lt_ac_sed
--    fi
--  done
--done
--])
--SED=$lt_cv_path_SED
--AC_MSG_RESULT([$SED])
--])
--
--dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
--dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
--dnl also defines GSTUFF_PKG_ERRORS on error
--AC_DEFUN([PKG_CHECK_MODULES], [
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--  fi
--
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        AC_MSG_CHECKING(for $2)
--
--        if $PKG_CONFIG --exists "$2" ; then
--            AC_MSG_RESULT(yes)
--            succeeded=yes
--
--            AC_MSG_CHECKING($1_CFLAGS)
--            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
--            AC_MSG_RESULT($$1_CFLAGS)
--
--            AC_MSG_CHECKING($1_LIBS)
--            $1_LIBS=`$PKG_CONFIG --libs "$2"`
--            AC_MSG_RESULT($$1_LIBS)
--        else
--            $1_CFLAGS=""
--            $1_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but 
--            ## do set a variable so people can do so.
--            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
--            ifelse([$4], ,echo $$1_PKG_ERRORS,)
--        fi
--
--        AC_SUBST($1_CFLAGS)
--        AC_SUBST($1_LIBS)
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     ifelse([$3], , :, [$3])
--  else
--     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
--  fi
--])
--
--
-diff --git a/aclocal.m4 b/aclocal.m4
-deleted file mode 100644
-index 0e90944..0000000
---- a/aclocal.m4
-+++ b/dev/null
-@@ -1,892 +0,0 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--# PARTICULAR PURPOSE.
--
--# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
--
--# AM_SET_CURRENT_AUTOMAKE_VERSION
--# -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
--AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.6])])
--
--# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
--
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
--#
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory.  The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run.  This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
--#
--# $ac_aux_dir/missing
--#    fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--#    fails if $ac_aux_dir is absolute,
--#    fails when called from a subdirectory in a VPATH build with
--#          a relative $ac_aux_dir
--#
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir.  In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
--#
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
--#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--#   MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
--#
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH.  The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
--
--AC_DEFUN([AM_AUX_DIR_EXPAND],
--[dnl Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])dnl
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`cd $ac_aux_dir && pwd`
--])
--
--# AM_CONDITIONAL                                            -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 7
--
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
--	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([[conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.]])
--fi])])
--
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--# _AM_DEPENDENCIES(NAME)
--# ----------------------
--# See how the compiler implements dependency checking.
--# NAME is "CC", "CXX", "GCJ", or "OBJC".
--# We try a few techniques and use that to set a single cache variable.
--#
--# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
--# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
--# dependency, and given that the user is not expected to run this macro,
--# just rely on AC_PROG_CC.
--AC_DEFUN([_AM_DEPENDENCIES],
--[AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--AC_REQUIRE([AM_MAKE_INCLUDE])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
--
--ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
--       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
--       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
--       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
--                   [depcc="$$1"   am_compiler_list=])
--
--AC_CACHE_CHECK([dependency style of $depcc],
--               [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--  # We will build objects and dependencies in a subdirectory because
--  # it helps to detect inapplicable dependency modes.  For instance
--  # both Tru64's cc and ICC support -MD to output dependencies as a
--  # side effect of compilation, but ICC will put the dependencies in
--  # the current directory while Tru64 will put them in the object
--  # directory.
--  mkdir sub
--
--  am_cv_$1_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
--  fi
--  for depmode in $am_compiler_list; do
--    # Setup a source with many dependencies, because some compilers
--    # like to wrap large dependency lists on column 80 (with \), and
--    # we should not choose a depcomp mode which is confused by this.
--    #
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    : > sub/conftest.c
--    for i in 1 2 3 4 5 6; do
--      echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
--    done
--    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
--    case $depmode in
--    nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    none) break ;;
--    esac
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.
--    if depmode=$depmode \
--       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
--       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
--         >/dev/null 2>conftest.err &&
--       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      # icc doesn't choke on unknown options, it will just issue warnings
--      # or remarks (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored or not supported.
--      # When given -MP, icc 7.0 and 7.1 complain thusly:
--      #   icc: Command line warning: ignoring option '-M'; no argument required
--      # The diagnosis changed in icc 8.0:
--      #   icc: Command line remark: option '-MP' not supported
--      if (grep 'ignoring option' conftest.err ||
--          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--        am_cv_$1_dependencies_compiler_type=$depmode
--        break
--      fi
--    fi
--  done
--
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
--  test "x$enable_dependency_tracking" != xno \
--  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
--])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
--
--
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
--  am_depcomp="$ac_aux_dir/depcomp"
--  AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
--])
--
--# Generate code to set up dependency tracking.              -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--#serial 3
--
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
--  # Strip MF so we end up with the name of the file.
--  mf=`echo "$mf" | sed -e 's/:.*$//'`
--  # Check whether this is an Automake generated Makefile or not.
--  # We used to match only the files named `Makefile.in', but
--  # some people rename them; so instead we look at the file content.
--  # Grep'ing the first line is not enough: some people post-process
--  # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`AS_DIRNAME("$mf")`
--  else
--    continue
--  fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`AS_DIRNAME(["$file"])`
--    AS_MKDIR_P([$dirpart/$fdir])
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
--  done
--done
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--
--
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled.  FIXME.  This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
--     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
--     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
--
--# Do all the work for Automake.                             -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 12
--
--# This macro actually does too much.  Some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out.  PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition.  After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
--dnl Autoconf wants to disallow AM_ names.  We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
--  if (cygpath --version) >/dev/null 2>/dev/null; then
--    CYGPATH_W='cygpath -w'
--  else
--    CYGPATH_W=echo
--  fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
--              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
--	      		     [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--])
--
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated.  The stamp files are numbered to have different names.
--
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_stamp_count=1
--for _am_header in $config_headers :; do
--  case $_am_header in
--    $1 | $1:* )
--      break ;;
--    * )
--      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
--  esac
--done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
--
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
--
--# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
--
--# Check whether the underlying file-system supports filenames
--# with a leading dot.  For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
--  am__leading_dot=.
--else
--  am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
--
--# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
--# From Jim Meyering
--
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode  enable make rules and dependencies not useful
--			  (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
--  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
--
--# Check to see how 'make' treats includes.	            -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 3
--
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
--	@echo done
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
--   echo '.include "confinc"' > confmf
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote="\""
--      _am_result=BSD
--   fi
--fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
--
--# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
--
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
--  am_missing_run="$MISSING --run "
--else
--  am_missing_run=
--  AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
--
--# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_MKDIR_P
--# ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake.  There are at least two reasons why we must not
--# use `-m 0755':
--#   - it causes special bits like SGID to be ignored,
--#   - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out.  Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
--AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
--AC_SUBST([mkdir_p])])
--
--# Helper functions for option handling.                     -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 3
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME.  Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
--
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
--
--# Check to make sure that the build environment is sane.    -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
--   if test "$[*]" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$[*]" != "X $srcdir/configure conftest.file" \
--      && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
--
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries.  This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
--  AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
--
--# Check how to create a tarball.                            -*- Autoconf -*-
--
--# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 2
--
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--#     tardir=directory && $(am__tar) > result.tar
--#
--# Substitute a variable $(am__untar) that extract such
--# a tarball read from stdin.
--#     $(am__untar) < result.tar
--AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
--     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
--     [m4_case([$1], [ustar],, [pax],,
--              [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
--  case $_am_tool in
--  gnutar)
--    for _am_tar in tar gnutar gtar;
--    do
--      AM_RUN_LOG([$_am_tar --version]) && break
--    done
--    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
--    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
--    am__untar="$_am_tar -xf -"
--    ;;
--  plaintar)
--    # Must skip GNU tar: if it does not support --format= it doesn't create
--    # ustar tarball either.
--    (tar --version) >/dev/null 2>&1 && continue
--    am__tar='tar chf - "$$tardir"'
--    am__tar_='tar chf - "$tardir"'
--    am__untar='tar xf -'
--    ;;
--  pax)
--    am__tar='pax -L -x $1 -w "$$tardir"'
--    am__tar_='pax -L -x $1 -w "$tardir"'
--    am__untar='pax -r'
--    ;;
--  cpio)
--    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
--    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
--    am__untar='cpio -i -H $1 -d'
--    ;;
--  none)
--    am__tar=false
--    am__tar_=false
--    am__untar=false
--    ;;
--  esac
--
--  # If the value was cached, stop now.  We just wanted to have am__tar
--  # and am__untar set.
--  test -n "${am_cv_prog_tar_$1}" && break
--
--  # tar/untar a dummy directory, and stop if the command works
--  rm -rf conftest.dir
--  mkdir conftest.dir
--  echo GrepMe > conftest.dir/file
--  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
--  rm -rf conftest.dir
--  if test -s conftest.tar; then
--    AM_RUN_LOG([$am__untar <conftest.tar])
--    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
--  fi
--done
--rm -rf conftest.dir
--
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
--AC_SUBST([am__tar])
--AC_SUBST([am__untar])
--]) # _AM_PROG_TAR
--
--m4_include([acinclude.m4])
-diff --git a/config.h.in b/config.h.in
-index 626a392..78d8bb0 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,5 +1,8 @@
- /* config.h.in.  Generated from configure.in by autoheader.  */
- 
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
- /* Define to 1 if you have the <Carbon/Carbon.h> header file. */
- #undef HAVE_CARBON_CARBON_H
- 
-@@ -68,9 +71,6 @@
- /* Defines if your system has the fontconfig and freetype libraries */
- #undef HAVE_KARBONTEXT
- 
--/* Define to 1 if you have the <kspell2/broker.h> header file. */
--#undef HAVE_KSPELL2_BROKER_H
--
- /* Defines if your system has the libart library */
- #undef HAVE_LIBART
- 
-@@ -89,6 +89,9 @@
- /* Define if you have libtiff */
- #undef HAVE_LIBTIFF
- 
-+/* Defines if your system has libpwd greater than or equal to v0.9.0 */
-+#undef HAVE_LIBWPD_090
-+
- /* Define if you have libz */
- #undef HAVE_LIBZ
- 
-@@ -150,6 +153,9 @@
- /* Define to 1 if you have the `rewinddir' function. */
- #undef HAVE_REWINDDIR
- 
-+/* Defines if your system has Ruby 1.9.x */
-+#undef HAVE_RUBY_1_9
-+
- /* Define if you have a STL implementation by SGI */
- #undef HAVE_SGI_STL
- 
-@@ -200,6 +206,9 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
- 
-+/* Define to 1 if you have the <tdespell2/broker.h> header file. */
-+#undef HAVE_TDESPELL2_BROKER_H
-+
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-@@ -227,6 +236,10 @@
- /* The correct header */
- #undef LCMS_HEADER
- 
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
- /* Name of package */
- #undef PACKAGE
- 
-@@ -242,6 +255,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
-@@ -275,9 +291,17 @@
- /* Defined if compiling without arts */
- #undef WITHOUT_ARTS
- 
--/* Define to 1 if your processor stores words with the most significant byte
--   first (like Motorola and SPARC, unlike Intel and VAX). */
--#undef WORDS_BIGENDIAN
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+#  undef WORDS_BIGENDIAN
-+# endif
-+#endif
- 
- /* Defines the executable of xmllint */
- #undef XMLLINT
-@@ -311,6 +335,11 @@
- #endif
- 
- 
-+/* Enable large inode numbers on Mac OS X 10.5.  */
-+#ifndef _DARWIN_USE_64_BIT_INODE
-+# define _DARWIN_USE_64_BIT_INODE 1
-+#endif
-+
- /* Number of bits in a file offset, on hosts where this is settable. */
- #undef _FILE_OFFSET_BITS
- 
-@@ -379,6 +408,9 @@
- #endif
- 
- 
-+/* define to 1 if -fvisibility is supported */
-+#undef __KDE_HAVE_GCC_VISIBILITY
-+
- 
- #if defined(__SVR4) && !defined(__svr4__)
- #define __svr4__ 1
-diff --git a/configure.files b/configure.files
-index 635634e..e0bbb6e 100644
---- a/configure.files
-+++ b/configure.files
-@@ -1,5 +1,9 @@
- ./admin/configure.in.min
- configure.in.in
-+./chalk/configure.in.bot
-+./chalk/configure.in.in
-+./chalk/plugins/configure.in.in
-+./chalk/plugins/viewplugins/imagesize/configure.in.in
- ./example/configure.in.in
- ./filters/configure.in.mid
- ./filters/chalk/configure.in.in
-@@ -31,10 +35,6 @@ configure.in.in
- ./kexi/plugins/macros/configure.in.in
- ./kivio/configure.in.in
- ./kpresenter/configure.in.in
--./chalk/configure.in.bot
--./chalk/configure.in.in
--./chalk/plugins/configure.in.in
--./chalk/plugins/viewplugins/imagesize/configure.in.in
- ./kspread/plugins/calculator/configure.in.in
- ./kword/mailmerge/configure.in.in
- ./lib/configure.in.in
-diff --git a/configure.in b/configure.in
-deleted file mode 100644
-index 92ca35d..0000000
---- a/configure.in
-+++ b/dev/null
-@@ -1,2701 +0,0 @@
--dnl =======================================================
--dnl FILE: ./admin/configure.in.min
--dnl =======================================================
--
--dnl    This file is part of the KDE libraries/packages
--dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
-- 
--dnl    This file is free software; you can redistribute it and/or
--dnl    modify it under the terms of the GNU Library General Public
--dnl    License as published by the Free Software Foundation; either
--dnl    version 2 of the License, or (at your option) any later version.
-- 
--dnl    This library is distributed in the hope that it will be useful,
--dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
--dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--dnl    Library General Public License for more details.
-- 
--dnl    You should have received a copy of the GNU Library General Public License
--dnl    along with this library; see the file COPYING.LIB.  If not, write to
--dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--dnl    Boston, MA 02110-1301, USA.
--
--# Original Author was Kalle@kde.org
--# I lifted it in some mater. (Stephan Kulow)
--# I used much code from Janos Farkas
--
--dnl Process this file with autoconf to produce a configure script.
--
--AC_INIT(acinclude.m4) dnl a source file from your sub dir
--
--dnl This is so we can use kde-common
--AC_CONFIG_AUX_DIR(admin)
--
--dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
--unset CDPATH
--
--dnl Checking host/target/build systems, for make, install etc.
--AC_CANONICAL_SYSTEM 
--dnl Perform program name transformation
--AC_ARG_PROGRAM
--
--dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(koffice, "1.6.3") dnl searches for some needed programs
--
--AM_MAINTAINER_MODE
--
--KDE_SET_PREFIX
--
--dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
--
--dnl Checks for programs.
--AC_CHECK_COMPILERS
--AC_ENABLE_SHARED(yes)
--AC_ENABLE_STATIC(no)
--KDE_PROG_LIBTOOL
--
--dnl for NLS support. Call them in this order!
--dnl WITH_NLS is for the po files
--AM_KDE_WITH_NLS
--
--KDE_USE_QT(3.3)
--AC_PATH_KDE
--dnl =======================================================
--dnl FILE: configure.in.in
--dnl =======================================================
--
--#MIN_CONFIG(3.3)
--
--# Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h
--dnl PACKAGE set before
--
--CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
--
--AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h)
--AC_C_BIGENDIAN
--AC_CHECK_KDEMAXPATHLEN
--
--KDE_INIT_DOXYGEN([The KOffice API Reference], [Version $VERSION])
--
--# Check for GraphicsMagick...
--
--have_graphicsmagick=no
--KDE_FIND_PATH(GraphicsMagick-config, GRAPHICS_MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find GraphicsMagick anywhere, check http://www.graphicsmagick.org/ for GraphicsMagick >= 1.1.7.])
--])
--
--if test -n "$GRAPHICS_MAGICK_CONFIG"; then
-- vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1001007;  then
--     LIBGMAGICK_LIBS="`$GRAPHICS_MAGICK_CONFIG --libs`"
--     LIBGMAGICK_LDFLAGS="`$GRAPHICS_MAGICK_CONFIG --ldflags`"
--     LIBGMAGICK_RPATH=
--     for args in $LIBGMAGICK_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBGMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBGMAGICK_RPATH=`echo $LIBGMAGICK_RPATH | $SED -e "s/-L/-R/g"`
--     LIBGMAGICK_CPPFLAGS="`$GRAPHICS_MAGICK_CONFIG --cppflags`"
--     AC_DEFINE(HAVE_GMAGICK,1, [GraphicsMagick is available])
--     have_graphicsmagick=yes
--  else
--     AC_MSG_WARN([You need at least GraphicsMagick 1.1.7])
--  fi
--
--fi
--
--if test ! "$USE_RPATH" = "yes"; then
--    LIBGMAGICK_RPATH=
--fi
--
--AC_SUBST(LIBGMAGICK_LIBS)
--AC_SUBST(LIBGMAGICK_LDFLAGS)
--AC_SUBST(LIBGMAGICK_CPPFLAGS)
--AC_SUBST(LIBGMAGICK_RPATH)
--AM_CONDITIONAL(include_graphicsmagick_filter, test "$have_graphicsmagick" = "yes" -a HAVE_GMAGICK)
--
--# End of GraphicsMagick check
--
--# Check for ImageMagick...
--
--have_imagemagick=no
--KDE_FIND_PATH(Magick-config, MAGICK_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2.])
--])
--
--if test -n "$MAGICK_CONFIG"; then
--  vers=`$MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 5005002 
--  then
--     if test "$vers" -ge 6000003
--     then
--        AC_DEFINE(HAVE_MAGICK6, 1, [ImageMagick Version 6])
--     fi
--     if test "$vers" -ge 6001000
--     then
--        AC_DEFINE(HAVE_MAGICK61, 1, [ImageMagick Version 6.1])
--     fi
--     LIBMAGICK_LIBS="`$MAGICK_CONFIG --libs`"
--     LIBMAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags`"
--     LIBMAGICK_RPATH=
--     for args in $LIBMAGICK_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBMAGICK_RPATH="$LIBMAGICK_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"`
--     LIBMAGICK_CPPFLAGS="`$MAGICK_CONFIG --cppflags`"
--     AC_DEFINE(HAVE_MAGICK,1, [ImageMagick is available])
--     have_imagemagick=yes
--  else
--     AC_MSG_WARN([You need at least ImageMagick 5.5.2])
--  fi
--fi
--
--if test ! "$USE_RPATH" = "yes"; then
--    LIBMAGICK_RPATH=
--fi
--
--AC_SUBST(LIBMAGICK_LIBS)
--AC_SUBST(LIBMAGICK_LDFLAGS)
--AC_SUBST(LIBMAGICK_CPPFLAGS)
--AC_SUBST(LIBMAGICK_RPATH)
--AM_CONDITIONAL(include_imagemagick_filter, test "$have_imagemagick" = "yes" -a HAVE_MAGICK61 -a ! "$have_graphicsmagick" = "yes" -a ! HAVE_GMAGICK)
--
--# End of ImageMagick check
--
--##########################################################################
--# This last check is copied from kdenonbeta/gsf/configure.in.in
--##########################################################################
--# KOFFICE_PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
--# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
--# also defines GSTUFF_PKG_ERRORS on error
--# Note: This is specially tweaked for karbon's fontconfig check. Please fix
--# it before using it for other tests :-)
--AC_DEFUN([KOFFICE_PKG_CHECK_MODULES], [
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--  fi
--
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--     echo "***"
--     echo "*** Due to that we can't perform the check for fontconfig..."    # added for karbon (Werner)
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        AC_MSG_CHECKING(for $2)
--
--        if $PKG_CONFIG --exists "$2" ; then
--            AC_MSG_RESULT(yes)
--            succeeded=yes
--
--            AC_MSG_CHECKING($1_CFLAGS)
--            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
--            AC_MSG_RESULT($$1_CFLAGS)
--
--            AC_MSG_CHECKING($1_LIBS)
--            $1_LIBS=`$PKG_CONFIG --libs "$2"`
--            AC_MSG_RESULT($$1_LIBS)
--        else
--            $1_CFLAGS=""
--            $1_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but 
--            ## do set a variable so people can do so.
--            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
--            ifelse([$4], ,echo $$1_PKG_ERRORS,)
--        fi
--
--        AC_SUBST($1_CFLAGS)
--        AC_SUBST($1_LIBS)
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     ifelse([$3], , :, [$3])
--#  else                           # removed for karbon (Werner)
--#    ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
--  fi
--])
--
--# --- Check for KDE 3.2 or 3.3 ---
--
--AC_MSG_CHECKING([for KDE version])
--
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--kdeversion_save_CXXFLAGS="$CXXFLAGS"
--kdeversion_safe_LIBS="$LIBS"
--LIBS="$LIBS $X_EXTRA_LIBS"
--CXXFLAGS="$CXXFLAGS $all_includes"
--
--AC_COMPILE_IFELSE([
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
--#error KDE 3.2
--#endif
--],
--	need_trinity2_compat="no"
--,
--	need_trinity2_compat="yes"
--)
--
--AC_COMPILE_IFELSE([
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
--#error KDE 3.3
--#endif
--],
--	need_trinity3_compat="no"
--,
--	need_trinity3_compat="yes"
--)
--
--AC_COMPILE_IFELSE([
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
--#error KDE 3.4
--#endif
--],
--	need_trinity4_compat="no"
--,
--	need_trinity4_compat="yes"
--)
--
--AC_COMPILE_IFELSE([
--#include <kdeversion.h>
--#if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
--#error KDE 3.5.x (x < 2)
--#endif
--],
--	need_trinity51_compat="no"
--,
--	need_trinity51_compat="yes"
--)
--CXXFLAGS="$kdeversion_save_CXXFLAGS"
--LIBS="$kdeversion_safe_LIBS"
--AC_LANG_RESTORE
--
--if test "$need_trinity2_compat" = "yes"; then
--	AC_MSG_RESULT([KDE 3.2.x])
--else
--	if test "$need_trinity3_compat" = "yes"; then
--		AC_MSG_RESULT([KDE 3.3.x])
--	else 
--		if test "$need_trinity4_compat" = "yes"; then
--			AC_MSG_RESULT([KDE 3.4.x])
--                else
--                        if test "$need_trinity51_compat" = "yes"; then
--                                AC_MSG_RESULT([KDE 3.5.x (x < 2)])
--                        else
--			        AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
--                        fi
--		fi
--	fi
--fi
--
--AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
--AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
--AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes")
--AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes")
--
--# Keep the old KDE 3.1 test, as long as it is still used
--AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no")
--
--# --- End KDE 3.2 check ---
--
--# --- OpenEXR check ---
--
--KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find pkg-config])
--])
--
--AC_MSG_CHECKING([for OpenEXR])
--
--if test -n "$PKGCONFIG"; then
--  vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
--  if test -n "$vers"
--  then
--     OPENEXR_LIBS="`$PKGCONFIG OpenEXR --libs`"
--     OPENEXR_RPATH=
--     for args in $OPENEXR_LIBS; do
--          case $args in
--            -L*)
--               OPENEXR_RPATH="$OPENEXR_RPATH $args"
--               ;;
--          esac
--     done
--     OPENEXR_RPATH=`echo $OPENEXR_RPATH | $SED -e "s/-L/-R/g"`
--     OPENEXR_CFLAGS="`$PKGCONFIG OpenEXR --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_OPENEXR, 1, [Defines if your system has the OpenEXR library])
--  fi
--fi
--
--if test ! "$USE_RPATH" = "yes"; then
--    OPENEXR_RPATH=
--fi
--
--if test -n "$OPENEXR_LIBS"
--then
--  AC_MSG_RESULT([yes])
--else
--  AC_MSG_RESULT([not found])
--fi
--
--AC_SUBST(OPENEXR_LIBS)
--AC_SUBST(OPENEXR_CFLAGS)
--AC_SUBST(OPENEXR_RPATH)
--
--AM_CONDITIONAL(have_openexr, test -n "$OPENEXR_LIBS")
--
--# --- End of OpenEXR check ---
--dnl =======================================================
--dnl FILE: ./example/configure.in.in
--dnl =======================================================
--
--dnl This is here so that example isn't compiled and intalled by default.
--dnl Do NOT put this file in your application, if you want it compiled !
--
--DO_NOT_COMPILE="$DO_NOT_COMPILE example"
--dnl =======================================================
--dnl FILE: ./filters/chalk/configure.in.in
--dnl =======================================================
--
--# Check if the tiff lib is available
--AC_FIND_TIFF
--AM_CONDITIONAL(have_tiff, test -n "$LIBTIFF")
--
--AC_FIND_PNG
--AM_CONDITIONAL(have_png, test -n "$LIBPNG")
--
--AC_FIND_JPEG
--AM_CONDITIONAL(have_jpeg, test -n "$LIBJPEG")
--
--#---------------------------------------------------------
--# libexif detection
--# taken from libkexif's configure.in.in
--#---------------------------------------------------------
--
--LIBEXIF=no
--
--#PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.7, ,
--#        [ AC_MSG_WARN([libexif >= 0.5.7 not found.])
--#          LIBEXIF=yes ])
--
--
--#PKG_CHECK_MODULES(LIBEXIF06, libexif >= 0.6.9,
--#        AC_DEFINE(HAVE_EXIF06,1,[check for libexif > 0.6]),
--#                AC_MSG_WARN([Using old version of libexif.]))
--
--PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.12 , ,
--        [ AC_MSG_WARN([libexif >= 0.6.12 not found.])
--          LIBEXIF=yes ])
--
--AC_SUBST(LIBEXIF_LIBS)
--AC_SUBST(LIBEXIF_CFLAGS)
--
--#---------------------------------------------------------
--# libexif detection
--#---------------------------------------------------------
--AC_MSG_CHECKING([if C++ program with exif can be compiled])
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
--AC_CACHE_VAL(exif_build,
--[
--    AC_TRY_COMPILE([
--    extern "C" {
--#include <libexif/exif-loader.h>
--#include <libexif/exif-utils.h>
--}
--    ],[
--        ExifLoader *l = exif_loader_new ();
--        exif_loader_write_file (l,"kikoo");
--        return 0;
--    ], exif_build=yes,
--    exif_build=no)
--])
--AC_MSG_RESULT($exif_build)
--if test "$exif_build" = "no"; then
--    LIBEXIF=""
--fi
--CXXFLAGS="$ac_save_CXXFLAGS"
--AC_LANG_RESTORE
--
--                
--AM_CONDITIONAL(have_exif, test -n "$LIBEXIF")
--AM_CONDITIONAL(include_jpeg_filter, test -n "$LIBJPEG" -a -n "$LIBEXIF")
--AM_CONDITIONAL(include_tiff_filter, test -n "$LIBTIFF" -a -n "$LIBEXIF")
--dnl =======================================================
--dnl FILE: ./filters/chalk/pdf/configure.in.in
--dnl =======================================================
--
--# Compile the pdf import filter only if Poppler is available
--PKG_CHECK_MODULES(POPPLER, poppler-tqt >= 0.5.1, have_poppler=yes, have_poppler=no)
--
--AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes) 
--dnl =======================================================
--dnl FILE: ./filters/kword/msword/configure.in.in
--dnl =======================================================
--
--AC_ARG_WITH(libwv2,AC_HELP_STRING([--with-libwv2=DIR],[use libwv2 in DIR]),[
--	if [ test "x$withval" != "xno" ]; then
--		if [ test "x$withval" != "xyes" ]; then
--			WV2_DIR=$withval
--		fi
--		search_for_wv2=yes
--	else
--		search_for_wv2=no
--	fi
--],[	search_for_wv2=yes
--])
--
--if [ test $search_for_wv2 != no ]; then
--	if [ test -n "$WV2_DIR" ]; then
--		KDE_FIND_PATH(wv2-config, WV2_CONFIG, [$WV2_DIR/bin], [
--		  AC_MSG_WARN([Could not find libwv2, check http://www.sourceforge.net/projects/wvware/])
--		])
--	else
--		KDE_FIND_PATH(wv2-config, WV2_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--		  AC_MSG_WARN([Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/])
--		])
--	fi
--fi
--
--if test -n "$WV2_CONFIG"; then
--  vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1009
--  then
--     LIBWV2_LIBS="`$WV2_CONFIG --libs`"
--     LIBWV2_RPATH=
--     for args in $LIBWV2_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBWV2_RPATH="$LIBWV2_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBWV2_RPATH=`echo $LIBWV2_RPATH | $SED -e "s/-L/-R/g"`
--     LIBWV2_CFLAGS="`$WV2_CONFIG --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_WV2, 1, [Defines if your system has the wv2 library])
--  else
--     AC_MSG_WARN([You need at least version 0.1.9 of libwv2])
--  fi
--fi
--
--
--AC_SUBST(LIBWV2_LIBS)
--AC_SUBST(LIBWV2_CFLAGS)
--AC_SUBST(LIBWV2_RPATH)
--AM_CONDITIONAL(include_wv2_msword_filter, test -n "$LIBWV2_LIBS")
--dnl =======================================================
--dnl FILE: ./filters/kword/pdf/xpdf/configure.in.in
--dnl =======================================================
--
--
--AC_HEADER_DIRENT
--AC_HEADER_STDC
--AC_CHECK_FUNCS(rewinddir popen mkstemp)
--
--dnl ##### Check for fseeko/ftello or fseek64/ftell64
--dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
--AC_SYS_LARGEFILE
--AC_FUNC_FSEEKO
--AC_CHECK_FUNCS(fseek64)
--AC_CHECK_FUNCS(ftell64)
--
--dnl ##### Check for libpaper (Debian).
--KDE_CHECK_HEADERS(paper.h)
--KDE_CHECK_LIB(paper, paperinit, [LIBPAPER="-lpaper"])
--AC_SUBST(LIBPAPER)
--dnl =======================================================
--dnl FILE: ./filters/kword/wordperfect/configure.in.in
--dnl =======================================================
--
--KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find pkg-config])
--])
--
--if test -n "$PKGCONFIG"; then
--  vers=`$PKGCONFIG libwpd-0.8 --modversion 2>/dev/null`
--  if test -n "$vers"
--  then
--     LIBWPD_LIBS="`$PKGCONFIG libwpd-0.8 --libs`"
--     LIBWPD_RPATH=
--     for args in $LIBWPD_LIBS; do
--          case $args in
--            -L*)
--               LIBWPD_RPATH="$LIBWPD_RPATH $args"
--               ;;
--          esac
--     done
--     LIBWPD_RPATH=`echo $LIBWPD_RPATH | $SED -e "s/-L/-R/g"`
--     LIBWPD_CFLAGS="`$PKGCONFIG libwpd-0.8 --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
--  fi
--fi
--
--
--AC_SUBST(LIBWPD_LIBS)
--AC_SUBST(LIBWPD_CFLAGS)
--AC_SUBST(LIBWPD_RPATH)
--
--AM_CONDITIONAL(include_wpd_filter, test -n "$LIBWPD_LIBS")
--
--dnl =======================================================
--dnl FILE: ./filters/xsltfilter/configure.in.in
--dnl =======================================================
--
--
--KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
--  HELP_SUBDIR=
--])
--
--if test -n "$XML_CONFIG"; then
--  vers=`$XML_CONFIG --version 2>/dev/null | $SED -e 's/libxml //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2004008
--  then
--     LIBXML_LIBS="`$XML_CONFIG --libs`"
--     LIBXML_RPATH=
--     for args in $LIBXML_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBXML_RPATH="$LIBXML_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBXML_RPATH=`echo $LIBXML_RPATH | $SED -e "s/-L/-R/g"`
--     LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
--
--     KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
--     AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint])
--  else
--     AC_MSG_WARN([You need at least libxml 2.4.8])
--     HELP_SUBDIR=
--  fi
--fi
--
--KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
--  HELP_SUBDIR=
--])
--
--if test -n "$XSLT_CONFIG"; then
--   vers=`$XSLT_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--   if test -n "$vers" && test "$vers" -ge 1000007; then
--     LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
--     LIBXSLT_RPATH=
--     for args in $LIBXSLT_LIBS; do
--       case $args in
--        -L*)
--  	  LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-- 	  ;;
--       esac
--     done
--     LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | $SED -e "s/-L/-R/g"`
--     LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
--
--   else
--     AC_MSG_WARN([You need at least libxslt 1.0.7])
--     HELP_SUBDIR=
--   fi
--fi
--
--if test ! "$USE_RPATH" = "yes"; then
--    LIBXSLT_RPATH=
--    LIBXML_RPATH=
--fi
--
--AC_SUBST(LIBXSLT_LIBS)
--AC_SUBST(LIBXSLT_CFLAGS)
--AC_SUBST(LIBXSLT_RPATH)
--
--AC_SUBST(LIBXML_LIBS)
--AC_SUBST(LIBXML_CFLAGS)
--AC_SUBST(LIBXML_RPATH)
--
--AM_CONDITIONAL(include_XSLTFILTERS, test -n "$LIBXML_LIBS" -a -n "$LIBXSLT_LIBS")
--dnl =======================================================
--dnl FILE: ./karbon/configure.in.in
--dnl =======================================================
--
--
--KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libfreetype anywhere, check http://www.freetype.org/])
--])
--
--if test -n "$FREETYPE_CONFIG"; then
--  vers=`$FREETYPE_CONFIG --version 2>/dev/null | $SED -e 's/libfreetype //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 5000000
--  then
--     LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
--     LIBFREETYPE_RPATH=
--     for args in $LIBFREETYPE_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBFREETYPE_RPATH="$LIBFREETYPE_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBFREETYPE_RPATH=`echo $LIBFREETYPE_RPATH | $SED -e "s/-L/-R/g"`
--     LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
--  else
--     AC_MSG_WARN([You need at least libfreetype 5.0])
--  fi
--fi
--
--AC_SUBST(LIBFREETYPE_LIBS)
--AC_SUBST(LIBFREETYPE_CFLAGS)
--AC_SUBST(LIBFREETYPE_RPATH)
--
--
--KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
--  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
--])
--
--if test -n "$LIBART_CONFIG"; then
--  vers=`$LIBART_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 2003008
--  then
--     LIBART_LIBS="`$LIBART_CONFIG --libs`"
--     LIBART_RPATH=
--     for args in $LIBART_LIBS; do
--	  case $args in
--	    -L*)
--  	       LIBART_RPATH="$LIBART_RPATH $args"
-- 	       ;;
--          esac
--     done
--     LIBART_RPATH=`echo $LIBART_RPATH | $SED -e "s/-L/-R/g"`
--     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
--  else
--     AC_MSG_WARN([You need at least libart 2.3.8])
--  fi
--fi
--
--AC_SUBST(LIBART_LIBS)
--AC_SUBST(LIBART_CFLAGS)
--AC_SUBST(LIBART_RPATH)
--
--
--# Check for fontconfig
--KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
--        KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
--            AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
--        ])
--])
--
--if test -n "$PKGCONFIG"; then
--  vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1000001
--  then
--     LIBFONTCONFIG_LIBS="`$PKGCONFIG fontconfig --libs`"
--     LIBFONTCONFIG_RPATH=
--     for args in $LIBFONTCONFIG_LIBS; do
--          case $args in
--            -L*)
--               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
--               ;;
--          esac
--     done
--     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
--     LIBFONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
--  fi
--fi
--
--if test -n "$FONTCONFIG_CONFIG"; then
--  vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | $SED -e 's/libfontconfig //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1000001
--  then
--     LIBFONTCONFIG_LIBS="`$FONTCONFIG_CONFIG --libs`"
--     LIBFONTCONFIG_RPATH=
--     for args in $LIBFONTCONFIG_LIBS; do
--          case $args in
--            -L*)
--               LIBFONTCONFIG_RPATH="$LIBFONTCONFIG_RPATH $args"
--               ;;
--          esac
--     done
--     LIBFONTCONFIG_RPATH=`echo $LIBFONTCONFIG_RPATH | $SED -e "s/-L/-R/g"`
--     LIBFONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`"
--
--     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
--  fi
--fi
--
--AC_SUBST(LIBFONTCONFIG_LIBS)
--AC_SUBST(LIBFONTCONFIG_CFLAGS)
--AC_SUBST(LIBFONTCONFIG_RPATH)
--
--if test -z "$LIBART_LIBS"; then
--	DO_NOT_COMPILE="$DO_NOT_COMPILE karbon"
--fi
--
--if test -n "$LIBFREETYPE_LIBS" -a -n "$LIBFONTCONFIG_LIBS"; then
--	AC_DEFINE_UNQUOTED(HAVE_KARBONTEXT, 1, [Defines if your system has the fontconfig and freetype libraries])
--fi
--dnl =======================================================
--dnl FILE: ./kexi/3rdparty/configure.in.in
--dnl =======================================================
--
--dnl This is copied from gpsim-0.21.1/acinclude.m4, which was itself
--dnl copied from the NcFTP distribution. 
--dnl Modified by David Faure <faure@kde.org> for kexi's purposes.
--dnl
--dnl  Original author Mike Gleason mgleason@NcFTP.com
--dnl
--dnl
--AC_DEFUN([kexi_LIB_READLINE], [
--AC_MSG_CHECKING([for Readline library])
--
--kexi_cv_lib_readline=no
--ac_save_LIBS="$LIBS"
--# Note: $LIBCURSES is permitted to be empty.
--for LIBREADLINE in "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
--do
--	LIBS="$ac_save_LIBS $LIBREADLINE"
--	AC_TRY_RUN([
--	/* program */
--#include <stdio.h>
--#include <stdlib.h>
--#include <readline/readline.h>
-- 
--main(int argc, char **argv)
--{
--	/* Note:  don't actually call readline, since it may block;
--	 * We just want to see if it (dynamic) linked in okay.
--	 */
--	if (argc == 0)	/* never true */
--		readline(0);
--	exit(0);
--}
--],[
--	# action if true
--	kexi_cv_lib_readline=yes
--],[
--	# action if false
--	kexi_cv_lib_readline=no
--],[
--	# action if cross compiling
--	kexi_cv_lib_readline=no
--])
--
--	if test "$kexi_cv_lib_readline" = yes ; then break ; fi
--done
--# restore LIBS
--LIBS="$ac_save_LIBS"
--
--if test "$kexi_cv_lib_readline" = no ; then
--	LIBREADLINE=""
--	AC_MSG_RESULT("not found - kexisql will not be compiled")
--else
--	AC_MSG_RESULT($LIBREADLINE)
--	AC_DEFINE(HAVE_READLINE, 1, [define if you have libreadline available])
--fi
--
--AM_CONDITIONAL(have_readline, test "$kexi_cv_lib_readline" = "yes")
--AC_SUBST(LIBREADLINE)
--])
--
--kexi_LIB_READLINE
--dnl =======================================================
--dnl FILE: ./kexi/configure.in.in
--dnl =======================================================
--
--
--#KEXI_VERSION=
--AC_SUBST(LIB_KEXI_KMDI, '-lkmdi')
--AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '')
--
--dnl =======================================================
--dnl FILE: ./kexi/kexidb/drivers/configure.in.in
--dnl =======================================================
--
--dnl ========================================
--dnl checks for MySQL
--dnl taken form KDEDB
--dnl ========================================
--
--AC_ARG_ENABLE(mysql,
--	AC_HELP_STRING([--enable-mysql],[build MySQL-plugin [default=yes]]),
--              mysql_plugin=$enableval, mysql_plugin=yes)
--
--if test "x$mysql_plugin" = "xyes"; then
--  compile_mysql_plugin="yes"
--else
--  compile_mysql_plugin="no"
--fi
--
--AC_ARG_WITH(mysql_includes,
--AC_HELP_STRING([--with-mysql-includes=DIR],[use MySQL-includes installed in this directory]),
--[
--  ac_mysql_incdir=$withval
--], ac_mysql_incdir=
--)
--
--AC_ARG_WITH(mysql_libraries,
--AC_HELP_STRING([--with-mysql-libraries=DIR],[use MySQL-libs installed in this directory ]),
--[
--  ac_mysql_libdir=$withval
--], ac_mysql_libdir=
--)
--
--dnl ==============================================
--dnl check whether MySQL should be compiled
--dnl and where headers and libraries are installed
--dnl if present compile mysql-plugin
--dnl ==============================================
--
--AC_MSG_CHECKING([for MySQL])
--
--if test "$compile_mysql_plugin" = "yes"; then
--  if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
--dnl *** Configure arguments for includes or libs given    ***
--dnl *** and MySQL not explicitly disabled.                ***
--dnl *** Check that the paths given to configure are valid ***
--    AC_MSG_CHECKING([for MySQL headers])
--    mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
--    AC_FIND_FILE(mysql/mysql.h, $mysql_incdirs, mysql_incdir)
--    if test -r $mysql_incdir/mysql/mysql.h; then
--      MYSQL_INC=$mysql_incdir
--      AC_MSG_RESULT([$MYSQL_INC])
--      AC_SUBST(MYSQL_INC)
--    else
--      compile_mysql_plugin="no"
--      AC_MSG_RESULT([not found])
--    fi
--
--    AC_MSG_CHECKING([for MySQL libraries])
--    mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--    AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir)
--    if test -r $mysql_libdir/mysql/libmysqlclient.so; then
--      MYSQL_LIBS=$mysql_libdir
--      AC_MSG_RESULT([$MYSQL_LIBS])
--      AC_SUBST(MYSQL_LIBS)
--    else
--      compile_mysql_plugin="no"
--      AC_MSG_RESULT([not found])
--    fi
--  else
--dnl *** No configure arguments for includes or libs given ***
--dnl *** and MySQL not explicitly disabled.                ***
--    KDE_FIND_PATH(mysql_config, MYSQL_CONFIG,
--      [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [
--      AC_MSG_RESULT([not found])
--    ])
--
--    if test -n "$MYSQL_CONFIG"; then
--      mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I,,g" | cut -d " " -f 1`
--      mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
--      MYSQL_INC=$mysql_incdir
--      MYSQL_LIBS=$mysql_libdir
--      AC_SUBST(MYSQL_INC)
--      AC_SUBST(MYSQL_LIBS)
--      compile_mypsql_plugin="yes"
--      AC_MSG_RESULT([headers $mysql_incdir, libraries $mysql_libdir])
--    else
--      compile_mysql_plugin="no"
--    fi
--  fi
--else
--dnl *** MySQL plugin explicitly disabled.            ***
--dnl *** Show that we are doing as requested.              ***
--  AC_MSG_NOTICE([Not attempting to configure MySQL as requested])
--fi
--
--AM_CONDITIONAL(compile_mysql_plugin, test "$compile_mysql_plugin" = "yes")
--
--dnl ========================================
--dnl Checks for PostgreSQL
--dnl ========================================
--
--dnl ========================================
--dnl libpq
--dnl   Add configure-args
--dnl ========================================
--
--dnl Assume we're building until something fails, unless explicitly disabled
--AC_ARG_ENABLE(pgsql,
--AC_HELP_STRING([--enable-pgsql],[build PostgreSQL-plugin [default=yes]]),
-- pgsql_plugin=$enableval, pgsql_plugin=yes)
--
--if test "x$pgsql_plugin" = "xyes"; then
--  compile_pgsql_plugin="yes"
--else
--  compile_pgsql_plugin="no"
--fi
--
--AC_ARG_WITH(pgsql-includes,
--AC_HELP_STRING([--with-pgsql-includes=DIR],[use PostgreSQL(libpq)-includes installed in this directory ]),
--[
--  ac_pgsql_incdir=$withval
--], ac_pgsql_incdir=
--)
--
--AC_ARG_WITH(pgsql-libraries,
--AC_HELP_STRING([--with-pgsql-libraries=DIR],[use PostgreSQL(libpq)-libraries installed in this directory ]),
--[
--  ac_pgsql_libdir=$withval
--], ac_pgsql_libdir=
--)
--
--
--dnl ========================================
--dnl   header/library directories
--dnl ========================================
--
--if test "$compile_pgsql_plugin" = "yes"; then
--  if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
--dnl *** Configure arguments for includes or libs given    ***
--dnl *** and PostgreSQL not explicitly disabled.           ***
--dnl *** Check that the paths given to configure are valid ***
--    AC_MSG_CHECKING([for PostgreSQL C API headers])
--    pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
--    AC_FIND_FILE(libpq-fe.h, $pgsql_incdirs, pgsql_incdir)
--    if test -r $pgsql_incdir/libpq-fe.h; then
--      PG_INCDIR=$pgsql_incdir
--      AC_MSG_RESULT([$PG_INCDIR])
--      AC_SUBST(PG_INCDIR)
--    else
--      compile_pgsql_plugin="no"
--      AC_MSG_RESULT([not found])
--    fi
--
--    AC_MSG_CHECKING([for PostgreSQL C API libraries])
--    pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--    AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
--    if test -r $pgsql_libdir/libpq.so; then
--      PG_LIBDIR=$pgsql_libdir
--      AC_MSG_RESULT([$PG_LIBDIR])
--      AC_SUBST(PG_LIBDIR)
--    else
--      compile_pgsql_plugin="no"
--      AC_MSG_RESULT([not found])
--    fi
--  else
--dnl *** No configure arguments for includes or libs given ***
--dnl *** and PostgreSQL not explicitly disabled.           ***
--    KDE_FIND_PATH(pg_config, PG_CONFIG,
--      [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /usr/bin ], [
--      AC_MSG_RESULT([not found])
--    ])
--
--    if test -n "$PG_CONFIG"; then
--      pgsql_incdir=`$PG_CONFIG --includedir`
--      pgsql_libdir=`$PG_CONFIG --libdir`
--      PG_INCDIR=$pgsql_incdir
--      PG_LIBDIR=$pgsql_libdir
--      AC_SUBST(PG_LIBDIR)
--      compile_pgsql_plugin="yes"
--      AC_MSG_RESULT([headers $pgsql_incdir, libraries $pgsql_libdir])
--    else
--      compile_pgsql_plugin="no"
--    fi
--  fi
--else
--dnl *** PostgreSQL plugin explicitly disabled.            ***
--dnl *** Show that we are doing as requested.              ***
--  AC_MSG_NOTICE([Not attempting to configure PostgreSQL as requested])
--fi
--
--AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes")
--
--
--dnl ========================================
--dnl libpqxx checks
--dnl ========================================
--
--AC_ARG_WITH(pqxx-includes,
--AC_HELP_STRING([--with-pqxx-includes=DIR],[use PostgreSQL(libpqxx)-includes installed in this directory ]),
--[
--  ac_pqxx_incdir=$withval
--], ac_pqxx_incdir=
--)
--
--AC_ARG_WITH(pqxx-libraries,
--AC_HELP_STRING([--with-pqxx-libraries=DIR],[use PostgreSQL(libpqxx)-libraries installed in this directory ]),
--[
--  ac_pqxx_libdir=$withval
--], ac_pqxx_libdir=
--)
--
--
--dnl ========================================
--dnl   libpqxx headers
--dnl ========================================
--if test "$compile_pgsql_plugin" = "yes"; then
--  AC_MSG_CHECKING([for PostgreSQL C++ includes])
--  pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
--  AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir)
--  if test -r $pqxx_incdir/pqxx/pqxx; then
--    PQXX_INCDIR=$pqxx_incdir
--    AC_MSG_RESULT([$PQXX_INCDIR])
--    AC_SUBST(PQXX_INCDIR)
--  else
--    compile_pgsql_plugin="no"
--    AC_MSG_RESULT([not found])
--  fi
--fi
--
--dnl ========================================
--dnl   libpqxx libraries
--dnl ========================================
--if test "$compile_pgsql_plugin" = "yes"; then
--  AC_MSG_CHECKING([for PostgreSQL C++ libraries])
--  pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
--  AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
--  if test -r $pqxx_libdir/libpqxx.so; then
--    PQXX_LIBDIR=$pqxx_libdir
--    AC_MSG_RESULT([$PQXX_LIBDIR])
--    AC_SUBST(PQXX_LIBDIR)
--  else
--    compile_pgsql_plugin="no"
--    AC_MSG_RESULT([not found])
--  fi
--fi
--
--AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes")
--dnl =======================================================
--dnl FILE: ./kexi/main/configure.in.in
--dnl =======================================================
--
--
--dnl ======================================
--dnl KNewStuff Configuration
--dnl ======================================
--dnl
--dnl Copyright (C) 2004 Josef Spillner <spillner@kde.org>
--dnl This file is to be used within KDE's build system.
--dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found,
--dnl and a HAVE_KNEWSTUFF #define statement is added.
--dnl
--
--AC_MSG_CHECKING([for KDE library: knewstuff])
--
--ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
--knewstuff_libraries=""
--knewstuff_includes=""
--
--AC_CACHE_VAL(ac_cv_have_knewstuff,
--[
--AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
--ac_knewstuff_includes="$knewstuff_incdir"
--
--AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)
--ac_knewstuff_libraries="$knewstuff_libdir"
--
--if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
--  ac_cv_have_knewstuff="have_knewstuff=no"
--  ac_knewstuff_notfound=""
--else
--  have_knewstuff="yes"
--fi
--])
--
--eval "$ac_cv_have_knewstuff"
--
--if test "$have_knewstuff" != yes; then
--  AC_MSG_RESULT([$have_knewstuff])
--else
--  AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)])
--
--dnl  AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.])
--  CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
--
--  LIB_KNEWSTUFF='-lknewstuff'
--  AC_SUBST(LIB_KNEWSTUFF)
--fi
--
--AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],
--  have_internal_feedback="yes"
--,
--  have_internal_feedback="no"
--)
--
--AC_MSG_CHECKING([for KDE library: kfeedbackwizard])
--
--ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
--kfeedback_libraries=""
--kfeedback_includes=""
--
--AC_CACHE_VAL(ac_cv_have_kfeedback,
--[
--AC_FIND_FILE(kfeedbackwizard.h, $kde_incdirs, kfeedback_incdir)
--ac_kfeedback_includes="$kfeedback_incdir"
--
--AC_FIND_FILE(libkfeedbackwizard.so, $kde_libdirs, kfeedback_libdir)
--ac_kfeedback_libraries="$kfeedback_libdir"
--
--if test "$ac_kfeedback_includes" = NO || test "$ac_kfeedback_libraries" = NO; then
--  ac_cv_have_kfeedback="have_kfeedback=no"
--  ac_kfeedback_notfound=""
--else
--  have_kfeedback="yes"
--fi
--])
--
--eval "$ac_cv_have_kfeedback"
--
--INC_KFEEDBACK=''
--LIB_KFEEDBACK=''
--if test "$have_kfeedback" != yes; then
--  if test "$have_internal_feedback" = yes; then
--    CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
--    use_kexifb="yes"
--    AC_MSG_RESULT([using internal])
--    INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
--    LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
--  else
--    use_kexifb="no"
--    AC_MSG_RESULT([dont use])
--  fi
--else
--  use_kexifb="no"
--  AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])
--
--dnl  AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.])
--  CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
--
--  LIB_KFEEDBACK='-lkfeedbackwizard'
--fi
--AC_SUBST(LIB_KFEEDBACK)
--AC_SUBST(INC_KFEEDBACK)
--AM_CONDITIONAL(use_kexifeedback, test "$use_kexifb" = "yes")
--dnl =======================================================
--dnl FILE: ./kexi/migration/configure.in.in
--dnl =======================================================
--
--# KexiMDB isn't built as part of Kexi right now.
--#AC_ARG_ENABLE(keximdb,
--#    AC_HELP_STRING([--enable-keximdb],
--#                   [build KexiMDB (MS Access) plugin [default=no]]),
--#    compile_keximdb_plugin=$enableval, compile_keximdb_plugin=no)
--#
--#AM_CONDITIONAL(compile_keximdb_plugin, test "x$compile_keximdb_plugin" != "xno")
--dnl =======================================================
--dnl FILE: ./kexi/plugins/configure.in.in
--dnl =======================================================
--
--# disabled
--#AC_ARG_ENABLE(kexi-reports,
--#    AC_HELP_STRING([--enable-kexi-reports],
--#                   [build Kexi reports plugin (EXPERIMENTAL) [default=no]]),
--#    compile_kexi_reports_plugin=$enableval, compile_kexi_reports_plugin=no)
--#AM_CONDITIONAL(compile_kexi_reports_plugin, test "x$compile_kexi_reports_plugin" != "xno")
--#
--#if test "$compile_kexi_reports_plugin" == "yes"; then
--#    AC_DEFINE(KEXI_REPORTS_SUPPORT, 1, [build Kexi reports plugin])
--#fi
--
--AC_ARG_ENABLE(kexi-macros,
--    AC_HELP_STRING([--enable-kexi-macros],
--                   [build Kexi macro plugin (EXPERIMENTAL) [default=yes]]),
--    compile_kexi_macros_plugin=$enableval, compile_kexi_macros_plugin=no)
--AM_CONDITIONAL(compile_kexi_macros_plugin, test "x$compile_kexi_macros_plugin" == "xyes")
--
--if test "$compile_kexi_macros_plugin" == "yes"; then
--    AC_DEFINE(KEXI_MACROS_SUPPORT, 1, [build Kexi macros plugin])
--fi
--dnl =======================================================
--dnl FILE: ./kexi/plugins/macros/configure.in.in
--dnl =======================================================
--
--# Check for kunittest
--AC_MSG_CHECKING([for kunittest])
--
--# First we check if the console unittester could be compiled
--have_kunittest_header="no"
--KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
--AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes")
--
--# Second we check if the GUI-unittester could be compiled
--have_kunittestgui_header="no"
--KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , )
--AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes")
--
--dnl =======================================================
--dnl FILE: ./kivio/configure.in.in
--dnl =======================================================
--
--dnl Do we have Python? 
--KDE_CHECK_PYTHON
--dnl =======================================================
--dnl FILE: ./kpresenter/configure.in.in
--dnl =======================================================
--
--AC_HAVE_DPMS()
--dnl =======================================================
--dnl FILE: ./chalk/configure.in.in
--dnl =======================================================
--
--KDE_CHECK_LIB(Xi, XOpenDisplay, [
--	LIB_XINPUTEXT="-lXi"
--	AC_DEFINE(HAVE_XINPUTEXT, 1, [Define if you have the X11 Input Extension])
--	])
--AC_SUBST(LIB_XINPUTEXT)
--
--# Check for lcms
--AC_MSG_CHECKING([for lcms >= 1.15])
--
--have_lcms_header='no'
--KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
--if test "$have_lcms_header" = 'yes'
--then
--        AC_DEFINE(LCMS_HEADER, <lcms/lcms.h>, [The correct header])
--	HAVELCMS="yes"
--	LCMS_LIBS="-llcms"
--
--	echo "#include <lcms/lcms.h>" > conftest.$ac_ext
--	echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
--	echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
--	echo "#endif" >> conftest.$ac_ext
--	echo "int main() {}" >> conftest.$ac_ext
--
--else
--        # Alternative! Debian does it this way...
--	KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
--
--    if test "$have_lcms_header" = 'yes'
--    then
--       	AC_DEFINE(LCMS_HEADER, <lcms.h>, [The correct header])
--	HAVELCMS="yes"
--	LCMS_LIBS="-llcms"
--
--	   echo "#include <lcms.h>" > conftest.$ac_ext
--	   echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
--	   echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
--	   echo "#endif" >> conftest.$ac_ext
--	   echo "int main() {}" >> conftest.$ac_ext
--    else
--        KDE_CHECK_HEADER(lcms.h,have_lcms_header='yes',,)
--        # and now debian also does it this way... can't they decide for one way of doing stuff ?
--        
--       AC_DEFINE(LCMS_HEADER, <liblcms1/lcms.h>, [The correct header])
--	HAVELCMS="yes"
--	LCMS_LIBS="-llcms"
--
--       echo "#include <liblcms1/lcms.h>" > conftest.$ac_ext
--       echo "#if LCMS_VERSION < 115" >> conftest.$ac_ext
--       echo "#error Need lcms >= 1.15" >> conftest.$ac_ext
--       echo "#endif" >> conftest.$ac_ext
--       echo "int main() {}" >> conftest.$ac_ext
--
--   fi
--fi
--
--AC_SUBST(LCMS_LIBS)
--
--# IM 6.1.3 changed the number of arguments to GetMagickInfoList
--
--AC_MSG_CHECKING(if GetMagickInfoList has only 2 arguments)
--CPPFLAGS_TMP="$CPPFLAGS"   # Save preprocessor flags
--CPPFLAGS="$LIBMAGICK_CPPFLAGS"
--
--AC_TRY_COMPILE(
--	[#include <stdio.h>
--	#if HAVE_SYS_TYPES_H
--	#include <sys/types.h>
--	#endif
--	#include "magick/api.h"],
--	[const char *pattern; unsigned long ncolors; (void)GetMagickInfoList(pattern, &ncolors)],
--	magick_info_list='yes',
--	magick_info_list='no')
--
--CPPFLAGS="$CPPFLAGS_TMP"  # Restore preprocessor flags
--
--if test "$magick_info_list" = 'yes'; then
--	AC_MSG_RESULT(yes)
--  AC_DEFINE([HAVE_OLD_GETMAGICKINFOLIST], 1, [GetMagickInfoList has different number of arguments with versions >= 6.1.3])
--else
--	AC_MSG_RESULT(no)
--fi
--
--# Check for kunittest
--AC_MSG_CHECKING([for kunittest])
--
--have_kunittest_header="no"
--KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
--AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes")
--
--# --- OpenGL check ---
--
--AC_HAVE_GL( [], [] )
--
--# --- End of OpenGL check ---
--
--# Check for powf.
--
--AC_CHECK_FUNC(powf, [have_powf="yes"], [AC_CHECK_LIB(m, powf, [have_powf="yes"], [have_powf="no"])])
--
--if test "$have_powf" = 'yes'; then
--  AC_DEFINE([HAVE_POWF], 1, [Define to 1 if your system has powf in <maths.h>])
--fi\
--dnl =======================================================
--dnl FILE: ./chalk/plugins/configure.in.in
--dnl =======================================================
--
--KDE_CHECK_HEADER(kjsembed/jsproxy_imp.h, have_kjsembed=yes, have_kjsembed=no)
--AM_CONDITIONAL(use_kjsembed, test x$have_kjsembed = xyes)
--dnl =======================================================
--dnl FILE: ./chalk/plugins/viewplugins/imagesize/configure.in.in
--dnl =======================================================
--
--AC_CHECK_DECLS([round], [], [], [#include <math.h>])
--dnl =======================================================
--dnl FILE: ./kspread/plugins/calculator/configure.in.in
--dnl =======================================================
--
--AC_CHECK_HEADERS(ieeefp.h)
--
--AC_CHECK_FUNCS(fabsl)
--
--AC_DEFUN([KDE_C_LONG_DOUBLE],
--[
--  AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
--  [
--    AC_TRY_RUN(
--    [
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>
--
--int main() {
--/* The Stardent Vistra knows sizeof(long double), but does not support it.  */
--long double foo = 1.0;
--char buffer[10];
--/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
--int result = (sizeof(long double) < sizeof(double));
--/* the following is needed for a broken printf in glibc2 */
--if (!result) {
--    foo = foo * 3;
--    sprintf(buffer,"%0.0Lf",foo);
--    result = strcmp(buffer, "3");
--/* and now something mean ;-) */
--    foo = powl(fabsl(foo), 1);
--}
--exit(result); }
--    ],
--    ac_cv_c_long_double=yes, ac_cv_c_long_double=no,
--    ac_cv_c_long_double=no
--    )
--  ])
--  if test $ac_cv_c_long_double = yes; then
--    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have support for long double in printf])
--  fi
--])
--KDE_C_LONG_DOUBLE
--
--AC_LANG_C
--KDE_CHECK_LIB(m, isinf, [
--  AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf])
--])
--dnl =======================================================
--dnl FILE: ./kword/mailmerge/configure.in.in
--dnl =======================================================
--
--dnl only compile the sql plugin if qt was compiled with sql support
--
--
--AC_MSG_CHECKING([for SQL support in QT])
--
--LIBS_SAVE_KWSL="$LIBS"
--CXXFLAGS_SAVE_KWSL="$CXXFLAGS"
--CFLAGS_SAVE_KWSL="$CFLAGS"
--
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--
--LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
--CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes"
--
--AC_TRY_COMPILE([
--#include <qglobal.h>
--],
--[
--#ifdef QT_NO_SQL
--#error "No QT-SQL support"
--#endif
--],
--ac_trycompile_kwsl_qtsql=yes,
--ac_trycompile_kwsl_qtsql=no)
--
--CXXFLAGS="$CXXFLAGS_SAVE_KWSL"
--LIBS="$LIBS_SAVE_KWSL"
--AC_LANG_RESTORE
--
--if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then
--  SQLDIR=sql
--  AC_SUBST(SQLDIR)
--  AC_MSG_RESULT([QT supports SQL - compile qtsqlmailmerge])
--else
--  SQLDIR=
--  AC_SUBST(SQLDIR)
--  AC_MSG_RESULT([QT supports SQL -- qtsqlmailmerge will not be built])
--fi
--
--AM_CONDITIONAL(include_sql, test -n "$SQLDIR")
--dnl =======================================================
--dnl FILE: ./lib/configure.in.in
--dnl =======================================================
--
--AC_SUBST(KWMF_INCLUDES, '-I$(top_srcdir)/lib/kwmf -I$(top_builddir)/lib/kwmf')
--AC_SUBST(KSTORE_INCLUDES, '-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store')
--AC_SUBST(KOTEXT_INCLUDES, '-I$(top_srcdir)/lib/kotext -I$(top_builddir)/lib/kotext')
--AC_SUBST(KOPAINTER_INCLUDES, '-I$(top_srcdir)/lib/kopainter -I$(top_builddir)/lib/kopainter')
--AC_SUBST(KOPALETTE_INCLUDES, '-I$(top_srcdir)/lib/kopalette -I$(top_builddir)/lib/kopalette')
--AC_SUBST(KOFFICECORE_INCLUDES, '-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore')
--AC_SUBST(KOFFICEUI_INCLUDES, '-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui')
--AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula')
--dnl those are included with e.g. <koproperty/set.h>
--AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib')
--AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross')
--AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la')
--AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la')
--AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la')
--AC_SUBST(LIB_KOTEXT, '$(top_builddir)/lib/kotext/libkotext.la')
--AC_SUBST(LIB_KOPAINTER, '$(top_builddir)/lib/kopainter/libkopainter.la')
--AC_SUBST(LIB_KOPALETTE, '$(top_builddir)/lib/kopalette/libkopalette.la')
--AC_SUBST(LIB_KWMF, '$(top_builddir)/lib/kwmf/libkwmf.la')
--AC_SUBST(LIB_KOWMF, '$(top_builddir)/lib/kwmf/libkowmf.la')
--AC_SUBST(LIB_KFORMULA, '$(top_builddir)/lib/kformula/libkformulalib.la')
--AC_SUBST(LIB_KOPROPERTY, '$(top_builddir)/lib/koproperty/libkoproperty.la')
--AC_SUBST(LIB_KROSS_API, '$(top_builddir)/lib/kross/api/libkrossapi.la')
--AC_SUBST(LIB_KROSS_MAIN, '$(top_builddir)/lib/kross/main/libkrossmain.la')
--
--AC_SUBST(interfacedir, '$(top_srcdir)/lib/interfaces')
--AC_SUBST(KOFFICE_LIBS, '$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE)')
--AC_SUBST(KOFFICE_INCLUDES, '$(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(KOPALETTE_INCLUDES)')
--
--AC_DEFINE_UNQUOTED(PREFIX,"$prefix",[Define the PREFIX where to install this package])
--
--dnl =======================================================
--dnl FILE: ./lib/kotext/configure.in.in
--dnl =======================================================
--
--   AC_LANG_SAVE
--   AC_LANG_C
--   dnl Check for aspell library
--   KDE_CHECK_HEADERS([kspell2/broker.h])
--   if test "x$ac_cv_header_kspell2_broker_h" = "xyes"; then
--           dnl the header and the lib exist -> ok
--           dnl this is for config.h
--           AC_DEFINE(HAVE_LIBKSPELL2, 1, [If we are going to use libkspell2 for spell-checking])
--           LIBKSPELL2="-lkspell2"
--           AC_MSG_RESULT([found in $ac_kspell2_includes])
--   else
--           LIBKSPELL2=""
--           AC_MSG_RESULT([not found -- spell-checking will be disabled])
--   fi
--   AC_SUBST(LIBKSPELL2)
--   AC_LANG_RESTORE
--dnl =======================================================
--dnl FILE: ./lib/kross/configure.in.in
--dnl =======================================================
--
--AC_ARG_ENABLE(scripting,
--    AC_HELP_STRING([--enable-scripting],
--                   [build scripting library (Kross) [default=yes]]),
--    compile_kross=$enableval, compile_kross=yes)
--AM_CONDITIONAL(compile_kross, test "x$compile_kross" = "xyes")
--
--###############################
--# Check if Python is installed.
--
--if test "x$compile_kross" = "xyes" ; then
--    #KDE_CHECK_PYTHON(2.3)
--    KDE_CHECK_PYTHON
--fi
--
--# Compile the Kross python plugin only if both, $LIBPYTHON and
--# $PYTHONINC, are defined.
--AM_CONDITIONAL(compile_kross_python,
--               test -n "$LIBPYTHON" && test -n "$PYTHONINC")
--
--###############################
--# Check for Ruby
--
--if test "x$compile_kross" = "xyes" ; then
--  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
--
--  if test -n "$RUBY"; then
--    AC_MSG_CHECKING(for Ruby dirs)
--    # Note: pkgconfig file exists only for ruby >= 1.9.3
--    if test -n "$PKGCONFIG"; then
--      RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
--      if test -n "$RUBY_VERSION"; then
--        RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
--      fi
--      if test -z "$RUBY_VERSION"; then
--        RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
--        if test -n "$RUBY_VERSION"; then
--          RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
--        fi
--      fi
--      if test -z "$RUBY_VERSION"; then
--        # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
--        if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
--          # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
--          RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'`
--          RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'`
--          RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
--          if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
--            RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
--            RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`"
--            RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS"
--            if test -n "`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`"; then
--              RUBY_ENABLESHARED=yes
--            fi
--          fi
--        fi
--      fi
--      if test -n "$RUBY_VERSION"; then
--        RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
--        RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
--        RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
--        RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
--        RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
--        RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`
--        RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
--        AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
--      fi
--    fi
--    if test -z "$RUBY_VERSION"; then
--      RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
--      RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
--      RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
--      RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
--      RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
--      RUBY_INCLUDEDIR=$RUBY_ARCHDIR
--      RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
--    fi
--    AC_MSG_RESULT([
--                    archdir $RUBY_ARCHDIR,
--                    sitearchdir $RUBY_SITEARCHDIR,
--                    sitedir $RUBY_SITEDIR,
--                    rubylibdir $RUBY_RUBYLIBDIR,
--                    libdir $RUBY_LIBDIR,
--                    includedir $RUBY_INCLUDEDIR,
--                    librubyarg $RUBY_LIBRUBYARG,
--                    cflags $RUBY_CFLAGS])
--    AC_SUBST(RUBY_ARCHDIR)
--    AC_SUBST(RUBY_SITEARCHDIR)
--    AC_SUBST(RUBY_RUBYLIBDIR)
--    AC_SUBST(RUBY_INCLUDEDIR)
--    AC_SUBST(RUBY_LIBRUBYARG)
--    AC_SUBST(RUBY_SITEDIR)
--    AC_SUBST(RUBY_CFLAGS)
--
--    AC_MSG_CHECKING(for Ruby header)
--
--    if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
--      # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR
--      RUBY_INCLUDEDIR=$RUBY_ARCHDIR
--    fi
--
--    if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
--      RUBY_LIBDIR=""
--      AC_MSG_RESULT([not found])
--    else
--      AC_MSG_RESULT([found]) # header
--
--      AC_MSG_CHECKING(Ruby shared library)
--      if test "x$RUBY_ENABLESHARED" != "xyes" ; then
--        AC_MSG_RESULT([shared library not found])
--        RUBY_LIBDIR="" 
--      else
--        if test -z "$RUBY_LIBRUBYARG" ; then
--          AC_MSG_RESULT([link argument not found])
--          RUBY_LIBDIR="" 
--        else
--          AC_MSG_RESULT([found]) # shared library link arg
--
--          AC_MSG_CHECKING([if C++ program with ruby can be compiled])
--          AC_LANG_SAVE
--          AC_LANG_CPLUSPLUS
--          ac_save_CXXFLAGS="$CXXFLAGS"
--          CXXFLAGS="$CXXFLAGS -I$RUBY_INCLUDEDIR"
--          AC_CACHE_VAL(ruby_build,
--          [
--            AC_TRY_COMPILE([
--                #include <ruby.h>
--                #include <version.h>
--            ],[
--            
--#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
--#error "need at least ruby 1.8.2\n"
--#endif
--
--                ruby_init();
--                return 0;
--            ], ruby_build=yes,
--            ruby_build=no)
--          ])
--          AC_MSG_RESULT($ruby_build)
--          if test "$ruby_build" = "no"; then
--            RUBY_LIBDIR=""
--          fi
--          CXXFLAGS="$ac_save_CXXFLAGS"
--          AC_LANG_RESTORE
--        fi # have ruby shared lib argument
--      fi # have shared lib
--    fi # have ruby header
--  fi # have ruby
--fi # compiling kross
--
--AM_CONDITIONAL(compile_kross_ruby, test -n "$RUBY_LIBDIR")
--KDE_CREATE_SUBDIRSLIST
--AM_CONDITIONAL(lib_SUBDIR_included, test "x$lib_SUBDIR_included" = xyes)
--AM_CONDITIONAL(interfaces_SUBDIR_included, test "x$interfaces_SUBDIR_included" = xyes)
--AM_CONDITIONAL(autocorrect_SUBDIR_included, test "x$autocorrect_SUBDIR_included" = xyes)
--AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
--AM_CONDITIONAL(example_SUBDIR_included, test "x$example_SUBDIR_included" = xyes)
--AM_CONDITIONAL(karbon_SUBDIR_included, test "x$karbon_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kchart_SUBDIR_included, test "x$kchart_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kdgantt_SUBDIR_included, test "x$kdgantt_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kformula_SUBDIR_included, test "x$kformula_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kivio_SUBDIR_included, test "x$kivio_SUBDIR_included" = xyes)
--AM_CONDITIONAL(koshell_SUBDIR_included, test "x$koshell_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kounavail_SUBDIR_included, test "x$kounavail_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kpresenter_SUBDIR_included, test "x$kpresenter_SUBDIR_included" = xyes)
--AM_CONDITIONAL(chalk_SUBDIR_included, test "x$chalk_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kspread_SUBDIR_included, test "x$kspread_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kugar_SUBDIR_included, test "x$kugar_SUBDIR_included" = xyes)
--AM_CONDITIONAL(mimetypes_SUBDIR_included, test "x$mimetypes_SUBDIR_included" = xyes)
--AM_CONDITIONAL(pics_SUBDIR_included, test "x$pics_SUBDIR_included" = xyes)
--AM_CONDITIONAL(plugins_SUBDIR_included, test "x$plugins_SUBDIR_included" = xyes)
--AM_CONDITIONAL(servicetypes_SUBDIR_included, test "x$servicetypes_SUBDIR_included" = xyes)
--AM_CONDITIONAL(templates_SUBDIR_included, test "x$templates_SUBDIR_included" = xyes)
--AM_CONDITIONAL(tools_SUBDIR_included, test "x$tools_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kword_SUBDIR_included, test "x$kword_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kplato_SUBDIR_included, test "x$kplato_SUBDIR_included" = xyes)
--AM_CONDITIONAL(kexi_SUBDIR_included, test "x$kexi_SUBDIR_included" = xyes)
--AM_CONDITIONAL(filters_SUBDIR_included, test "x$filters_SUBDIR_included" = xyes)
--AC_CONFIG_FILES([ Makefile ])
--AC_CONFIG_FILES([ autocorrect/Makefile ])
--AC_CONFIG_FILES([ doc/Makefile ])
--AC_CONFIG_FILES([ doc/karbon/Makefile ])
--AC_CONFIG_FILES([ doc/kchart/Makefile ])
--AC_CONFIG_FILES([ doc/kexi/Makefile ])
--AC_CONFIG_FILES([ doc/kformula/Makefile ])
--AC_CONFIG_FILES([ doc/kivio/Makefile ])
--AC_CONFIG_FILES([ doc/koffice/Makefile ])
--AC_CONFIG_FILES([ doc/koshell/Makefile ])
--AC_CONFIG_FILES([ doc/kplato/Makefile ])
--AC_CONFIG_FILES([ doc/kpresenter/Makefile ])
--AC_CONFIG_FILES([ doc/chalk/Makefile ])
--AC_CONFIG_FILES([ doc/kspread/Makefile ])
--AC_CONFIG_FILES([ doc/kugar/Makefile ])
--AC_CONFIG_FILES([ doc/kword/Makefile ])
--AC_CONFIG_FILES([ doc/thesaurus/Makefile ])
--AC_CONFIG_FILES([ example/Makefile ])
--AC_CONFIG_FILES([ filters/Makefile ])
--AC_CONFIG_FILES([ filters/generic_wrapper/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/ai/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/applixgraphics/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/eps/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/kontour/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/msod/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/oodraw/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/png/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/svg/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/wmf/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/xaml/Makefile ])
--AC_CONFIG_FILES([ filters/karbon/xcf/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/bmp/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/jpeg/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/libimageexport/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/mng/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/png/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/svg/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/xbm/Makefile ])
--AC_CONFIG_FILES([ filters/kchart/xpm/Makefile ])
--AC_CONFIG_FILES([ filters/kformula/Makefile ])
--AC_CONFIG_FILES([ filters/kformula/latex/Makefile ])
--AC_CONFIG_FILES([ filters/kformula/mathml/Makefile ])
--AC_CONFIG_FILES([ filters/kformula/png/Makefile ])
--AC_CONFIG_FILES([ filters/kformula/svg/Makefile ])
--AC_CONFIG_FILES([ filters/kivio/Makefile ])
--AC_CONFIG_FILES([ filters/kivio/imageexport/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/bmp/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/jpeg/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/kword/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/libimageexport/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/magicpoint/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/mng/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/ooimpress/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/png/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/powerpoint/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/powerpoint/import/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/powerpoint/libppt/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/svg/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/xbm/Makefile ])
--AC_CONFIG_FILES([ filters/kpresenter/xpm/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/gmagick/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/jpeg/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/libkisexif/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/magick/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/openexr/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/pdf/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/png/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/raw/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/tiff/Makefile ])
--AC_CONFIG_FILES([ filters/chalk/xcf/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/applixspread/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/csv/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/dbase/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/excel/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/excel/import/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/excel/sidewinder/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/gnumeric/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/html/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/kexi/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/latex/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/latex/export/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/libkspreadexport/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/opencalc/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/qpro/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/qpro/Makefile ])
--AC_CONFIG_FILES([ filters/kspread/qpro/libqpro/src/Makefile ])
--AC_CONFIG_FILES([ filters/kugar/Makefile ])
--AC_CONFIG_FILES([ filters/kugar/kugarnop/Makefile ])
--AC_CONFIG_FILES([ filters/kword/Makefile ])
--AC_CONFIG_FILES([ filters/kword/abiword/Makefile ])
--AC_CONFIG_FILES([ filters/kword/amipro/Makefile ])
--AC_CONFIG_FILES([ filters/kword/applixword/Makefile ])
--AC_CONFIG_FILES([ filters/kword/ascii/Makefile ])
--AC_CONFIG_FILES([ filters/kword/docbook/Makefile ])
--AC_CONFIG_FILES([ filters/kword/hancomword/Makefile ])
--AC_CONFIG_FILES([ filters/kword/html/Makefile ])
--AC_CONFIG_FILES([ filters/kword/html/export/Makefile ])
--AC_CONFIG_FILES([ filters/kword/html/import/Makefile ])
--AC_CONFIG_FILES([ filters/kword/kword1.3/Makefile ])
--AC_CONFIG_FILES([ filters/kword/kword1.3/import/Makefile ])
--AC_CONFIG_FILES([ filters/kword/latex/Makefile ])
--AC_CONFIG_FILES([ filters/kword/latex/export/Makefile ])
--AC_CONFIG_FILES([ filters/kword/latex/import/Makefile ])
--AC_CONFIG_FILES([ filters/kword/latex/import/generator/Makefile ])
--AC_CONFIG_FILES([ filters/kword/latex/import/parser/Makefile ])
--AC_CONFIG_FILES([ filters/kword/libexport/Makefile ])
--AC_CONFIG_FILES([ filters/kword/msword/Makefile ])
--AC_CONFIG_FILES([ filters/kword/mswrite/Makefile ])
--AC_CONFIG_FILES([ filters/kword/oowriter/Makefile ])
--AC_CONFIG_FILES([ filters/kword/palmdoc/Makefile ])
--AC_CONFIG_FILES([ filters/kword/pdf/Makefile ])
--AC_CONFIG_FILES([ filters/kword/pdf/xpdf/Makefile ])
--AC_CONFIG_FILES([ filters/kword/pdf/xpdf/goo/Makefile ])
--AC_CONFIG_FILES([ filters/kword/pdf/xpdf/xpdf/Makefile ])
--AC_CONFIG_FILES([ filters/kword/rtf/Makefile ])
--AC_CONFIG_FILES([ filters/kword/rtf/export/Makefile ])
--AC_CONFIG_FILES([ filters/kword/rtf/import/Makefile ])
--AC_CONFIG_FILES([ filters/kword/starwriter/Makefile ])
--AC_CONFIG_FILES([ filters/kword/wml/Makefile ])
--AC_CONFIG_FILES([ filters/kword/wordperfect/Makefile ])
--AC_CONFIG_FILES([ filters/kword/wordperfect/export/Makefile ])
--AC_CONFIG_FILES([ filters/kword/wordperfect/import/Makefile ])
--AC_CONFIG_FILES([ filters/libdialogfilter/Makefile ])
--AC_CONFIG_FILES([ filters/liboofilter/Makefile ])
--AC_CONFIG_FILES([ filters/olefilters/Makefile ])
--AC_CONFIG_FILES([ filters/olefilters/lib/Makefile ])
--AC_CONFIG_FILES([ filters/olefilters/powerpoint97/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/export/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/export/xsl/kword/xslfo/Makefile ])
--AC_CONFIG_FILES([ filters/xsltfilter/import/Makefile ])
--AC_CONFIG_FILES([ interfaces/Makefile ])
--AC_CONFIG_FILES([ karbon/Makefile ])
--AC_CONFIG_FILES([ karbon/commands/Makefile ])
--AC_CONFIG_FILES([ karbon/core/Makefile ])
--AC_CONFIG_FILES([ karbon/data/Makefile ])
--AC_CONFIG_FILES([ karbon/dialogs/Makefile ])
--AC_CONFIG_FILES([ karbon/dockers/Makefile ])
--AC_CONFIG_FILES([ karbon/pics/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/flattenpath/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/imagetool/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/insertknots/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/roundcorners/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/shadoweffect/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/whirlpinch/Makefile ])
--AC_CONFIG_FILES([ karbon/plugins/zoomtool/Makefile ])
--AC_CONFIG_FILES([ karbon/render/Makefile ])
--AC_CONFIG_FILES([ karbon/render/xrgbrender/Makefile ])
--AC_CONFIG_FILES([ karbon/shapes/Makefile ])
--AC_CONFIG_FILES([ karbon/templates/Makefile ])
--AC_CONFIG_FILES([ karbon/templates/basic/Makefile ])
--AC_CONFIG_FILES([ karbon/tools/Makefile ])
--AC_CONFIG_FILES([ karbon/visitors/Makefile ])
--AC_CONFIG_FILES([ karbon/widgets/Makefile ])
--AC_CONFIG_FILES([ kchart/Makefile ])
--AC_CONFIG_FILES([ kchart/kdchart/Makefile ])
--AC_CONFIG_FILES([ kchart/pics/Makefile ])
--AC_CONFIG_FILES([ kchart/templates/Makefile ])
--AC_CONFIG_FILES([ kchart/toolbar/Makefile ])
--AC_CONFIG_FILES([ kchart/toolbar/crystalsvg/Makefile ])
--AC_CONFIG_FILES([ kchart/toolbar/locolor/Makefile ])
--AC_CONFIG_FILES([ kdgantt/Makefile ])
--AC_CONFIG_FILES([ kexi/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kexisql/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kexisql/src/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kexisql/tool/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kexisql3/src/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ])
--AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ])
--AC_CONFIG_FILES([ kexi/core/Makefile ])
--AC_CONFIG_FILES([ kexi/data/Makefile ])
--AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ])
--AC_CONFIG_FILES([ kexi/examples/Makefile ])
--AC_CONFIG_FILES([ kexi/formeditor/Makefile ])
--AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ])
--AC_CONFIG_FILES([ kexi/formeditor/kdevelop_plugin/Makefile ])
--AC_CONFIG_FILES([ kexi/formeditor/scripting/Makefile ])
--AC_CONFIG_FILES([ kexi/formeditor/test/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/mySQL/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/odbc/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/pqxx/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/drivers/sqlite2/Makefile ])
--AC_CONFIG_FILES([ kexi/kexidb/parser/Makefile ])
--AC_CONFIG_FILES([ kexi/kexiutils/Makefile ])
--AC_CONFIG_FILES([ kexi/main/Makefile ])
--AC_CONFIG_FILES([ kexi/main/printing/Makefile ])
--AC_CONFIG_FILES([ kexi/main/startup/Makefile ])
--AC_CONFIG_FILES([ kexi/migration/Makefile ])
--AC_CONFIG_FILES([ kexi/migration/mysql/Makefile ])
--AC_CONFIG_FILES([ kexi/migration/pqxx/Makefile ])
--AC_CONFIG_FILES([ kexi/migration/txt/Makefile ])
--AC_CONFIG_FILES([ kexi/pics/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/forms/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/forms/widgets/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/importexport/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/importexport/csv/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/macros/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/macros/kexiactions/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/macros/kexipart/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/macros/lib/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/macros/tests/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/migration/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/queries/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/relations/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/reports/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/kexiapp/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/kexidb/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/kexiscripting/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/copycenter/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/exportxhtml/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/importxhtml/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/projectdocumentor/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/scripting/scripts/python/kexiapp/Makefile ])
--AC_CONFIG_FILES([ kexi/plugins/tables/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/altertable/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/newapi/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/parser/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/startup/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/tableview/Makefile ])
--AC_CONFIG_FILES([ kexi/tests/widgets/Makefile ])
--AC_CONFIG_FILES([ kexi/tools/Makefile ])
--AC_CONFIG_FILES([ kexi/tools/add_column/Makefile ])
--AC_CONFIG_FILES([ kexi/tools/delete_column/Makefile ])
--AC_CONFIG_FILES([ kexi/widget/Makefile ])
--AC_CONFIG_FILES([ kexi/widget/relations/Makefile ])
--AC_CONFIG_FILES([ kexi/widget/tableview/Makefile ])
--AC_CONFIG_FILES([ kexi/widget/utils/Makefile ])
--AC_CONFIG_FILES([ kformula/Makefile ])
--AC_CONFIG_FILES([ kformula/pics/Makefile ])
--AC_CONFIG_FILES([ kivio/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/config/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/kiviosdk/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/pics/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Assorted/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Circuit/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Cisco/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Civil/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Contact/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Electric/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/MSE/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Network/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/SDL/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Dia/Sybase/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Flags/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Geographic/Maps/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Computer/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/People/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/tiles/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/tools/Makefile ])
--AC_CONFIG_FILES([ kivio/kiviopart/ui/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kivioconnectortool/straight_connector/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kivioselecttool/select_pics/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviosmlconnector/sml_connector/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviotargettool/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviotexttool/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/Makefile ])
--AC_CONFIG_FILES([ kivio/plugins/kiviozoomtool/zoom_pics/Makefile ])
--AC_CONFIG_FILES([ kivio/templates/Makefile ])
--AC_CONFIG_FILES([ kivio/templates/basic/Makefile ])
--AC_CONFIG_FILES([ koshell/Makefile ])
--AC_CONFIG_FILES([ kounavail/Makefile ])
--AC_CONFIG_FILES([ kplato/Makefile ])
--AC_CONFIG_FILES([ kplato/pics/Makefile ])
--AC_CONFIG_FILES([ kplato/reports/Makefile ])
--AC_CONFIG_FILES([ kplato/templates/Makefile ])
--AC_CONFIG_FILES([ kplato/templates/Simple/Makefile ])
--AC_CONFIG_FILES([ kplato/tests/Makefile ])
--AC_CONFIG_FILES([ kplato/toolbar/Makefile ])
--AC_CONFIG_FILES([ kpresenter/Makefile ])
--AC_CONFIG_FILES([ kpresenter/autoformEdit/Makefile ])
--AC_CONFIG_FILES([ kpresenter/autoforms/Makefile ])
--AC_CONFIG_FILES([ kpresenter/autoforms/Arrows/Makefile ])
--AC_CONFIG_FILES([ kpresenter/autoforms/Connections/Makefile ])
--AC_CONFIG_FILES([ kpresenter/dtd/Makefile ])
--AC_CONFIG_FILES([ kpresenter/pics/Makefile ])
--AC_CONFIG_FILES([ kpresenter/pics/rotate/Makefile ])
--AC_CONFIG_FILES([ kpresenter/slideshow/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/A4/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/Screen/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/Screenpresentations/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/common_icon/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/legal/Makefile ])
--AC_CONFIG_FILES([ kpresenter/templates/letter/Makefile ])
--AC_CONFIG_FILES([ kpresenter/toolbar/Makefile ])
--AC_CONFIG_FILES([ chalk/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u16/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/cmyk_u8/templates/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/gray_u16/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/templates/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/gray_u8/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/lms_f32/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_f16half/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_f32/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_u16/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/templates/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/rgb_u8/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/wet/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/wetsticky/brushop/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u16/Makefile ])
--AC_CONFIG_FILES([ chalk/colorspaces/ycbcr_u8/Makefile ])
--AC_CONFIG_FILES([ chalk/core/Makefile ])
--AC_CONFIG_FILES([ chalk/core/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/core/tiles/Makefile ])
--AC_CONFIG_FILES([ chalk/core/tiles/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/data/Makefile ])
--AC_CONFIG_FILES([ chalk/data/brushes/Makefile ])
--AC_CONFIG_FILES([ chalk/data/gradients/Makefile ])
--AC_CONFIG_FILES([ chalk/data/images/Makefile ])
--AC_CONFIG_FILES([ chalk/data/palettes/Makefile ])
--AC_CONFIG_FILES([ chalk/data/patterns/Makefile ])
--AC_CONFIG_FILES([ chalk/data/profiles/Makefile ])
--AC_CONFIG_FILES([ chalk/dtd/Makefile ])
--AC_CONFIG_FILES([ chalk/chalkcolor/Makefile ])
--AC_CONFIG_FILES([ chalk/chalkcolor/colorspaces/Makefile ])
--AC_CONFIG_FILES([ chalk/chalkcolor/tests/Makefile ])
--AC_CONFIG_FILES([ chalk/pics/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/blur/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/bumpmap/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/cimg/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/colorify/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/colors/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/colorsfilters/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/convolutionfilters/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/cubismfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/embossfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/example/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/fastcolortransfer/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/imageenhancement/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/lenscorrectionfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/levelfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/noisefilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/oilpaintfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/pixelizefilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/raindropsfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/randompickfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/roundcorners/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/smalltilesfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/sobelfilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/threadtest/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/unsharp/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/filters/wavefilter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/paintops/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/paintops/defaultpaintops/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/defaulttools/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/selectiontools/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_crop/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_curves/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_filter/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivegrid/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_perspectivetransform/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_polygon/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_polyline/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_selectsimilar/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_star/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/tools/tool_transform/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorrange/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/colorspaceconversion/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/dropshadow/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/filtersgallery/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/histogram_docker/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/history_docker/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/imagesize/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/modify_selection/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/performancetest/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/rotateimage/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/screenshot/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkcore/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkscripting/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/python/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/ruby/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/selectopaque/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/separate_channels/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/shearimage/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/substrate/Makefile ])
--AC_CONFIG_FILES([ chalk/plugins/viewplugins/variations/Makefile ])
--AC_CONFIG_FILES([ chalk/sdk/Makefile ])
--AC_CONFIG_FILES([ chalk/ui/Makefile ])
--AC_CONFIG_FILES([ kspread/Makefile ])
--AC_CONFIG_FILES([ kspread/dialogs/Makefile ])
--AC_CONFIG_FILES([ kspread/dtd/Makefile ])
--AC_CONFIG_FILES([ kspread/extensions/Makefile ])
--AC_CONFIG_FILES([ kspread/pics/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/calculator/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/calculator/pics/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/insertcalendar/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/scripting/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/scripting/kspreadcore/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/exporthtml/Makefile ])
--AC_CONFIG_FILES([ kspread/plugins/scripting/scripts/scripteditor/Makefile ])
--AC_CONFIG_FILES([ kspread/sheetstyles/Makefile ])
--AC_CONFIG_FILES([ kspread/templates/Makefile ])
--AC_CONFIG_FILES([ kspread/templates/Business/Makefile ])
--AC_CONFIG_FILES([ kspread/templates/General/Makefile ])
--AC_CONFIG_FILES([ kspread/templates/HomeFamily/Makefile ])
--AC_CONFIG_FILES([ kspread/tests/Makefile ])
--AC_CONFIG_FILES([ kspread/toolbar/Makefile ])
--AC_CONFIG_FILES([ kspread/toolbar/crystalsvg/Makefile ])
--AC_CONFIG_FILES([ kugar/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner/pics/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner/templates/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner/templates/General/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner/toolbar/Makefile ])
--AC_CONFIG_FILES([ kugar/kudesigner_lib/Makefile ])
--AC_CONFIG_FILES([ kugar/lib/Makefile ])
--AC_CONFIG_FILES([ kugar/part/Makefile ])
--AC_CONFIG_FILES([ kugar/samples/Makefile ])
--AC_CONFIG_FILES([ kword/Makefile ])
--AC_CONFIG_FILES([ kword/data/Makefile ])
--AC_CONFIG_FILES([ kword/dtd/Makefile ])
--AC_CONFIG_FILES([ kword/expression/Makefile ])
--AC_CONFIG_FILES([ kword/horizontalline/Makefile ])
--AC_CONFIG_FILES([ kword/mailmerge/Makefile ])
--AC_CONFIG_FILES([ kword/mailmerge/kabc/Makefile ])
--AC_CONFIG_FILES([ kword/mailmerge/kspread/Makefile ])
--AC_CONFIG_FILES([ kword/mailmerge/sql/Makefile ])
--AC_CONFIG_FILES([ kword/pics/Makefile ])
--AC_CONFIG_FILES([ kword/templates/Makefile ])
--AC_CONFIG_FILES([ kword/templates/CardsAndLabels/Makefile ])
--AC_CONFIG_FILES([ kword/templates/Envelopes/Makefile ])
--AC_CONFIG_FILES([ kword/templates/Wordprocessing/Makefile ])
--AC_CONFIG_FILES([ kword/tests/Makefile ])
--AC_CONFIG_FILES([ kword/toolbar/Makefile ])
--AC_CONFIG_FILES([ lib/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/config/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/dtd/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/fonts/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/pics/Makefile ])
--AC_CONFIG_FILES([ lib/kformula/pics/crystalsvg/Makefile ])
--AC_CONFIG_FILES([ lib/kofficecore/Makefile ])
--AC_CONFIG_FILES([ lib/kofficecore/tests/Makefile ])
--AC_CONFIG_FILES([ lib/kofficeui/Makefile ])
--AC_CONFIG_FILES([ lib/kofficeui/pics/Makefile ])
--AC_CONFIG_FILES([ lib/kofficeui/tests/Makefile ])
--AC_CONFIG_FILES([ lib/kopainter/Makefile ])
--AC_CONFIG_FILES([ lib/kopalette/Makefile ])
--AC_CONFIG_FILES([ lib/koproperty/Makefile ])
--AC_CONFIG_FILES([ lib/koproperty/editors/Makefile ])
--AC_CONFIG_FILES([ lib/koproperty/test/Makefile ])
--AC_CONFIG_FILES([ lib/kotext/Makefile ])
--AC_CONFIG_FILES([ lib/kotext/kohyphen/Makefile ])
--AC_CONFIG_FILES([ lib/kotext/kohyphen/hyphdicts/Makefile ])
--AC_CONFIG_FILES([ lib/kotext/tests/Makefile ])
--AC_CONFIG_FILES([ lib/kross/Makefile ])
--AC_CONFIG_FILES([ lib/kross/api/Makefile ])
--AC_CONFIG_FILES([ lib/kross/main/Makefile ])
--AC_CONFIG_FILES([ lib/kross/python/Makefile ])
--AC_CONFIG_FILES([ lib/kross/python/cxx/Makefile ])
--AC_CONFIG_FILES([ lib/kross/python/scripts/Makefile ])
--AC_CONFIG_FILES([ lib/kross/python/scripts/RestrictedPython/Makefile ])
--AC_CONFIG_FILES([ lib/kross/ruby/Makefile ])
--AC_CONFIG_FILES([ lib/kross/runner/Makefile ])
--AC_CONFIG_FILES([ lib/kross/test/Makefile ])
--AC_CONFIG_FILES([ lib/kwmf/Makefile ])
--AC_CONFIG_FILES([ lib/store/Makefile ])
--AC_CONFIG_FILES([ lib/store/tests/Makefile ])
--AC_CONFIG_FILES([ mimetypes/Makefile ])
--AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ])
--AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ])
--AC_CONFIG_FILES([ pics/Makefile ])
--AC_CONFIG_FILES([ pics/crystalsvg/Makefile ])
--AC_CONFIG_FILES([ plugins/Makefile ])
--AC_CONFIG_FILES([ plugins/scan/Makefile ])
--AC_CONFIG_FILES([ servicetypes/Makefile ])
--AC_CONFIG_FILES([ templates/Makefile ])
--AC_CONFIG_FILES([ tools/Makefile ])
--AC_CONFIG_FILES([ tools/converter/Makefile ])
--AC_CONFIG_FILES([ tools/kfile-plugins/Makefile ])
--AC_CONFIG_FILES([ tools/kfile-plugins/abiword/Makefile ])
--AC_CONFIG_FILES([ tools/kfile-plugins/gnumeric/Makefile ])
--AC_CONFIG_FILES([ tools/kfile-plugins/koffice/Makefile ])
--AC_CONFIG_FILES([ tools/kfile-plugins/ooo/Makefile ])
--AC_CONFIG_FILES([ tools/kthesaurus/Makefile ])
--AC_CONFIG_FILES([ tools/quickprint/Makefile ])
--AC_CONFIG_FILES([ tools/spell/Makefile ])
--AC_CONFIG_FILES([ tools/thesaurus/Makefile ])
--AC_CONFIG_FILES([ tools/thumbnail/Makefile ])
--AC_MSG_CHECKING([for filters to be compiled])
--
--if test -s $srcdir/inst-apps ; then
--    SUBDIRLIST=`cat $srcdir/inst-apps`
--else
--    SUBDIRLIST=`cat $srcdir/subdirs`
--fi
--
--# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
--if test -z "$SUBDIRLIST" ; then
--    SUBDIRLIST=`ls -1 $srcdir`
--fi
--
--# first check which main apllication we could compile
--for args in $SUBDIRLIST ; do
--    case $args in
--        kword) COMPILE_FILTER_KWORD="$args " ;;
--        kspread) COMPILE_FILTER_KSPREAD="$args " ;;
--        kchart) COMPILE_FILTER_KCHART="$args " ;;
--        karbon) COMPILE_FILTER_KARBON="$args " ;;
--        kpresenter) COMPILE_FILTER_KPRESENTER="$args " ;;
--        kformula) COMPILE_FILTER_KFORMULA="$args " ;;
--        kugar) COMPILE_FILTER_KUGAR="$args " ;;
--        chalk) COMPILE_FILTER_KRITA="$args " ;;
--	kivio) COMPILE_FILTER_KIVIO="$args " ;;
--	kexi) COMPILE_FILTER_KEXI="$args " ;;
--    esac
--done
--
--# now remove the applications the user has asked not to compile
--for args in $DO_NOT_COMPILE ; do
--    case $args in
--        kword) COMPILE_FILTER_KWORD= ;;
--        kspread) COMPILE_FILTER_KSPREAD= ;;
--        kchart) COMPILE_FILTER_KCHART= ;;
--        karbon) COMPILE_FILTER_KARBON= ;;
--        kpresenter) COMPILE_FILTER_KPRESENTER= ;;
--        kformula) COMPILE_FILTER_KFORMULA= ;;
--        kugar) COMPILE_FILTER_KUGAR= ;;
--        chalk) COMPILE_FILTER_KRITA= ;;
--	kivio) COMPILE_FILTER_KIVIO= ;;
--	kexi) COMPILE_FILTER_KEXI= ;;
--    esac
--done
--
--USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR"
--AC_MSG_RESULT([$USERFEEDBACKCOMPILE])
--
--AM_CONDITIONAL(compile_filter_KWORD, test -n "$COMPILE_FILTER_KWORD")
--AM_CONDITIONAL(compile_filter_KSPREAD, test -n "$COMPILE_FILTER_KSPREAD")
--AM_CONDITIONAL(compile_filter_KCHART, test -n "$COMPILE_FILTER_KCHART")
--AM_CONDITIONAL(compile_filter_KARBON, test -n "$COMPILE_FILTER_KARBON")
--AM_CONDITIONAL(compile_filter_KPRESENTER, test -n "$COMPILE_FILTER_KPRESENTER")
--AM_CONDITIONAL(compile_filter_KFORMULA, test -n "$COMPILE_FILTER_KFORMULA")
--AM_CONDITIONAL(compile_filter_KUGAR, test -n "$COMPILE_FILTER_KUGAR")
--AM_CONDITIONAL(compile_filter_KRITA, test -n "$COMPILE_FILTER_KRITA")
--AM_CONDITIONAL(compile_filter_KIVIO, test -n "$COMPILE_FILTER_KIVIO")
--AM_CONDITIONAL(compile_filter_KEXI, test -n "$COMPILE_FILTER_KEXI")
--if test -s $srcdir/inst-apps ; then
--    SUBDIRLIST=`cat $srcdir/inst-apps`
--else
--    SUBDIRLIST=`cat $srcdir/subdirs`
--fi
--
--# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
--if test -z "$SUBDIRLIST" ; then
--    SUBDIRLIST=`ls -1 $srcdir`
--fi
--
--# first check which main apllication we could compile
--for args in $SUBDIRLIST ; do
--    case $args in
--        kugar) COMPILE_PLUGIN_KUGAR="$args " ;;
--    esac
--done
--
--# now remove the applications the user has asked not to compile
--for args in $DO_NOT_COMPILE ; do
--    case $args in
--        kugar) COMPILE_PLUGIN_KUGAR= ;;
--    esac
--done
--
--AM_CONDITIONAL(compile_plugin_KUGAR, test -n "$COMPILE_PLUGIN_KUGAR")
--if test -s $srcdir/inst-apps ; then
--    SUBDIRLIST=`cat $srcdir/inst-apps`
--else
--    SUBDIRLIST=`cat $srcdir/subdirs`
--fi
--
--# fallback (KDE_CREATE_SUBDIRLIST has this fallback, so I have put it here too.)
--if test -z "$SUBDIRLIST" ; then
--    SUBDIRLIST=`ls -1 $srcdir`
--fi
--
--AC_MSG_CHECKING([whether only Kexi is being built])
--KEXI_ONLY=yes
--for args in $SUBDIRLIST ; do
--    case $args in
--        lib) ;;
--        kexi) ;;
--        *) if test -d $srcdir/$args ; then 
--             KEXI_ONLY=no
--           fi
--           ;;
--    esac
--done
--AC_MSG_RESULT([$KEXI_ONLY])
--AM_CONDITIONAL(compile_kexionly, test "$KEXI_ONLY" = "yes" )
--
--AC_MSG_CHECKING([whether kopainter should be compiled])
--
--# first check which main application we could compile
--for args in $SUBDIRLIST ; do
--    case $args in
--        chalk) COMPILE_LIB_FOR_KRITA="$args " ;;
--        karbon) COMPILE_LIB_FOR_KARBON="$args " ;;
--        kivio) COMPILE_LIB_FOR_KIVIO="$args " ;;
--    esac
--done
--
--# now remove the applications the user has asked not to compile
--COMPILE_LIB_FOR_KPRESENTER="#"
--for args in $DO_NOT_COMPILE ; do
--    case $args in
--        chalk) COMPILE_LIB_FOR_KRITA= ;;
--        karbon) COMPILE_LIB_FOR_KARBON= ;;
--        kivio) COMPILE_LIB_FOR_KIVIO= ;;
--	kpresenter) COMPILE_LIB_FOR_KPRESENTER= ;;
--    esac
--done
--
--if test -n "$COMPILE_LIB_FOR_KRITA$COMPILE_LIB_FOR_KARBON$COMPILE_LIB_FOR_KIVIO$COMPILE_LIB_FOR_KPRESENTER" ; then
--    USERFEEDBACKCOMPILELIB="yes"
--else
--    USERFEEDBACKCOMPILELIB="no"
--fi
--
--AC_MSG_RESULT([$USERFEEDBACKCOMPILELIB])
--
--AM_CONDITIONAL(compile_lib_KOPAINTER, test "$USERFEEDBACKCOMPILELIB" = "yes" )
--
--AC_OUTPUT
--if test -z "$LIBGMAGICK_LIBS" -a -z "$LIBMAGICK_LIBS"; then
--  echo ""
--  echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export"
--  echo "filter will not be compiled. You can download GraphicsMagick from"
--  echo "http://www.graphicsmagick.org/. The GraphicsMagick filter allows chalk to"
--  echo "read and write XCF, PSD, GIF, BMP, and many other image formats."
--  echo ""
--  echo "If you have problems compiling GraphicsMagick, please try configuring it using"
--  echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk."
--  echo ""
--  all_tests=bad
--  AC_DEFINE([include_imagemagick_filter],"",[don't use magick filter])
--fi
--
--if test -z "$LIBGMAGICK_LIBS" -a ! -z "$LIBMAGICK_LIBS"; then
--
--  echo ""
--  echo "You're missing GraphicsMagick (>=1.1.7). chalk's GraphicsMagick import/export"
--  echo "filter will not be compiled. But ImageMagick was found, which mean that chalk"
--  echo "will be able to read and write XCF, PSD, GIF, BMP, and many other image formats."
--  echo "But the ImageMagick filter is deprecated and we strongly advise you to install"
--  echo "GraphicsMagick either from your distribution or from http://www.graphicsmagick.org/"
--fi
--if test -z "$LIBJPEG" -o -z "$LIBEXIF"; then
--  echo ""
--  echo "You're missing libjpeg or libexif 0.6.12 or later (binaries and/or headers)."
--  echo "chalk won't be able to import/export jpeg"
--  echo ""
--  all_tests=bad
--fi
--# ImageMagick is deprecated, we don't care anymore if it's not here
--#
--#if test -z "$LIBMAGICK_LIBS"; then
--#  echo ""
--#  echo "You're missing ImageMagick (>=6.1.0). chalk's ImageMagick import/export"
--#  echo "filter will not be compiled. You can download ImageMagick from"
--#  echo "http://www.imagemagick.org/. The ImageMagick filter allows chalk to"
--#  echo "read and write XCF, PSD, GIF, BMP, and many other image formats."
--#  echo ""
--#  echo "If you have problems compiling ImageMagick, please try configuring it using"
--#  echo "the --without-magick-plus-plus flag, the C++ API isn't needed for chalk."
--#  echo ""
--#  all_tests=bad
--#fi
--
--if test -z "$OPENEXR_LIBS"; then
--  echo ""
--  echo "You're missing the OpenEXR library. Chalk's OpenEXR import/export filter will "
--  echo "not be compiled. You can download OpenEXR from http://www.openexr.com or "
--  echo "install it from an appropriate binary package."
--  echo ""
--  all_tests=bad
--fi
--
--if test -z "$POPPLER_LIBS"; then
--  echo ""
--  echo "You're missing libpoppler 0.5.1 or later (binaries and/or headers)."
--  echo "chalk won't be able to import pdf"
--  echo "note that the tqt-binding of libpoppler is required"
--  echo ""
--fi
--if test -z "$LIBPNG";  then
--  echo ""
--  echo "You're missing libpng (binaries and/or headers), chalk won't be able"
--  echo "to import/export png"
--  echo ""
--  all_tests=bad
--fi
--
--if test -z "$LIBTIFF"; then
--  echo ""
--  echo "You're missing libtiff (binaries and/or headers), chalk won't be able"
--  echo "to import/export tiff"
--  echo ""
--  all_tests=bad
--fi
--if test -z "$LIBWV2_LIBS"; then
--  echo ""
--  echo "You're missing libwv2 0.1.9 or newer. KWord's MS Word filter will not be"
--  echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge"
--  echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a"
--  echo "tarball at http://sourceforge.net/projects/wvware/"
--#  echo "The MS Word filter won't be compiled due to experimental changes."
--  echo ""
--  all_tests=bad
--fi
--if test -z "$LIBWPD_LIBS"; then
--  echo ""
--  echo "You're missing libwpd 0.8 or newer. KWord's WordPerfect import filter will "
--  echo "not be compiled. You can download libwpd from http://libwpd.sf.net or "
--  echo "install it from appropriate binary package."
--  echo ""
--  all_tests=bad
--fi
--if test -z "$LIBXML_LIBS"; then
--  echo ""
--  echo "You're missing libxml2 (at least version 2.4.8)."
--  echo "The XSLT filters will not be compiled."
--  echo "Please download libxml2 from http://xmlsoft.org ."
--  echo ""
--  all_tests=bad
--fi
--
--if test -z "$LIBXSLT_LIBS"; then
--  echo ""
--  echo "You're missing libxslt (at least version 1.0.7)."
--  echo "The XSLT filters will not be compiled."
--# TODO: URL is not exacly right anymore
--  echo "Please download libxml2 from http://xmlsoft.org ."
--  echo ""
--  all_tests=bad
--fi
--
--if test -z "$LIBART_LIBS"; then
--  echo ""
--  echo "You're missing libart 2.3.8. karbon will not be compiled."
--  echo "You can download libart from"
--  echo "http://svg.kde.org/download.html"
--  echo ""
--  all_tests=bad
--else
--  if test -z "$LIBFONTCONFIG_LIBS"; then
--    echo ""
--    echo "You're missing fontconfig 1.0.1 or newer. karbon will not have text support."
--    echo "You can download fontconfig from http://fontconfig.org/"
--    echo ""
--    all_tests=bad
--  fi
--
--  if test -z "$LIBFREETYPE_LIBS"; then
--    echo ""
--    echo "You're missing libfreetype 5.0 or newer. karbon will not have text support."
--    echo "You can download libfreetype from http://www.freetype.org/"
--    echo ""
--    all_tests=bad
--  fi
--fi
--if test -z "$MYSQL_INC" -o -z "$MYSQL_LIBS"; then
--
--  echo "----------------------------------------------------------------------"
--
--  echo "  + The MySQL development files were not found."
--  cat <<EOS
--  These are required for MySQL support in Kexi.
--
--  If you want MySQL support in Kexi, you need to install the MySQL development
--  files, ensure that mysql-config is in your path,  and run this configure script
--  again, and finally run make; make install.  
--  If you don't need MySQL support, you can simply run make; make install now.
--EOS
--   all_tests=bad
--fi
--
--if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" -o \
--        -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then
--
--  echo "----------------------------------------------------------------------"
--
--# LIBPQ messages
--  if test -z "$PG_INCDIR"; then
--    echo "  + The PostgreSQL C-API (libpq) headers were not found."
--  fi
--
--  if test -z "$PG_LIBDIR"; then
--    echo "  + The PostgreSQL C-API (libpq) libraries were not found."
--  fi
--
--  if test -z "$PG_INCDIR" -a -z "$PG_LIBDIR" ; then
--      pglib_parts_missing="HEADER or the libpq LIBRARY"
--  elif test -z "$PG_INCDIR" ; then
--      pglib_parts_missing="HEADER"
--  elif test -z "$PG_LIBDIR" ; then
--      pglib_parts_missing="LIBRARY"
--  fi
--
--  if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" ; then
--    cat <<EOS
--    Could not find the libpq $pglib_parts_missing files.
--    These are required by the libpqxx C++ library, which is used by
--    Kexi's PostgreSQL drivers.
--
--    The PostgreSQL C-API usually ship with PostgreSQL, but if you've
--    installed from a distros package then these files may be part of
--    a package called postgresql-devel or libpq-devel"
--
--EOS
--  fi
--
--# LIBPQXX messages
--  if test -z "$PQXX_INCDIR"; then
--    echo "  + The PostgreSQL C++ API (libpqxx) headers were not found."
--  fi
--
--  if test -z "$PQXX_LIBDIR"; then
--    echo "  + The PostgreSQL C++ API (libpqxx) shared libraries were not found."
--  fi
--
--  if test -z "$PQXX_INCDIR" -a -z "$PQXX_LIBDIR" ; then
--      pqxx_parts_missing="HEADER or the libpqxx LIBRARY"
--  elif test -z "$PQXX_INCDIR" ; then
--      pqxx_parts_missing="HEADER"
--  elif test -z "$PQXX_LIBDIR" ; then
--      pqxx_parts_missing="LIBRARY"
--  fi
--
--  if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR" ; then
--  cat <<EOS
--    Could not find the libpqxx $pqxx_parts_missing files.
--    These are required by Kexi's PostgreSQL drivers.
--
--    Note: Kexi requires the SHARED libpqxx.so library files.
--          If you build pqxx library on your own, don't forget to use the
--          --enable-shared option when you run libpqxx's configure script.
--          This is necessary to compile the SHARED .so library, and
--          not the STATIC libpqxx.a.
--
--    The PostgreSQL C++ API can be downloaded from pqxx.tk or
--    http://gborg.postgresql.org/project/libpqxx/projdisplay.php
--    Grab the latest version (>=2)
--
--EOS
--  fi
--
--# SUMMARY messages
--  cat <<EOS
--  These warnings are not critical, but without installing the files
--  listed above Kexi will be compiled without PostgreSQL support.
--
--  If you want PostgreSQL support in Kexi, you need to install the files
--  listed above, then run this configure script again, and finally run
--  make; make install.  If you don't, simply run make; make install now.
--EOS
--
--  all_tests=bad
--  echo "----------------------------------------------------------------------"
--fi
--if test -z "$LCMS_LIBS"; then
--  echo ""
--  echo "LittleCMS is missing, Chalk will not be built."
--  echo ""
--  echo "If you want to compile Chalk you should install:"
--  echo "  * lcms 1.15 or newer (http://www.littlecms.com/)"
--  echo ""
--  all_tests=bad
--else
--  if test -z "$GLLIB"; then
--    echo ""
--    echo "You're missing OpenGL libraries. chalk will"
--    echo "not be able to use OpenGL for hardware"
--    echo "accelerated rendering."
--    echo ""
--  fi
--fi
--
--
--if test -z "$LIBKSPELL2"; then
--   echo ""
--   echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled."
--   echo ""
--   all_tests=bad
--fi
--if test -z "$RUBY_LIBDIR" -a "x$compile_kross" = "xyes" ; then
--  echo ""
--  echo "Ruby development files were not found, or Ruby <= 1.8.1 was found,"
--  echo "Ruby scripting support for KOffice will not be built. If you don't"
--  echo "need Ruby scripting, you can ignore this message."
--  echo ""
--fi
--
--if test -z "$LIBPYTHON" -a -z "$PYTHONINC" -a $"x$compile_kross" = "xyes"; then
--  echo ""
--  echo "Python developement files were not found, Python scripting support for"
--  echo "KOffice will not be built. If you don't need Python scripting, you"
--  echo "can ignore this message"
--  echo ""
--fi
--
--# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
--if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
--  # And if so, warn when they don't match
--  if test "$kde_libs_prefix" != "$given_prefix"; then
--    # And if kde doesn't know about the prefix yet
--    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
--    if test $? -ne 0; then
--      echo ""
--      echo "Warning: you chose to install this package in $given_prefix,"
--      echo "but KDE was found in $kde_libs_prefix."
--      echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
--      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
--      echo "Then restart KDE."
--      echo ""
--    fi
--  fi
--fi
--
--if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
--  echo ""
--  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
--  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
--  echo ""
--  echo "For better performance, consider including the Qt visibility supporting patch"
--  echo "located at:"
--  echo ""
--  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
--  echo ""
--  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
--  echo "everything will continue to work just fine without it."
--  echo ""
--fi
--
--if test "$all_tests" = "bad"; then
--  if test ! "$cache_file" = "/dev/null"; then
--    echo ""
--    echo "Please remove the file $cache_file after changing your setup"
--    echo "so that configure will find the changes next time."
--    echo ""
--  fi
--else
--  echo ""
--  echo "Good - your configure finished. Start make now"
--  echo ""
--fi
-diff --git a/filters/kword/wordperfect/configure.in.in b/filters/kword/wordperfect/configure.in.in
-index a491966..d3b8353 100644
---- a/filters/kword/wordperfect/configure.in.in
-+++ b/filters/kword/wordperfect/configure.in.in
-@@ -41,8 +41,6 @@ if test -z "$LIBWPD_LIBS"; then
- 
-        AC_DEFINE_UNQUOTED(HAVE_WPD, 1, [Defines if your system has the libwpd library])
-        AC_DEFINE_UNQUOTED(HAVE_LIBWPD_090, 1, [Defines if your system has libpwd greater than or equal to v0.9.0])
--
--       AC_MSG_ERROR([[libwpd >= 0.9.0 is not yet supported!]])       
-     fi
-   fi
- fi
-diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.hxx
-index d593224..fa3ec72 100644
---- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx
-+++ b/filters/kword/wordperfect/import/WordPerfectCollector.hxx
-@@ -77,13 +77,72 @@ struct ltstr
-   }
- };
- 
-+#ifdef HAVE_LIBWPD_090
-+class WordPerfectCollector : public WPXDocumentInterface
-+#else // HAVE_LIBWPD_090
- class WordPerfectCollector : public WPXHLListenerImpl
-+#endif HAVE_LIBWPD_090
- {
- public:
- 	WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
- 	virtual ~WordPerfectCollector();
- 	bool filter();
- 
-+#ifdef HAVE_LIBWPD_090
-+	virtual void setDocumentMetaData(const WPXPropertyList &propList) {};
-+	virtual void startDocument();
-+	virtual void endDocument();
-+	virtual void definePageStyle(const WPXPropertyList &propList) {};
-+	virtual void openPageSpan(const WPXPropertyList &propList) {};
-+	virtual void closePageSpan() {};
-+	virtual void openHeader(const WPXPropertyList &propList) {};
-+	virtual void closeHeader() {};
-+	virtual void openFooter(const WPXPropertyList &propList) {};
-+	virtual void closeFooter() {};
-+	virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
-+	virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
-+	virtual void closeParagraph();
-+	virtual void defineCharacterStyle(const WPXPropertyList &propList) {};
-+	virtual void openSpan(const WPXPropertyList &propList);
-+	virtual void closeSpan();
-+	virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
-+	virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
-+	virtual void closeSection() {};
-+	virtual void insertTab();
-+	virtual void insertSpace() {};
-+	virtual void insertText(const WPXString &text);
-+ 	virtual void insertLineBreak();
-+	virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
-+	virtual void defineOrderedListLevel(const WPXPropertyList &propList) {};
-+	virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {};	
-+	virtual void openOrderedListLevel(const WPXPropertyList &propList) {};
-+	virtual void openUnorderedListLevel(const WPXPropertyList &propList) {};
-+	virtual void closeOrderedListLevel() {};
-+	virtual void closeUnorderedListLevel() {};
-+	virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
-+	virtual void closeListElement() {};       
-+	virtual void openFootnote(const WPXPropertyList &propList) {};
-+	virtual void closeFootnote() {};
-+	virtual void openEndnote(const WPXPropertyList &propList) {};
-+	virtual void closeEndnote() {};
-+	virtual void openComment(const WPXPropertyList &propList) {};
-+	virtual void closeComment() {};
-+	virtual void openTextBox(const WPXPropertyList &propList) {};
-+	virtual void closeTextBox() {};
-+ 	virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
-+ 	virtual void openTableRow(const WPXPropertyList &propList) {};
-+	virtual void closeTableRow() {};
-+ 	virtual void openTableCell(const WPXPropertyList &propList) {};
-+	virtual void closeTableCell() {};
-+	virtual void insertCoveredTableCell(const WPXPropertyList &propList) {};
-+ 	virtual void closeTable() {};
-+	virtual void openFrame(const WPXPropertyList &propList) {};
-+	virtual void closeFrame() {};
-+	virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};
-+	virtual void insertEquation(const WPXPropertyList &propList, const WPXString &data) {};
-+
-+#else // HAVE_LIBWPD_090
-+
-  	virtual void setDocumentMetaData(const WPXPropertyList &propList) {}
- 	virtual void startDocument() {}
- 	virtual void endDocument() {}
-@@ -132,6 +191,8 @@ public:
- 	virtual void insertCoveredTableCell(const WPXPropertyList &propList);
-  	virtual void closeTable();
- 
-+#endif // HAVE_LIBWPD_090
-+
- protected:
- 	void _resetDocumentState();
- 	bool _parseSourceDocument(WPXInputStream &input);
-diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc
-index 09fc4d5..5ff786c 100644
---- a/filters/kword/wordperfect/import/wpimport.cc
-+++ b/filters/kword/wordperfect/import/wpimport.cc
-@@ -44,6 +44,104 @@ K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) )
- #include "DocumentHandler.hxx"
- #include "WordPerfectCollector.hxx"
- 
-+#ifdef HAVE_LIBWPD_090
-+class WPXMemoryInputStream : public WPXInputStream
-+{
-+public:
-+    WPXMemoryInputStream(unsigned char *data, unsigned long size);
-+    virtual ~WPXMemoryInputStream();
-+
-+    virtual bool isOLEStream() {
-+        return false;
-+    }
-+    virtual WPXInputStream * getDocumentOLEStream(const char *name) {
-+        return NULL;
-+    }
-+
-+    const virtual unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
-+    virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+    virtual long tell();
-+    virtual bool atEOS();
-+
-+private:
-+    long m_offset;
-+    size_t m_size;
-+    unsigned char *m_data;
-+};
-+
-+WPXMemoryInputStream::WPXMemoryInputStream(unsigned char *data, unsigned long size) :
-+	WPXInputStream(),
-+	m_offset(0),
-+	m_size(size),
-+	m_data(data)
-+{
-+}
-+
-+WPXMemoryInputStream::~WPXMemoryInputStream()
-+{
-+}
-+
-+const unsigned char * WPXMemoryInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
-+{
-+	numBytesRead = 0;
-+
-+	if (numBytes == 0)
-+		return 0;
-+	
-+	int numBytesToRead;
-+
-+	if ((m_offset+numBytes) < m_size)
-+		numBytesToRead = numBytes;
-+	else
-+		numBytesToRead = m_size - m_offset;
-+	
-+	numBytesRead = numBytesToRead; // about as paranoid as we can be..
-+
-+	if (numBytesToRead == 0)
-+		return 0;
-+
-+	long oldOffset = m_offset;
-+	m_offset += numBytesToRead;
-+	
-+	return &m_data[oldOffset];
-+}
-+
-+int WPXMemoryInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
-+{
-+	if (seekType == WPX_SEEK_CUR)
-+		m_offset += offset;
-+	else if (seekType == WPX_SEEK_SET)
-+		m_offset = offset;
-+
-+	if (m_offset < 0)
-+	{
-+		m_offset = 0;
-+		return 1;
-+	}
-+	if ((long)m_offset > (long)m_size)
-+	{
-+		m_offset = m_size;
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+long WPXMemoryInputStream::tell()
-+{
-+	return m_offset;
-+}
-+
-+bool WPXMemoryInputStream::atEOS()
-+{
-+	if ((long)m_offset == (long)m_size) 
-+		return true; 
-+
-+	return false;
-+}
-+
-+#else // HAVE_LIBWPD_090
-+
- class WPXMemoryInputStream : public WPXInputStream
- {
- public:
-@@ -138,6 +236,8 @@ bool WPXMemoryInputStream::atEOS()
- 	return false;
- }
- 
-+#endif // HAVE_LIBWPD_090
-+
- class KWordHandler : public DocumentHandler
- {
- public:
-@@ -250,7 +350,11 @@ KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCSt
-   // instream now owns buf, no need to delete buf later
-   WPXMemoryInputStream instream = WPXMemoryInputStream( buf, fsize );
- 
-+#ifdef HAVE_LIBWPD_090
-+  WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream);
-+#else // HAVE_LIBWPD_090
-   WPDConfidence confidence = WPDocument::isFileFormatSupported(&instream, false);
-+#endif // HAVE_LIBWPD_090
-   if( confidence == WPD_CONFIDENCE_NONE )
-   {
-     fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
-diff --git a/subdirs b/subdirs
-index 5e82c6f..9ba54a3 100644
---- a/subdirs
-+++ b/subdirs
-@@ -1,6 +1,7 @@
- lib
- interfaces
- autocorrect
-+chalk
- doc
- example
- karbon
-@@ -11,7 +12,6 @@ kivio
- koshell
- kounavail
- kpresenter
--chalk
- kspread
- kugar
- mimetypes
---
-cgit v0.9.0.2-52-g1de3
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch
deleted file mode 100644
index a024f98b4..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_wpd_09_support_2.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx.wpd2	2013-04-08 12:28:49.159409461 +0200
-+++ trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx	2013-04-08 12:29:01.170158682 +0200
-@@ -81,7 +81,7 @@
- class WordPerfectCollector : public WPXDocumentInterface
- #else // HAVE_LIBWPD_090
- class WordPerfectCollector : public WPXHLListenerImpl
--#endif HAVE_LIBWPD_090
-+#endif // HAVE_LIBWPD_090
- {
- public:
- 	WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
-@@ -93,12 +93,12 @@
- 	virtual void startDocument();
- 	virtual void endDocument();
- 	virtual void definePageStyle(const WPXPropertyList &propList) {};
--	virtual void openPageSpan(const WPXPropertyList &propList) {};
--	virtual void closePageSpan() {};
--	virtual void openHeader(const WPXPropertyList &propList) {};
--	virtual void closeHeader() {};
--	virtual void openFooter(const WPXPropertyList &propList) {};
--	virtual void closeFooter() {};
-+	virtual void openPageSpan(const WPXPropertyList &propList);
-+	virtual void closePageSpan();
-+	virtual void openHeader(const WPXPropertyList &propList);
-+	virtual void closeHeader();
-+	virtual void openFooter(const WPXPropertyList &propList);
-+	virtual void closeFooter();
- 	virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
- 	virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
- 	virtual void closeParagraph();
-@@ -106,36 +106,36 @@
- 	virtual void openSpan(const WPXPropertyList &propList);
- 	virtual void closeSpan();
- 	virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
--	virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
--	virtual void closeSection() {};
-+	virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
-+	virtual void closeSection();
- 	virtual void insertTab();
- 	virtual void insertSpace() {};
- 	virtual void insertText(const WPXString &text);
-  	virtual void insertLineBreak();
- 	virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
--	virtual void defineOrderedListLevel(const WPXPropertyList &propList) {};
--	virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {};	
--	virtual void openOrderedListLevel(const WPXPropertyList &propList) {};
--	virtual void openUnorderedListLevel(const WPXPropertyList &propList) {};
--	virtual void closeOrderedListLevel() {};
--	virtual void closeUnorderedListLevel() {};
--	virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
--	virtual void closeListElement() {};       
--	virtual void openFootnote(const WPXPropertyList &propList) {};
--	virtual void closeFootnote() {};
--	virtual void openEndnote(const WPXPropertyList &propList) {};
--	virtual void closeEndnote() {};
-+	virtual void defineOrderedListLevel(const WPXPropertyList &propList);
-+	virtual void defineUnorderedListLevel(const WPXPropertyList &propList);	
-+	virtual void openOrderedListLevel(const WPXPropertyList &propList);
-+	virtual void openUnorderedListLevel(const WPXPropertyList &propList);
-+	virtual void closeOrderedListLevel();
-+	virtual void closeUnorderedListLevel();
-+	virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
-+	virtual void closeListElement();
-+	virtual void openFootnote(const WPXPropertyList &propList);
-+	virtual void closeFootnote();
-+	virtual void openEndnote(const WPXPropertyList &propList);
-+	virtual void closeEndnote();
- 	virtual void openComment(const WPXPropertyList &propList) {};
- 	virtual void closeComment() {};
- 	virtual void openTextBox(const WPXPropertyList &propList) {};
- 	virtual void closeTextBox() {};
-- 	virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
-- 	virtual void openTableRow(const WPXPropertyList &propList) {};
--	virtual void closeTableRow() {};
-- 	virtual void openTableCell(const WPXPropertyList &propList) {};
--	virtual void closeTableCell() {};
--	virtual void insertCoveredTableCell(const WPXPropertyList &propList) {};
-- 	virtual void closeTable() {};
-+ 	virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
-+ 	virtual void openTableRow(const WPXPropertyList &propList);
-+	virtual void closeTableRow();
-+ 	virtual void openTableCell(const WPXPropertyList &propList);
-+	virtual void closeTableCell();
-+	virtual void insertCoveredTableCell(const WPXPropertyList &propList);
-+ 	virtual void closeTable();
- 	virtual void openFrame(const WPXPropertyList &propList) {};
- 	virtual void closeFrame() {};
- 	virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
deleted file mode 100644
index b620d022d..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ /dev/null
@@ -1,1157 +0,0 @@
-# Default version for this component
-%define tde_pkg koffice
-%define tde_version 3.5.13.2
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_kross 1
-%endif
-
-# Ruby support
-%define with_ruby 1
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		An integrated office suite
-Version:		1.6.3
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}
-
-Group:			Applications/Productivity
-License:		GPLv2+
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# BuildRequires: world-devel ;)
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
-BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version}
-BuildRequires:	automake libtool
-BuildRequires:	fontconfig-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	ImageMagick-devel
-BuildRequires:	zlib-devel
-BuildRequires:	openssl-devel
-BuildRequires:	python-devel
-BuildRequires:	pcre-devel
-BuildRequires:	gettext-devel
-BuildRequires:	mysql-devel
-BuildRequires:	perl
-BuildRequires:	doxygen
-BuildRequires:	aspell-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libexif-devel
-BuildRequires:	readline-devel
-
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-BuildRequires:	liblcms-devel
-%else
-BuildRequires:	bzip2-devel
-BuildRequires:	lcms-devel
-
-BuildRequires:	libpaper-devel
-%endif
-
-# RUBY support
-%if 0%{?with_ruby}
-BuildRequires:	ruby ruby-devel >= 1.8.1
-%endif
-
-# FREETYPE support
-%if 0%{?suse_version} == 1140
-BuildRequires:	freetype2-devel
-%else
-BuildRequires:	freetype-devel
-%endif
-
-# LIBPNG support
-%if 0%{?mgaversion}
-BuildRequires:	%{_lib}png-devel
-%endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}png15-devel
-%endif
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libpng-devel
-%endif
-
-# GRAPHICSMAGICK support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_graphicsmagick 1
-%if 0%{?suse_version}
-BuildRequires:	GraphicsMagick >= 1.1.0
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	GraphicsMagick-devel >= 1.1.0
-%endif
-%endif
-
-# UTEMPTER support
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libutempter-devel
-%endif
-
-# POSTGRESQL support
-#  Requires 'libpqxx', for kexi-driver-pgqsl
-%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%define with_postgresql 1
-BuildRequires:	postgresql-devel
-BuildRequires:	libpqxx-devel
-%endif
-Obsoletes:		trinity-libpqxx
-
-# WPD support
-#  For chalk and filters
-BuildRequires:	libwpd-devel
-Obsoletes:		trinity-libwpd
-
-# WV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}wv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	wv2-devel
-%endif
-
-# MESA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
-%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires:	Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
-%endif
-
-# OPENJPEG
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}openjpeg-devel
-%endif
-
-# LIBXI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-%endif
-
-
-%description
-KOffice is an integrated office suite.
-
-##########
-
-%package suite
-Summary:		An integrated office suite
-Group:			Applications/Productivity
-Obsoletes:      %{name} <= %{version}-%{release}
-Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:		%{name}-core = %{version}-%{release} 
-Requires:		%{name}-kword = %{version}-%{release} 
-Requires:		%{name}-kspread = %{version}-%{release} 
-Requires:		%{name}-kpresenter = %{version}-%{release}
-Requires:		%{name}-kivio = %{version}-%{release}
-Requires:		%{name}-karbon = %{version}-%{release}
-Requires:		%{name}-kugar = %{version}-%{release}
-Requires:		%{name}-kexi = %{version}-%{release}
-Requires:		%{name}-kexi-driver-mysql = %{version}-%{release}
-%{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}}
-Requires:		%{name}-kchart = %{version}-%{release}
-Requires:		%{name}-kformula = %{version}-%{release}
-Requires:		%{name}-filters = %{version}-%{release}
-Requires:		%{name}-kplato = %{version}-%{release}
-Requires:		%{name}-chalk = %{version}-%{release}
-
-%description suite
-KOffice is an integrated office suite.
-
-%files suite
-#empty => virtual package
-
-##########
-
-%package core
-Summary:		Core support files for %{name} 
-Group:			Applications/Productivity
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		perl
-
-%description core
-%{summary}.
-
-%posttrans core
-gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
-%post core
-touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || :
-
-%postun core
-if [ $1 -eq 0 ]; then
-  gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-  update-desktop-database -q &> /dev/null ||:
-fi
-
-%files core
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/koshell
-%{tde_bindir}/kthesaurus
-%{tde_bindir}/koconverter
-%{tde_libdir}/libkdeinit_koshell.so
-%{tde_libdir}/libkdeinit_kthesaurus.so
-%{tde_tdelibdir}/kfile_koffice.*
-%{tde_tdelibdir}/kfile_ooo.*
-%{tde_tdelibdir}/kfile_abiword.*
-%{tde_tdelibdir}/kfile_gnumeric.*
-%{tde_tdelibdir}/kodocinfopropspage.*
-%{tde_tdelibdir}/kofficescan.*
-%{tde_tdelibdir}/kofficethumbnail.*
-%{tde_tdelibdir}/koshell.*
-%{tde_tdelibdir}/kthesaurus.*
-%{tde_tdelibdir}/kwmailmerge_classic.*
-%{tde_tdelibdir}/kwmailmerge_kabc.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
-%{tde_tdelibdir}/libkounavailpart.*
-%{tde_tdelibdir}/libkprkword.*
-%{tde_tdelibdir}/libthesaurustool.*
-%{tde_tdelibdir}/clipartthumbnail.*
-%{tde_datadir}/apps/koffice/
-%{tde_datadir}/apps/konqueror/servicemenus/*
-%{tde_datadir}/apps/koshell/
-%{tde_datadir}/apps/thesaurus/
-%{tde_datadir}/config.kcfg/koshell.kcfg
-%{tde_tdedocdir}/HTML/en/koffice/
-%{tde_tdedocdir}/HTML/en/koshell/
-%{tde_tdedocdir}/HTML/en/thesaurus/
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/services/clipartthumbnail.desktop
-%{tde_datadir}/services/kfile*.desktop
-%{tde_datadir}/services/kwmailmerge*.desktop
-%{tde_datadir}/services/kodocinfopropspage.desktop
-%{tde_datadir}/services/kofficethumbnail.desktop
-%{tde_datadir}/services/kounavail.desktop
-%{tde_datadir}/services/kprkword.desktop
-%{tde_datadir}/services/thesaurustool.desktop
-%{tde_datadir}/servicetypes/kochart.desktop
-%{tde_datadir}/servicetypes/kofficepart.desktop
-%{tde_datadir}/servicetypes/koplugin.desktop
-%{tde_datadir}/servicetypes/kwmailmerge.desktop
-%{tde_datadir}/servicetypes/widgetfactory.desktop
-%{tde_tdeappdir}/*koffice.desktop
-%{tde_tdeappdir}/*KThesaurus.desktop
-%{tde_tdeappdir}/*koshell.desktop
-%{tde_datadir}/apps/kofficewidgets/
-%if 0%{?with_kross}
-%{tde_datadir}/apps/kross/
-%{tde_tdelibdir}/krosspython.*
-%if 0%{?with_ruby}
-%{tde_tdelibdir}/krossruby.*
-%endif
-%endif
-
-##########
-
-%package libs
-Summary:		Runtime libraries for %{name} 
-Group:			System Environment/Libraries
-Conflicts:      %{name} <= %{version}-%{release}
-Requires:		trinity-tdelibs
-License:		LGPLv2+
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{tde_libdir}/libkarboncommon.so.*
-%{tde_libdir}/libkspreadcommon.so.*
-%{tde_libdir}/libkdchart.so.*
-%{tde_libdir}/libkochart.so.*
-%{tde_libdir}/libkofficecore.so.*
-%{tde_libdir}/libkofficeui.so.*
-%{tde_libdir}/libkotext.so.*
-%{tde_libdir}/libkowmf.so.*
-%{tde_libdir}/libkopainter.so.*
-%{tde_libdir}/libkstore.so.*
-%{tde_libdir}/libkwmailmerge_interface.so.*
-%{tde_libdir}/libkwmf.so.*
-%{tde_libdir}/libkformulalib.so.*
-%{tde_libdir}/libkopalette.so.*
-%{tde_libdir}/libkoproperty.so.*
-%if 0%{?with_kross}
-%{tde_libdir}/libkrossapi.so.*
-%{tde_libdir}/libkrossmain.so.*
-%endif
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:		Development files for %{name} 
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
-License:		LGPLv2+
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
-%{tde_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkdeinit_*.so
-%exclude %{tde_libdir}/libkudesignercore.so
-
-##########
-
-%package kword
-Summary:		A frame-based word processor capable of professional standard documents
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kword
-%{summary}.
-
-%post kword
-/sbin/ldconfig || :
-
-%postun kword
-/sbin/ldconfig || :
-
-%posttrans kword
-update-desktop-database -q &> /dev/null ||:
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kword/
-%{tde_bindir}/kword
-%{tde_libdir}/libkdeinit_kword.so
-%{tde_libdir}/libkwordprivate.so.*
-%{tde_tdelibdir}/libkwordpart.*
-%{tde_tdelibdir}/kword.*
-%{tde_datadir}/apps/kword/
-%{tde_datadir}/services/kword*.desktop
-%{tde_datadir}/services/kwserial*.desktop
-%{tde_datadir}/templates/TextDocument.desktop
-%{tde_datadir}/templates/.source/TextDocument.kwt
-%{tde_tdeappdir}/*kword.desktop
-
-##########
-
-%package kspread
-Summary:		A powerful spreadsheet application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kspread
-%{summary}.
-
-%files kspread
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
-%{tde_bindir}/kspread
-%{tde_libdir}/libkdeinit_kspread.so
-%{tde_tdelibdir}/kspread.*
-%{tde_tdelibdir}/libkspreadpart.*
-%{tde_tdelibdir}/kwmailmerge_kspread.*
-%{tde_tdelibdir}/libcsvexport.*
-%{tde_tdelibdir}/libcsvimport.*
-%{tde_tdelibdir}/libgnumericexport.*
-%{tde_tdelibdir}/libgnumericimport.*
-%{tde_tdelibdir}/libkspreadhtmlexport.*
-%{tde_tdelibdir}/libkspreadinsertcalendar.*
-%{tde_tdelibdir}/libopencalcexport.*
-%{tde_tdelibdir}/libopencalcimport.*
-%{tde_tdelibdir}/libqproimport.*
-%{tde_datadir}/apps/kspread/
-%{tde_datadir}/services/kspread*.desktop
-%{tde_datadir}/templates/SpreadSheet.desktop
-%{tde_datadir}/templates/.source/SpreadSheet.kst
-%{tde_tdeappdir}/*kspread.desktop
-%if 0%{?with_kross}
-%{tde_tdelibdir}/kspreadscripting.*
-%{tde_tdelibdir}/krosskspreadcore.*
-%endif
-
-##########
-
-%package kpresenter
-Summary:		A full-featured presentation program
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kpresenter
-%{summary}.
-
-%post kpresenter
-/sbin/ldconfig || :
-
-%postun kpresenter
-/sbin/ldconfig || :
-
-%posttrans kpresenter
-update-desktop-database -q &> /dev/null ||:
-
-%files kpresenter
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
-%{tde_bindir}/kpresenter
-%{tde_bindir}/kprconverter.pl
-%{tde_libdir}/libkdeinit_kpresenter.so
-%{tde_libdir}/libkpresenterimageexport.so.*
-%{tde_libdir}/libkpresenterprivate.so.*
-%{tde_tdelibdir}/*kpresenter*.*
-%{tde_datadir}/apps/kpresenter/
-%{tde_datadir}/services/kpresenter*.desktop
-%{tde_datadir}/templates/Presentation.desktop
-%{tde_datadir}/templates/.source/Presentation.kpt
-%{tde_tdeappdir}/*kpresenter.desktop
-
-##########
-
-%package kivio
-Summary:		A flowcharting application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
-
-%description kivio
-%{summary}.
-
-%files kivio
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
-%{tde_bindir}/kivio
-%{tde_libdir}/libkdeinit_kivio.so
-%{tde_libdir}/libkiviocommon.so.*
-%{tde_tdelibdir}/*kivio*.*
-%{tde_tdelibdir}/straight_connector.*
-%{tde_datadir}/apps/kivio/
-%{tde_datadir}/config.kcfg/kivio.kcfg
-%{tde_datadir}/services/kivio*.desktop
-%{tde_tdeappdir}/*kivio.desktop
-
-##########
-
-%package karbon
-Summary:		A vector drawing application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description karbon
-%{summary}.
-
-%post karbon
-/sbin/ldconfig || :
-
-%postun karbon
-/sbin/ldconfig || :
-
-%files karbon
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
-%{tde_bindir}/karbon
-%{tde_libdir}/libkdeinit_karbon.so
-%{tde_tdelibdir}/*karbon*.*
-%{tde_tdelibdir}/libwmfexport.*
-%{tde_tdelibdir}/libwmfimport.*
-%{tde_datadir}/apps/karbon/
-%{tde_datadir}/services/karbon*
-%{tde_datadir}/servicetypes/karbon_module.desktop
-%{tde_datadir}/templates/Illustration.desktop
-%{tde_datadir}/templates/.source/Illustration.karbon
-%{tde_tdeappdir}/*karbon.desktop
-
-##########
-
-%package kugar
-Summary:		A tool for generating business quality reports
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kugar
-%{summary}.
-
-%post kugar
-/sbin/ldconfig || :
-
-%postun kugar
-/sbin/ldconfig || :
-
-%posttrans kugar
-update-desktop-database -q &> /dev/null ||:
-
-%files kugar
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
-%{tde_bindir}/kugar
-%{tde_bindir}/kudesigner
-%{tde_libdir}/libkdeinit_kugar.so
-%{tde_libdir}/libkdeinit_kudesigner.so
-%{tde_libdir}/libkugarlib.so.*
-%{tde_libdir}/libkudesignercore.so
-%{tde_tdelibdir}/kudesigner.*
-%{tde_tdelibdir}/kugar.*
-%{tde_tdelibdir}/libkudesignerpart.*
-%{tde_tdelibdir}/libkugarpart.*
-%{tde_datadir}/apps/kudesigner/
-%{tde_datadir}/apps/kugar/
-%{tde_datadir}/services/kugar*.desktop
-%{tde_tdeappdir}/*kugar.desktop
-%{tde_tdeappdir}/*kudesigner.desktop
-
-##########
-
-%package kexi
-Summary:		An integrated environment for managing data
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%if 0%{?with_postgresql} == 0
-Obsoletes:		%{name}-kexi-driver-pgsql
-%endif
-
-%description kexi
-%{summary}.
-For additional database drivers take a look at %{name}-kexi-driver-*
-
-%post kexi
-/sbin/ldconfig || :
-
-%postun kexi
-/sbin/ldconfig || :
-
-%posttrans kexi
-update-desktop-database -q &> /dev/null ||:
-
-%files kexi
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
-%{tde_bindir}/kexi*
-%{tde_bindir}/ksqlite*
-%{tde_libdir}/libkdeinit_kexi.so
-%{tde_libdir}/libkexi*.so.*
-%{tde_libdir}/libkformdesigner.so.*
-%{tde_tdelibdir}/kformdesigner_*.*
-%{tde_tdelibdir}/kexidb_sqlite2driver.*
-%{tde_tdelibdir}/kexidb_sqlite3driver.*
-%{tde_tdelibdir}/kexihandler_*.*
-%{tde_tdelibdir}/kexi.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_datadir}/config/kexirc
-%{tde_datadir}/config/magic/kexi.magic
-%{tde_datadir}/mimelnk/application/*
-%{tde_datadir}/servicetypes/kexi*.desktop
-%{tde_datadir}/services/kexi/
-%{tde_datadir}/apps/kexi/
-%{tde_datadir}/services/kformdesigner/*
-%{tde_tdeappdir}/*kexi.desktop
-%{tde_datadir}/services/kexidb_sqlite*driver.desktop
-%if 0%{?with_kross}
-%{tde_bindir}/krossrunner
-%{tde_tdelibdir}/krosskexiapp.*
-%{tde_tdelibdir}/krosskexidb.*
-%endif
-
-##########
-
-%package kexi-driver-mysql
-Summary:		Mysql-driver for kexi
-Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{version}-%{release}
-
-%description kexi-driver-mysql
-%{summary}.
-
-%files kexi-driver-mysql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_mysqldriver.*
-%{tde_tdelibdir}/keximigrate_mysql.*
-%{tde_datadir}/services/keximigrate_mysql.desktop
-%{tde_datadir}/services/kexidb_mysqldriver.desktop
-
-##########
-
-%if 0%{?with_postgresql}
-
-%package kexi-driver-pgsql
-Summary:		Postgresql driver for kexi
-Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{version}-%{release}
-
-%description kexi-driver-pgsql
-%{summary}.
-
-%files kexi-driver-pgsql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
-%{tde_tdelibdir}/keximigrate_pqxx.*
-%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{tde_datadir}/services/keximigrate_pqxx.desktop
-
-%endif
-
-##########
-
-%package kchart
-Summary:		An integrated graph and chart drawing tool
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kchart
-%{summary}.
-
-%post kchart
-/sbin/ldconfig || :
-
-%postun kchart
-/sbin/ldconfig || :
-
-%posttrans kchart
-update-desktop-database -q &> /dev/null ||:
-
-%files kchart
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
-%{tde_bindir}/kchart
-%{tde_libdir}/libkchart*.so.*
-%{tde_libdir}/libkdeinit_kchart.so
-%{tde_tdelibdir}/*kchart*.*
-%{tde_datadir}/apps/kchart/
-%{tde_datadir}/services/kchart*.desktop
-%{tde_tdeappdir}/*kchart.desktop
-
-##########
-
-%package kformula
-Summary:		A powerful formula editor
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		fonts-ttf-dejavu
-%else
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires:		dejavu-lgc-sans-fonts
-Requires:		lyx-cmex10-fonts
-%endif
-%if 0%{?rhel} == 5
-Requires:		dejavu-lgc-fonts 
-Requires:		lyx-cmex10-fonts
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:		dejavu-fonts 
-%endif
-%if 0%{?suse_version} == 1140
-Requires:		dejavu
-%endif
-%endif
-
-%description kformula
-%{summary}.
-
-%files kformula
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
-%{tde_bindir}/kformula
-%{tde_libdir}/libkdeinit_kformula.so
-%{tde_tdelibdir}/*kformula*.*
-%{tde_datadir}/apps/kformula/
-%{tde_datadir}/services/kformula*.desktop
-%{tde_tdeappdir}/*kformula.desktop
-
-##########
-
-%package filters
-Summary:		Import and Export Filters for KOffice
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description filters
-%{summary}.
-
-%post filters
-/sbin/ldconfig || :
-
-%postun filters
-/sbin/ldconfig || :
-
-%files filters
-%defattr(-,root,root,-)
-%{tde_libdir}/libkwordexportfilters.so.*
-%{tde_tdelibdir}/libabiwordexport.*
-%{tde_tdelibdir}/libabiwordimport.*
-%{tde_tdelibdir}/libamiproexport.*
-%{tde_tdelibdir}/libamiproimport.*
-%{tde_tdelibdir}/libapplixspreadimport.*
-%{tde_tdelibdir}/libapplixwordimport.*
-%{tde_tdelibdir}/libasciiexport.*
-%{tde_tdelibdir}/libasciiimport.*
-%{tde_tdelibdir}/libdbaseimport.*
-%{tde_tdelibdir}/libdocbookexport.*
-%{tde_tdelibdir}/libexcelimport.*
-%{tde_tdelibdir}/libgenerickofilter.*
-%{tde_tdelibdir}/libhtmlexport.*
-%{tde_tdelibdir}/libhtmlimport.*
-%{tde_tdelibdir}/libkarbonepsimport.*
-%{tde_tdelibdir}/libkfolatexexport.*
-%{tde_tdelibdir}/libkfomathmlexport.*
-%{tde_tdelibdir}/libkfomathmlimport.*
-%{tde_tdelibdir}/libkfopngexport.*
-%{tde_tdelibdir}/libkspreadlatexexport.*
-%{tde_tdelibdir}/libkugarnopimport.*
-%{tde_tdelibdir}/libkwordkword1dot3import.*
-%{tde_tdelibdir}/libkwordlatexexport.*
-%{tde_tdelibdir}/libmswriteexport.*
-%{tde_tdelibdir}/libmswriteimport.*
-%{tde_tdelibdir}/libooimpressexport.*
-%{tde_tdelibdir}/libooimpressimport.*
-%{tde_tdelibdir}/liboowriterexport.*
-%{tde_tdelibdir}/liboowriterimport.*
-%{tde_tdelibdir}/libpalmdocexport.*
-%{tde_tdelibdir}/libpalmdocimport.*
-%{tde_tdelibdir}/libpdfimport.*
-%{tde_tdelibdir}/librtfexport.*
-%{tde_tdelibdir}/librtfimport.*
-%{tde_tdelibdir}/libwmlexport.*
-%{tde_tdelibdir}/libwmlimport.*
-%{tde_tdelibdir}/libwpexport.*
-%{tde_tdelibdir}/libwpimport.*
-%{tde_tdelibdir}/libmswordimport.*
-%{tde_tdelibdir}/libxsltimport.*
-%{tde_tdelibdir}/libxsltexport.*
-%{tde_tdelibdir}/libhancomwordimport.*
-%{tde_tdelibdir}/libkfosvgexport.*
-%{tde_tdelibdir}/liboodrawimport.*
-%{tde_tdelibdir}/libolefilter.*
-%{tde_datadir}/apps/xsltfilter/
-%{tde_datadir}/services/generic_filter.desktop
-%{tde_datadir}/services/ole_powerpoint97_import.desktop
-%{tde_datadir}/services/xslt*.desktop
-%{tde_datadir}/servicetypes/kofilter*.desktop
-
-##########
-
-%package kplato
-Summary:		An integrated project management and planning tool
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-
-%description kplato
-%{summary}.
-
-%files kplato
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
-%{tde_bindir}/kplato
-%{tde_libdir}/libkdeinit_kplato.so
-%{tde_tdelibdir}/kplato.*
-%{tde_tdelibdir}/libkplatopart.*
-%{tde_datadir}/apps/kplato/
-%{tde_datadir}/services/kplatopart.desktop
-%{tde_tdeappdir}/*kplato.desktop
-
-##########
-
-%package chalk
-Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-Requires:		%{name}-chalk-data = %{version}-%{release}
-Requires:		%{name}-filters
-
-%description chalk
-Chalk is a painting and image editing application for KOffice. Chalk contains
-both ease-of-use and fun features like guided painting.
-
-This package is part of the TDE Office Suite.
-
-%post chalk
-/sbin/ldconfig || :
-
-%postun chalk
-/sbin/ldconfig || :
-
-%posttrans chalk
-update-desktop-database -q &> /dev/null ||:
-
-%files chalk
-%defattr(-,root,root,-)
-%{tde_bindir}/chalk
-%{tde_tdelibdir}/chalkblurfilter.la
-%{tde_tdelibdir}/chalkblurfilter.so
-%{tde_tdelibdir}/chalkbumpmap.la
-%{tde_tdelibdir}/chalkbumpmap.so
-%{tde_tdelibdir}/chalkcimg.la
-%{tde_tdelibdir}/chalkcimg.so
-%{tde_tdelibdir}/chalk_cmyk_*
-%{tde_tdelibdir}/chalkcmykplugin.la
-%{tde_tdelibdir}/chalkcmykplugin.so
-%{tde_tdelibdir}/chalkcolorify.la
-%{tde_tdelibdir}/chalkcolorify.so
-%{tde_tdelibdir}/chalkcolorrange.la
-%{tde_tdelibdir}/chalkcolorrange.so
-%{tde_tdelibdir}/chalkcolorsfilters.la
-%{tde_tdelibdir}/chalkcolorsfilters.so
-%{tde_tdelibdir}/chalkcolorspaceconversion.la
-%{tde_tdelibdir}/chalkcolorspaceconversion.so
-%{tde_tdelibdir}/chalkconvolutionfilters.la
-%{tde_tdelibdir}/chalkconvolutionfilters.so
-%{tde_tdelibdir}/chalkdefaultpaintops.la
-%{tde_tdelibdir}/chalkdefaultpaintops.so
-%{tde_tdelibdir}/chalkdefaulttools.la
-%{tde_tdelibdir}/chalkdefaulttools.so
-%{tde_tdelibdir}/chalkdropshadow.la
-%{tde_tdelibdir}/chalkdropshadow.so
-%{tde_tdelibdir}/chalkembossfilter.la
-%{tde_tdelibdir}/chalkembossfilter.so
-%{tde_tdelibdir}/chalkexample.la
-%{tde_tdelibdir}/chalkexample.so
-%{tde_tdelibdir}/chalkextensioncolorsfilters.la
-%{tde_tdelibdir}/chalkextensioncolorsfilters.so
-%{tde_tdelibdir}/chalkfastcolortransfer.la
-%{tde_tdelibdir}/chalkfastcolortransfer.so
-%{tde_tdelibdir}/chalkfiltersgallery.la
-%{tde_tdelibdir}/chalkfiltersgallery.so
-%{tde_tdelibdir}/chalk_gray_*
-%{tde_tdelibdir}/chalkgrayplugin.la
-%{tde_tdelibdir}/chalkgrayplugin.so
-%{tde_tdelibdir}/chalkhistogramdocker.la
-%{tde_tdelibdir}/chalkhistogramdocker.so
-%{tde_tdelibdir}/chalkhistogram.la
-%{tde_tdelibdir}/chalkhistogram.so
-%{tde_tdelibdir}/chalkimageenhancement.la
-%{tde_tdelibdir}/chalkimageenhancement.so
-%{tde_tdelibdir}/chalkimagesize.la
-%{tde_tdelibdir}/chalkimagesize.so
-%{tde_tdelibdir}/chalk.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.so
-%{tde_tdelibdir}/chalklevelfilter.la
-%{tde_tdelibdir}/chalklevelfilter.so
-%{tde_tdelibdir}/chalk_lms_*
-%{tde_tdelibdir}/chalkmodifyselection.la
-%{tde_tdelibdir}/chalkmodifyselection.so
-%{tde_tdelibdir}/chalknoisefilter.la
-%{tde_tdelibdir}/chalknoisefilter.so
-%{tde_tdelibdir}/chalkoilpaintfilter.la
-%{tde_tdelibdir}/chalkoilpaintfilter.so
-%{tde_tdelibdir}/chalkpixelizefilter.la
-%{tde_tdelibdir}/chalkpixelizefilter.so
-%{tde_tdelibdir}/chalkraindropsfilter.la
-%{tde_tdelibdir}/chalkraindropsfilter.so
-%{tde_tdelibdir}/chalkrandompickfilter.la
-%{tde_tdelibdir}/chalkrandompickfilter.so
-%{tde_tdelibdir}/chalk_rgb_*
-%{tde_tdelibdir}/chalkrgbplugin.la
-%{tde_tdelibdir}/chalkrgbplugin.so
-%{tde_tdelibdir}/chalkrotateimage.la
-%{tde_tdelibdir}/chalkrotateimage.so
-%{tde_tdelibdir}/chalkroundcornersfilter.la
-%{tde_tdelibdir}/chalkroundcornersfilter.so
-%{tde_tdelibdir}/chalkselectiontools.la
-%{tde_tdelibdir}/chalkselectiontools.so
-%{tde_tdelibdir}/chalkselectopaque.la
-%{tde_tdelibdir}/chalkselectopaque.so
-%{tde_tdelibdir}/chalkseparatechannels.la
-%{tde_tdelibdir}/chalkseparatechannels.so
-%{tde_tdelibdir}/chalkshearimage.la
-%{tde_tdelibdir}/chalkshearimage.so
-%{tde_tdelibdir}/chalksmalltilesfilter.la
-%{tde_tdelibdir}/chalksmalltilesfilter.so
-%{tde_tdelibdir}/chalk.so
-%{tde_tdelibdir}/chalkscreenshot.la
-%{tde_tdelibdir}/chalkscreenshot.so
-%{tde_tdelibdir}/chalksobelfilter.la
-%{tde_tdelibdir}/chalksobelfilter.so
-%{tde_tdelibdir}/chalksubstrate.la
-%{tde_tdelibdir}/chalksubstrate.so
-%{tde_tdelibdir}/chalktoolcrop.la
-%{tde_tdelibdir}/chalktoolcrop.so
-%{tde_tdelibdir}/chalktoolcurves.la
-%{tde_tdelibdir}/chalktoolcurves.so
-%{tde_tdelibdir}/chalktoolfilter.la
-%{tde_tdelibdir}/chalktoolfilter.so
-%{tde_tdelibdir}/chalktoolperspectivegrid.la
-%{tde_tdelibdir}/chalktoolperspectivegrid.so
-%{tde_tdelibdir}/chalktoolperspectivetransform.la
-%{tde_tdelibdir}/chalktoolperspectivetransform.so
-%{tde_tdelibdir}/chalktoolpolygon.la
-%{tde_tdelibdir}/chalktoolpolygon.so
-%{tde_tdelibdir}/chalktoolpolyline.la
-%{tde_tdelibdir}/chalktoolpolyline.so
-%{tde_tdelibdir}/chalktoolselectsimilar.la
-%{tde_tdelibdir}/chalktoolselectsimilar.so
-%{tde_tdelibdir}/chalktoolstar.la
-%{tde_tdelibdir}/chalktoolstar.so
-%{tde_tdelibdir}/chalktooltransform.la
-%{tde_tdelibdir}/chalktooltransform.so
-%{tde_tdelibdir}/chalkunsharpfilter.la
-%{tde_tdelibdir}/chalkunsharpfilter.so
-%{tde_tdelibdir}/chalkwavefilter.la
-%{tde_tdelibdir}/chalkwavefilter.so
-%{tde_tdelibdir}/chalkwetplugin.la
-%{tde_tdelibdir}/chalkwetplugin.so
-%{tde_tdelibdir}/chalk_ycbcr_*
-%if 0%{?with_graphicsmagick}
-%{tde_tdelibdir}/libchalkgmagickexport.la
-%{tde_tdelibdir}/libchalkgmagickexport.so
-%{tde_tdelibdir}/libchalkgmagickimport.la
-%{tde_tdelibdir}/libchalkgmagickimport.so
-%{tde_tdelibdir}/libchalkjpegexport.la
-%{tde_tdelibdir}/libchalkjpegexport.so
-%{tde_tdelibdir}/libchalkjpegimport.la
-%{tde_tdelibdir}/libchalkjpegimport.so
-%endif
-%{tde_tdelibdir}/libchalk_openexr_export.la
-%{tde_tdelibdir}/libchalk_openexr_export.so
-%{tde_tdelibdir}/libchalk_openexr_import.la
-%{tde_tdelibdir}/libchalk_openexr_import.so
-%{tde_tdelibdir}/libchalkpart.la
-%{tde_tdelibdir}/libchalkpart.so
-%{tde_tdelibdir}/libchalkpdfimport.la
-%{tde_tdelibdir}/libchalkpdfimport.so
-%{tde_tdelibdir}/libchalkpngexport.la
-%{tde_tdelibdir}/libchalkpngexport.so
-%{tde_tdelibdir}/libchalkpngimport.la
-%{tde_tdelibdir}/libchalkpngimport.so
-%{tde_tdelibdir}/libchalk_raw_import.la
-%{tde_tdelibdir}/libchalk_raw_import.so
-%if 0%{?with_graphicsmagick}
-%{tde_tdelibdir}/libchalktiffexport.la
-%{tde_tdelibdir}/libchalktiffexport.so
-%{tde_tdelibdir}/libchalktiffimport.la
-%{tde_tdelibdir}/libchalktiffimport.so
-%endif
-%{tde_libdir}/libkdeinit_chalk.so
-%{tde_libdir}/libchalk_cmyk_*.so.*
-%{tde_libdir}/libchalkcolor.so.*
-%{tde_libdir}/libchalkcommon.so.*
-%{tde_libdir}/libchalkgrayscale.so.*
-%{tde_libdir}/libchalk_gray_*.so.*
-%{tde_libdir}/libchalkimage.so.*
-%{tde_libdir}/libchalk_lms_*.so.*
-%{tde_libdir}/libchalk_rgb_*.so.*
-%{tde_libdir}/libchalkrgb.so.*
-%{tde_libdir}/libchalkui.so.*
-%{tde_libdir}/libchalk_ycbcr_*.so.*
-%if 0%{?with_kross}
-%{tde_tdelibdir}/krosschalkcore.la
-%{tde_tdelibdir}/krosschalkcore.so
-%{tde_tdelibdir}/chalkscripting.la
-%{tde_tdelibdir}/chalkscripting.so
-%{tde_libdir}/libchalkscripting.so.*
-%endif
-
-##########
-
-%package chalk-data
-Summary:		data files for Chalk painting program [Trinity]
-Group:			Applications/Productivity
-
-%description chalk-data
-This package contains architecture-independent data files for Chalk,
-the painting program shipped with the TDE Office Suite.
-
-See the chalk package for further information.
-
-This package is part of the TDE Office Suite.
-
-%files chalk-data
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/chalk.desktop
-%{tde_datadir}/applnk/.hidden/chalk_*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
-%{tde_datadir}/apps/chalk/
-%{tde_datadir}/apps/chalkplugins/
-%lang(en) %{tde_tdedocdir}/HTML/en/chalk/
-%{tde_datadir}/icons/hicolor/*/apps/chalk.png
-%{tde_datadir}/services/chalk*.desktop
-%{tde_datadir}/servicetypes/chalk*.desktop
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# use LGC variant instead
-%__sed -i.dejavu-lgc \
-  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
-  -e 's|dejavu sans|dejavu lgc sans|' \
-  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR="%{tde_prefix}"
-
-%if 0%{?suse_version} == 1220
-RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
-export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-libs=%{tde_libdir} \
-  --with-extra-includes=%{tde_includedir}/arts \
-  \
-  --disable-kexi-macros \
-  %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
-  %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Moves menu elements to XDG folder
-desktop-file-install \
-  --dir=%{buildroot}%{tde_tdeappdir} \
-  --vendor="" \
-  --delete-original \
-  %{buildroot}%{tde_datadir}/applnk/Office/*.desktop
-
-# Replace absolute symlinks with relative ones
-pushd %{buildroot}%{tde_tdedocdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
-  fi
-done
-popd
-
-
-## unpackaged files
-# fonts
-rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
-# libtool archives
-rm -f %{buildroot}%{tde_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-# -devel symlinks to nuke
-rm -f %{buildroot}%{tde_libdir}/lib*common.so
-rm -f %{buildroot}%{tde_libdir}/lib*filters.so
-rm -f %{buildroot}%{tde_libdir}/lib*private.so
-rm -f %{buildroot}%{tde_libdir}/libkarbon*.so
-rm -f %{buildroot}%{tde_libdir}/libkchart*.so
-rm -f %{buildroot}%{tde_libdir}/libkexi*.so
-rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{tde_libdir}/libkplato*.so
-rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so
-rm -f %{buildroot}%{tde_libdir}/libkword*.so
-rm -f %{buildroot}%{tde_libdir}/libkross*.so
-rm -f %{buildroot}%{tde_libdir}/libkugar*.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/koffice/koffice-3.5.13.spec b/redhat/applications/koffice/koffice-3.5.13.spec
deleted file mode 100644
index 803407cb6..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.spec
+++ /dev/null
@@ -1,1081 +0,0 @@
-# Default version for this component
-%define kdecomp koffice
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_kross 1
-%endif
-
-%if 0%{?fedora} >= 17
-%define with_ruby 0
-%else
-%define with_ruby 1
-%endif
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-
-Name:		trinity-%{kdecomp}
-Summary:	An integrated office suite
-Version:	1.6.3
-Release:	5%{?dist}%{?_variant}
-
-Group:          Applications/Productivity
-License:        GPLv2+
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source100:      koshell.png
-
-# [lib/kross/python/scripts/RestrictedPython/Utilities.py] Syntax error [Bug #679]
-Patch2:		koffice-3.5.13-kross_utilities_syntax.patch
-# [koffice/chalk] Fix GraphicksMagick 1.3 support [Bug #353]
-Patch3:		koffice-3.5.13-chalk_gmagick.patch
-# [koffice/kexi] Various patches for kexi, found on the web [Bug # 777]
-Patch5:		kexi-fix-possible-crash-in-buffered-mode-sqlite-2.patch
-Patch6:		kexi-hide_hourglass-1.1.3-2.patch
-Patch7:		kexi-fix-support-for-boolean-types-in-migration.patch
-Patch8:		kexi-mysql_migrate_long_text-1.1.3.patch
-Patch9:		kexi-fix-support-for-boolean-types.patch
-Patch10:	kexi-thoushand_objects_support-1.1.3-2.patch
-Patch11:	kexi-fp_expressions-1.1.3.patch
-# [koffice] Fix compilation with GCC 4.7 [Bug #958]
-Patch12:	koffice-3.5.13-fix_gcc47_compilation.patch
-# [koffice] Fix compilation with Ruby 1.9 [Bug #735]
-Patch13:	koffice-3.5.13-fix_ruby_1.9.patch 
-# [koffice] Fix compilation with libpng [Bug #603]
-Patch14:	koffice-3.5.13-fix_libpng.patch
-# [koffice] Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
-#  Clean up lib paths in LDFLAGS - moved to LIBADD
-#  For KWord and and KPresenter added linking kspell2
-#  For KSpread added linking kutils
-Patch15:	koffice-3.5.13-fix_bug_657.patch
-# [koffice] Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-Source1:	koffice-3.5.13-damaged_binary_files.tar.gz
-# [koffice] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch16:	koffice-3.5.13-missing_ldflags.patch
-
-# BuildRequires: world-devel ;)
-BuildRequires:  trinity-tdelibs-devel
-BuildRequires:  trinity-tdegraphics-devel
-BuildRequires:  automake libtool
-BuildRequires:  freetype-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  libart_lgpl-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  ImageMagick-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  zlib-devel
-BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  pcre-devel
-BuildRequires:  lcms-devel
-BuildRequires:  gettext-devel
-BuildRequires:  mysql-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  perl
-BuildRequires:  doxygen
-BuildRequires:  aspell-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  libexif-devel
-BuildRequires:  readline-devel
-%if 0%{?with_ruby}
-BuildRequires:  ruby ruby-devel >= 1.8.2
-%endif
-BuildRequires:  libpaper-devel
-BuildRequires:	libutempter-devel
-BuildRequires:	GraphicsMagick-devel >= 1.1.0
-
-BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel
-
-# These libraries are either too old or too recent on distributions !
-# We always provide our versions with TDE...
-BuildRequires:	trinity-libwpd-devel
-BuildRequires:  trinity-libpqxx-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-BuildRequires:	%{_lib}xi-devel
-BuildRequires:  wv2-devel
-%else
-BuildRequires:  libGL-devel
-BuildRequires:	libGLU-devel
-BuildRequires:  libXi-devel
-BuildRequires:  trinity-wv2-devel
-%endif
-
-%description
-KOffice is an integrated office suite.
-
-%package suite
-Summary:        An integrated office suite
-Group:          Applications/Productivity
-Obsoletes:      %{name} <= %{version}-%{release}
-Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:       %{name}-core = %{version}-%{release} 
-Requires:       %{name}-kword = %{version}-%{release} 
-Requires:       %{name}-kspread = %{version}-%{release} 
-Requires:       %{name}-kpresenter = %{version}-%{release}
-Requires:       %{name}-kivio = %{version}-%{release}
-Requires:       %{name}-karbon = %{version}-%{release}
-Requires:       %{name}-kugar = %{version}-%{release}
-Requires:       %{name}-kexi = %{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{version}-%{release}
-Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}
-Requires:       %{name}-kchart = %{version}-%{release}
-Requires:       %{name}-kformula = %{version}-%{release}
-Requires:       %{name}-filters = %{version}-%{release}
-Requires:       %{name}-kplato = %{version}-%{release}
-Requires:       %{name}-chalk = %{version}-%{release}
-
-%description suite
-KOffice is an integrated office suite.
-
-%package core
-Summary:        Core support files for %{name} 
-Group:          Applications/Productivity
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       perl
-Conflicts:      koffice-i18n < %{version}
-%description core
-%{summary}.
-
-%package libs
-Summary:        Runtime libraries for %{name} 
-Group:          System Environment/Libraries
-Conflicts:      %{name} <= %{version}-%{release}
-Requires:       trinity-kdelibs
-License:        LGPLv2+
-%description libs
-%{summary}.
-
-%package devel
-Summary:        Development files for %{name} 
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-License:        LGPLv2+
-%description devel
-%{summary}.
-
-%package kword
-Summary:	A frame-based word processor capable of professional standard documents
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kword
-%{summary}.
-
-%package kspread
-Summary:        A powerful spreadsheet application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kspread
-%{summary}.
-
-%package kpresenter
-Summary:        A full-featured presentation program
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kpresenter
-%{summary}.
-
-%package kivio
-Summary:        A flowcharting application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-Obsoletes:      kivio < %{version}-%{release}
-%description kivio
-%{summary}.
-
-%package karbon
-Summary:        A vector drawing application
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description karbon
-%{summary}.
-
-%package kugar
-Summary:        A tool for generating business quality reports
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kugar
-%{summary}.
-
-%package kexi
-Summary:        An integrated environment for managing data
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kexi
-%{summary}.
-For additional database drivers take a look at %{name}-kexi-driver-*
-
-%package kexi-driver-mysql
-Summary:        Mysql-driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-mysql
-%{summary}.
-
-%package kexi-driver-pgsql
-Summary:        Postgresql driver for kexi
-Group:          Applications/Productivity
-Requires:       %{name}-kexi = %{version}-%{release}
-%description kexi-driver-pgsql
-%{summary}.
-
-%package kchart
-Summary:        An integrated graph and chart drawing tool
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description kchart
-%{summary}.
-
-%package kformula
-Summary:        A powerful formula editor
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		fonts-ttf-dejavu
-%else
-Requires:       lyx-cmex10-fonts
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-Requires:       dejavu-lgc-sans-fonts
-%else
-Requires:       dejavu-lgc-fonts 
-%endif
-%endif
-
-%description kformula
-%{summary}.
-
-%package filters
-Summary:        Import and Export Filters for KOffice
-Group:          Applications/Productivity
-Requires:       %{name}-core = %{version}-%{release}
-%description filters
-%{summary}.
-
-%package kplato
-Summary:         An integrated project management and planning tool
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-%description kplato
-%{summary}.
-
-%package chalk
-Summary:		 pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:           Applications/Productivity
-Requires:        %{name}-core = %{version}-%{release}
-Requires:        %{name}-chalk-data = %{version}-%{release}
-Requires:        %{name}-filters
-%description chalk
-Chalk is a painting and image editing application for KOffice. Chalk contains
-both ease-of-use and fun features like guided painting.
-
-This package is part of the TDE Office Suite.
-
-%package chalk-data
-Summary:		data files for Chalk painting program [Trinity]
-Group:           Applications/Productivity
-%description chalk-data
-This package contains architecture-independent data files for Chalk,
-the painting program shipped with the TDE Office Suite.
-
-See the chalk package for further information.
-
-This package is part of the TDE Office Suite.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%setup -q -n applications/%{kdecomp} -a 1
-
-#patch0 -p1
-#patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p1 -b .gcc47
-%if 0%{?fedora} >= 17
-%patch13 -p1 -b .ruby
-%patch14 -p1 -b .libpng
-%endif
-%patch15 -p1
-%patch16 -p1
-
-# use LGC variant instead
-%__sed -i.dejavu-lgc \
-  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
-  -e 's|dejavu sans|dejavu lgc sans|' \
-  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --with-pic --enable-shared --disable-static \
-  --with-extra-libs=%{tde_libdir} \
-  --enable-final \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \
-  --enable-closure \
-  --disable-kexi-macros \
-  --with-pqxx-includes=%{tde_includedir} \
-  --with-pqxx-libraries=%{tde_libdir} \
-%if 0%{?with_kross} > 0
-  --enable-scripting \
-%else
-  --disable-scripting \
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-[ ! -f %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
-%__install -p -D -m644 %{SOURCE100} %{buildroot}%{tde_datadir}/icons/hicolor/48x48/apps/koshell.png
-
-# Replace absolute symlinks with relative ones
-pushd %{buildroot}%{tde_tdedocdir}/HTML
-for lang in *; do
-  if [ -d $lang ]; then
-    pushd $lang
-    for i in */*; do
-      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
-    done
-    popd
-  fi
-done
-popd
-
-desktop-file-install \
-  --dir=%{buildroot}%{tde_tdeappdir} \
-  --vendor="" \
-  --delete-original \
-  %{buildroot}%{tde_datadir}/applnk/Office/*.desktop
-
-## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
-## until http://bugzilla.redhat.com/245190 is fixed
-%if 0%{?rhel} || 0%{?fedora}
-for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do
-  grep "^NoDisplay=" ${desktop_file} || \
-    echo "NoDisplay=True" >> ${desktop_file}
-done
-%endif
-
-## unpackaged files
-# fonts
-rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
-# libtool archives
-rm -f %{buildroot}%{tde_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-# -devel symlinks to nuke
-rm -f %{buildroot}%{tde_libdir}/lib*common.so
-rm -f %{buildroot}%{tde_libdir}/lib*filters.so
-rm -f %{buildroot}%{tde_libdir}/lib*private.so
-rm -f %{buildroot}%{tde_libdir}/libkarbon*.so
-rm -f %{buildroot}%{tde_libdir}/libkchart*.so
-rm -f %{buildroot}%{tde_libdir}/libkexi*.so
-rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so
-rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so
-rm -f %{buildroot}%{tde_libdir}/libkplato*.so
-rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so
-rm -f %{buildroot}%{tde_libdir}/libkword*.so
-rm -f %{buildroot}%{tde_libdir}/libkross*.so
-rm -f %{buildroot}%{tde_libdir}/libkugar*.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post core
-touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || :
-
-%postun core
-if [ $1 -eq 0 ]; then
-  gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-  gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-  update-desktop-database -q &> /dev/null ||:
-fi
-
-%posttrans core
-gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
-
-%post karbon
-/sbin/ldconfig || :
-
-%postun karbon
-/sbin/ldconfig || :
-
-%post kword
-/sbin/ldconfig || :
-
-%postun kword
-/sbin/ldconfig || :
-
-%posttrans kword
-update-desktop-database -q &> /dev/null ||:
-
-%post kpresenter
-/sbin/ldconfig || :
-
-%postun kpresenter
-/sbin/ldconfig || :
-
-%posttrans kpresenter
-update-desktop-database -q &> /dev/null ||:
-
-%post kugar
-/sbin/ldconfig || :
-
-%postun kugar
-/sbin/ldconfig || :
-
-%posttrans kugar
-update-desktop-database -q &> /dev/null ||:
-
-%post kexi
-/sbin/ldconfig || :
-
-%postun kexi
-/sbin/ldconfig || :
-
-%posttrans kexi
-update-desktop-database -q &> /dev/null ||:
-
-%post kchart
-/sbin/ldconfig || :
-
-%postun kchart
-/sbin/ldconfig || :
-
-%posttrans kchart
-update-desktop-database -q &> /dev/null ||:
-
-%post filters
-/sbin/ldconfig || :
-
-%postun filters
-/sbin/ldconfig || :
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-%post chalk
-/sbin/ldconfig || :
-
-%postun chalk
-/sbin/ldconfig || :
-
-%posttrans chalk
-update-desktop-database -q &> /dev/null ||:
-
-%files suite
-#empty => virtual package
-
-%files core
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/koshell
-%{tde_bindir}/kthesaurus
-%{tde_bindir}/koconverter
-%{tde_libdir}/libkdeinit_koshell.so
-%{tde_libdir}/libkdeinit_kthesaurus.so
-%{tde_tdelibdir}/kfile_koffice.*
-%{tde_tdelibdir}/kfile_ooo.*
-%{tde_tdelibdir}/kfile_abiword.*
-%{tde_tdelibdir}/kfile_gnumeric.*
-%{tde_tdelibdir}/kodocinfopropspage.*
-%{tde_tdelibdir}/kofficescan.*
-%{tde_tdelibdir}/kofficethumbnail.*
-%{tde_tdelibdir}/koshell.*
-%{tde_tdelibdir}/kthesaurus.*
-%{tde_tdelibdir}/kwmailmerge_classic.*
-%{tde_tdelibdir}/kwmailmerge_kabc.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
-%{tde_tdelibdir}/libkounavailpart.*
-%{tde_tdelibdir}/libkprkword.*
-%{tde_tdelibdir}/libthesaurustool.*
-%{tde_tdelibdir}/clipartthumbnail.*
-%{tde_datadir}/apps/koffice/
-%{tde_datadir}/apps/konqueror/servicemenus/*
-%{tde_datadir}/apps/koshell/
-%{tde_datadir}/apps/thesaurus/
-%{tde_datadir}/config.kcfg/koshell.kcfg
-%{tde_tdedocdir}/HTML/en/koffice/
-%{tde_tdedocdir}/HTML/en/koshell/
-%{tde_tdedocdir}/HTML/en/thesaurus/
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/services/clipartthumbnail.desktop
-%{tde_datadir}/services/kfile*.desktop
-%{tde_datadir}/services/kwmailmerge*.desktop
-%{tde_datadir}/services/kodocinfopropspage.desktop
-%{tde_datadir}/services/kofficethumbnail.desktop
-%{tde_datadir}/services/kounavail.desktop
-%{tde_datadir}/services/kprkword.desktop
-%{tde_datadir}/services/thesaurustool.desktop
-%{tde_datadir}/servicetypes/kochart.desktop
-%{tde_datadir}/servicetypes/kofficepart.desktop
-%{tde_datadir}/servicetypes/koplugin.desktop
-%{tde_datadir}/servicetypes/kwmailmerge.desktop
-%{tde_datadir}/servicetypes/widgetfactory.desktop
-%{tde_tdeappdir}/*koffice.desktop
-%{tde_tdeappdir}/*KThesaurus.desktop
-%{tde_tdeappdir}/*koshell.desktop
-%{tde_datadir}/apps/kofficewidgets/
-%if 0%{?with_kross} > 0
-%{tde_datadir}/apps/kross/
-%{tde_tdelibdir}/krosspython.*
-%if 0%{?with_ruby}
-%{tde_tdelibdir}/krossruby.*
-%endif
-%endif
-
-%files libs
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{tde_libdir}/libkarboncommon.so.*
-%{tde_libdir}/libkspreadcommon.so.*
-%{tde_libdir}/libkdchart.so.*
-%{tde_libdir}/libkochart.so.*
-%{tde_libdir}/libkofficecore.so.*
-%{tde_libdir}/libkofficeui.so.*
-%{tde_libdir}/libkotext.so.*
-%{tde_libdir}/libkowmf.so.*
-%{tde_libdir}/libkopainter.so.*
-%{tde_libdir}/libkstore.so.*
-%{tde_libdir}/libkwmailmerge_interface.so.*
-%{tde_libdir}/libkwmf.so.*
-%{tde_libdir}/libkformulalib.so.*
-%{tde_libdir}/libkopalette.so.*
-%{tde_libdir}/libkoproperty.so.*
-%if 0%{?with_kross} > 0
-%{tde_libdir}/libkrossapi.so.*
-%{tde_libdir}/libkrossmain.so.*
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
-%{tde_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkdeinit_*.so
-%exclude %{tde_libdir}/libkudesignercore.so
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kword/
-%{tde_bindir}/kword
-%{tde_libdir}/libkdeinit_kword.so
-%{tde_libdir}/libkwordprivate.so.*
-%{tde_tdelibdir}/libkwordpart.*
-%{tde_tdelibdir}/kword.*
-%{tde_datadir}/apps/kword/
-%{tde_datadir}/services/kword*.desktop
-%{tde_datadir}/services/kwserial*.desktop
-%{tde_datadir}/templates/TextDocument.desktop
-%{tde_datadir}/templates/.source/TextDocument.kwt
-%{tde_tdeappdir}/*kword.desktop
-
-%files kspread
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
-%{tde_bindir}/kspread
-%{tde_libdir}/libkdeinit_kspread.so
-%{tde_tdelibdir}/kspread.*
-%{tde_tdelibdir}/libkspreadpart.*
-%{tde_tdelibdir}/kwmailmerge_kspread.*
-%{tde_tdelibdir}/libcsvexport.*
-%{tde_tdelibdir}/libcsvimport.*
-%{tde_tdelibdir}/libgnumericexport.*
-%{tde_tdelibdir}/libgnumericimport.*
-%{tde_tdelibdir}/libkspreadhtmlexport.*
-%{tde_tdelibdir}/libkspreadinsertcalendar.*
-%{tde_tdelibdir}/libopencalcexport.*
-%{tde_tdelibdir}/libopencalcimport.*
-%{tde_tdelibdir}/libqproimport.*
-%{tde_datadir}/apps/kspread/
-%{tde_datadir}/services/kspread*.desktop
-%{tde_datadir}/templates/SpreadSheet.desktop
-%{tde_datadir}/templates/.source/SpreadSheet.kst
-%{tde_tdeappdir}/*kspread.desktop
-%if 0%{?with_kross} > 0
-%{tde_tdelibdir}/kspreadscripting.*
-%{tde_tdelibdir}/krosskspreadcore.*
-%endif
-
-%files kpresenter
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
-%{tde_bindir}/kpresenter
-%{tde_bindir}/kprconverter.pl
-%{tde_libdir}/libkdeinit_kpresenter.so
-%{tde_libdir}/libkpresenterimageexport.so.*
-%{tde_libdir}/libkpresenterprivate.so.*
-%{tde_tdelibdir}/*kpresenter*.*
-%{tde_datadir}/apps/kpresenter/
-%{tde_datadir}/services/kpresenter*.desktop
-%{tde_datadir}/templates/Presentation.desktop
-%{tde_datadir}/templates/.source/Presentation.kpt
-%{tde_tdeappdir}/*kpresenter.desktop
-
-%files karbon
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
-%{tde_bindir}/karbon
-%{tde_libdir}/libkdeinit_karbon.so
-%{tde_tdelibdir}/*karbon*.*
-%{tde_tdelibdir}/libwmfexport.*
-%{tde_tdelibdir}/libwmfimport.*
-%{tde_datadir}/apps/karbon/
-%{tde_datadir}/services/karbon*
-%{tde_datadir}/servicetypes/karbon_module.desktop
-%{tde_datadir}/templates/Illustration.desktop
-%{tde_datadir}/templates/.source/Illustration.karbon
-%{tde_tdeappdir}/*karbon.desktop
-
-%files kugar
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
-%{tde_bindir}/kugar
-%{tde_bindir}/kudesigner
-%{tde_libdir}/libkdeinit_kugar.so
-%{tde_libdir}/libkdeinit_kudesigner.so
-%{tde_libdir}/libkugarlib.so.*
-%{tde_libdir}/libkudesignercore.so
-%{tde_tdelibdir}/kudesigner.*
-%{tde_tdelibdir}/kugar.*
-%{tde_tdelibdir}/libkudesignerpart.*
-%{tde_tdelibdir}/libkugarpart.*
-%{tde_datadir}/apps/kudesigner/
-%{tde_datadir}/apps/kugar/
-%{tde_datadir}/services/kugar*.desktop
-%{tde_tdeappdir}/*kugar.desktop
-%{tde_tdeappdir}/*kudesigner.desktop
-
-%files kexi
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
-%{tde_bindir}/kexi*
-%{tde_bindir}/ksqlite*
-%{tde_libdir}/libkdeinit_kexi.so
-%{tde_libdir}/libkexi*.so.*
-%{tde_libdir}/libkformdesigner.so.*
-%{tde_tdelibdir}/kformdesigner_*.*
-%{tde_tdelibdir}/kexidb_sqlite2driver.*
-%{tde_tdelibdir}/kexidb_sqlite3driver.*
-%{tde_tdelibdir}/kexihandler_*.*
-%{tde_tdelibdir}/kexi.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_datadir}/config/kexirc
-%{tde_datadir}/config/magic/kexi.magic
-%{tde_datadir}/mimelnk/application/*
-%{tde_datadir}/servicetypes/kexi*.desktop
-%{tde_datadir}/services/kexi/
-%{tde_datadir}/apps/kexi/
-%{tde_datadir}/services/kformdesigner/*
-%{tde_tdeappdir}/*kexi.desktop
-%{tde_datadir}/services/kexidb_sqlite*driver.desktop
-%if 0%{?with_kross} > 0
-%{tde_bindir}/krossrunner
-%{tde_tdelibdir}/krosskexiapp.*
-%{tde_tdelibdir}/krosskexidb.*
-%endif
-
-%files kexi-driver-mysql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_mysqldriver.*
-%{tde_tdelibdir}/keximigrate_mysql.*
-%{tde_datadir}/services/keximigrate_mysql.desktop
-%{tde_datadir}/services/kexidb_mysqldriver.desktop
-
-%files kexi-driver-pgsql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
-%{tde_tdelibdir}/keximigrate_pqxx.*
-%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{tde_datadir}/services/keximigrate_pqxx.desktop
-
-%files kchart
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
-%{tde_bindir}/kchart
-%{tde_libdir}/libkchart*.so.*
-%{tde_libdir}/libkdeinit_kchart.so
-%{tde_tdelibdir}/*kchart*.*
-%{tde_datadir}/apps/kchart/
-%{tde_datadir}/services/kchart*.desktop
-%{tde_tdeappdir}/*kchart.desktop
-
-%files kformula
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
-%{tde_bindir}/kformula
-%{tde_libdir}/libkdeinit_kformula.so
-%{tde_tdelibdir}/*kformula*.*
-%{tde_datadir}/apps/kformula/
-%{tde_datadir}/services/kformula*.desktop
-%{tde_tdeappdir}/*kformula.desktop
-
-%files kivio
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
-%{tde_bindir}/kivio
-%{tde_libdir}/libkdeinit_kivio.so
-%{tde_libdir}/libkiviocommon.so.*
-%{tde_tdelibdir}/*kivio*.*
-%{tde_tdelibdir}/straight_connector.*
-%{tde_datadir}/apps/kivio/
-%{tde_datadir}/config.kcfg/kivio.kcfg
-%{tde_datadir}/services/kivio*.desktop
-%{tde_tdeappdir}/*kivio.desktop
-
-%files filters
-%defattr(-,root,root,-)
-%{tde_libdir}/libkwordexportfilters.so.*
-%{tde_tdelibdir}/libabiwordexport.*
-%{tde_tdelibdir}/libabiwordimport.*
-%{tde_tdelibdir}/libamiproexport.*
-%{tde_tdelibdir}/libamiproimport.*
-%{tde_tdelibdir}/libapplixspreadimport.*
-%{tde_tdelibdir}/libapplixwordimport.*
-%{tde_tdelibdir}/libasciiexport.*
-%{tde_tdelibdir}/libasciiimport.*
-%{tde_tdelibdir}/libdbaseimport.*
-%{tde_tdelibdir}/libdocbookexport.*
-%{tde_tdelibdir}/libexcelimport.*
-%{tde_tdelibdir}/libgenerickofilter.*
-%{tde_tdelibdir}/libhtmlexport.*
-%{tde_tdelibdir}/libhtmlimport.*
-%{tde_tdelibdir}/libkarbonepsimport.*
-%{tde_tdelibdir}/libkfolatexexport.*
-%{tde_tdelibdir}/libkfomathmlexport.*
-%{tde_tdelibdir}/libkfomathmlimport.*
-%{tde_tdelibdir}/libkfopngexport.*
-%{tde_tdelibdir}/libkspreadlatexexport.*
-%{tde_tdelibdir}/libkugarnopimport.*
-%{tde_tdelibdir}/libkwordkword1dot3import.*
-%{tde_tdelibdir}/libkwordlatexexport.*
-%{tde_tdelibdir}/libmswriteexport.*
-%{tde_tdelibdir}/libmswriteimport.*
-%{tde_tdelibdir}/libooimpressexport.*
-%{tde_tdelibdir}/libooimpressimport.*
-%{tde_tdelibdir}/liboowriterexport.*
-%{tde_tdelibdir}/liboowriterimport.*
-%{tde_tdelibdir}/libpalmdocexport.*
-%{tde_tdelibdir}/libpalmdocimport.*
-%{tde_tdelibdir}/libpdfimport.*
-%{tde_tdelibdir}/librtfexport.*
-%{tde_tdelibdir}/librtfimport.*
-%{tde_tdelibdir}/libwmlexport.*
-%{tde_tdelibdir}/libwmlimport.*
-%{tde_tdelibdir}/libwpexport.*
-%{tde_tdelibdir}/libwpimport.*
-%{tde_tdelibdir}/libmswordimport.*
-%{tde_tdelibdir}/libxsltimport.*
-%{tde_tdelibdir}/libxsltexport.*
-%{tde_tdelibdir}/libhancomwordimport.*
-%{tde_tdelibdir}/libkfosvgexport.*
-%{tde_tdelibdir}/liboodrawimport.*
-%{tde_tdelibdir}/libolefilter.*
-%{tde_datadir}/apps/xsltfilter/
-%{tde_datadir}/services/generic_filter.desktop
-%{tde_datadir}/services/ole_powerpoint97_import.desktop
-%{tde_datadir}/services/xslt*.desktop
-%{tde_datadir}/servicetypes/kofilter*.desktop
-
-%files kplato
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
-%{tde_bindir}/kplato
-%{tde_libdir}/libkdeinit_kplato.so
-%{tde_tdelibdir}/kplato.*
-%{tde_tdelibdir}/libkplatopart.*
-%{tde_datadir}/apps/kplato/
-%{tde_datadir}/services/kplatopart.desktop
-%{tde_tdeappdir}/*kplato.desktop
-
-%files chalk
-%defattr(-,root,root,-)
-%{tde_bindir}/chalk
-%{tde_tdelibdir}/chalkblurfilter.la
-%{tde_tdelibdir}/chalkblurfilter.so
-%{tde_tdelibdir}/chalkbumpmap.la
-%{tde_tdelibdir}/chalkbumpmap.so
-%{tde_tdelibdir}/chalkcimg.la
-%{tde_tdelibdir}/chalkcimg.so
-%{tde_tdelibdir}/chalk_cmyk_*
-%{tde_tdelibdir}/chalkcmykplugin.la
-%{tde_tdelibdir}/chalkcmykplugin.so
-%{tde_tdelibdir}/chalkcolorify.la
-%{tde_tdelibdir}/chalkcolorify.so
-%{tde_tdelibdir}/chalkcolorrange.la
-%{tde_tdelibdir}/chalkcolorrange.so
-%{tde_tdelibdir}/chalkcolorsfilters.la
-%{tde_tdelibdir}/chalkcolorsfilters.so
-%{tde_tdelibdir}/chalkcolorspaceconversion.la
-%{tde_tdelibdir}/chalkcolorspaceconversion.so
-%{tde_tdelibdir}/chalkconvolutionfilters.la
-%{tde_tdelibdir}/chalkconvolutionfilters.so
-%{tde_tdelibdir}/chalkdefaultpaintops.la
-%{tde_tdelibdir}/chalkdefaultpaintops.so
-%{tde_tdelibdir}/chalkdefaulttools.la
-%{tde_tdelibdir}/chalkdefaulttools.so
-%{tde_tdelibdir}/chalkdropshadow.la
-%{tde_tdelibdir}/chalkdropshadow.so
-%{tde_tdelibdir}/chalkembossfilter.la
-%{tde_tdelibdir}/chalkembossfilter.so
-%{tde_tdelibdir}/chalkexample.la
-%{tde_tdelibdir}/chalkexample.so
-%{tde_tdelibdir}/chalkextensioncolorsfilters.la
-%{tde_tdelibdir}/chalkextensioncolorsfilters.so
-%{tde_tdelibdir}/chalkfastcolortransfer.la
-%{tde_tdelibdir}/chalkfastcolortransfer.so
-%{tde_tdelibdir}/chalkfiltersgallery.la
-%{tde_tdelibdir}/chalkfiltersgallery.so
-%{tde_tdelibdir}/chalk_gray_*
-%{tde_tdelibdir}/chalkgrayplugin.la
-%{tde_tdelibdir}/chalkgrayplugin.so
-%{tde_tdelibdir}/chalkhistogramdocker.la
-%{tde_tdelibdir}/chalkhistogramdocker.so
-%{tde_tdelibdir}/chalkhistogram.la
-%{tde_tdelibdir}/chalkhistogram.so
-%{tde_tdelibdir}/chalkimageenhancement.la
-%{tde_tdelibdir}/chalkimageenhancement.so
-%{tde_tdelibdir}/chalkimagesize.la
-%{tde_tdelibdir}/chalkimagesize.so
-%{tde_tdelibdir}/chalk.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.so
-%{tde_tdelibdir}/chalklevelfilter.la
-%{tde_tdelibdir}/chalklevelfilter.so
-%{tde_tdelibdir}/chalk_lms_*
-%{tde_tdelibdir}/chalkmodifyselection.la
-%{tde_tdelibdir}/chalkmodifyselection.so
-%{tde_tdelibdir}/chalknoisefilter.la
-%{tde_tdelibdir}/chalknoisefilter.so
-%{tde_tdelibdir}/chalkoilpaintfilter.la
-%{tde_tdelibdir}/chalkoilpaintfilter.so
-%{tde_tdelibdir}/chalkpixelizefilter.la
-%{tde_tdelibdir}/chalkpixelizefilter.so
-%{tde_tdelibdir}/chalkraindropsfilter.la
-%{tde_tdelibdir}/chalkraindropsfilter.so
-%{tde_tdelibdir}/chalkrandompickfilter.la
-%{tde_tdelibdir}/chalkrandompickfilter.so
-%{tde_tdelibdir}/chalk_rgb_*
-%{tde_tdelibdir}/chalkrgbplugin.la
-%{tde_tdelibdir}/chalkrgbplugin.so
-%{tde_tdelibdir}/chalkrotateimage.la
-%{tde_tdelibdir}/chalkrotateimage.so
-%{tde_tdelibdir}/chalkroundcornersfilter.la
-%{tde_tdelibdir}/chalkroundcornersfilter.so
-%{tde_tdelibdir}/chalkselectiontools.la
-%{tde_tdelibdir}/chalkselectiontools.so
-%{tde_tdelibdir}/chalkselectopaque.la
-%{tde_tdelibdir}/chalkselectopaque.so
-%{tde_tdelibdir}/chalkseparatechannels.la
-%{tde_tdelibdir}/chalkseparatechannels.so
-%{tde_tdelibdir}/chalkshearimage.la
-%{tde_tdelibdir}/chalkshearimage.so
-%{tde_tdelibdir}/chalksmalltilesfilter.la
-%{tde_tdelibdir}/chalksmalltilesfilter.so
-%{tde_tdelibdir}/chalk.so
-%{tde_tdelibdir}/chalkscreenshot.la
-%{tde_tdelibdir}/chalkscreenshot.so
-%{tde_tdelibdir}/chalksobelfilter.la
-%{tde_tdelibdir}/chalksobelfilter.so
-%{tde_tdelibdir}/chalksubstrate.la
-%{tde_tdelibdir}/chalksubstrate.so
-%{tde_tdelibdir}/chalktoolcrop.la
-%{tde_tdelibdir}/chalktoolcrop.so
-%{tde_tdelibdir}/chalktoolcurves.la
-%{tde_tdelibdir}/chalktoolcurves.so
-%{tde_tdelibdir}/chalktoolfilter.la
-%{tde_tdelibdir}/chalktoolfilter.so
-%{tde_tdelibdir}/chalktoolperspectivegrid.la
-%{tde_tdelibdir}/chalktoolperspectivegrid.so
-%{tde_tdelibdir}/chalktoolperspectivetransform.la
-%{tde_tdelibdir}/chalktoolperspectivetransform.so
-%{tde_tdelibdir}/chalktoolpolygon.la
-%{tde_tdelibdir}/chalktoolpolygon.so
-%{tde_tdelibdir}/chalktoolpolyline.la
-%{tde_tdelibdir}/chalktoolpolyline.so
-%{tde_tdelibdir}/chalktoolselectsimilar.la
-%{tde_tdelibdir}/chalktoolselectsimilar.so
-%{tde_tdelibdir}/chalktoolstar.la
-%{tde_tdelibdir}/chalktoolstar.so
-%{tde_tdelibdir}/chalktooltransform.la
-%{tde_tdelibdir}/chalktooltransform.so
-%{tde_tdelibdir}/chalkunsharpfilter.la
-%{tde_tdelibdir}/chalkunsharpfilter.so
-%{tde_tdelibdir}/chalkwavefilter.la
-%{tde_tdelibdir}/chalkwavefilter.so
-%{tde_tdelibdir}/chalkwetplugin.la
-%{tde_tdelibdir}/chalkwetplugin.so
-%{tde_tdelibdir}/chalk_ycbcr_*
-%{tde_tdelibdir}/libchalkgmagickexport.la
-%{tde_tdelibdir}/libchalkgmagickexport.so
-%{tde_tdelibdir}/libchalkgmagickimport.la
-%{tde_tdelibdir}/libchalkgmagickimport.so
-%{tde_tdelibdir}/libchalkjpegexport.la
-%{tde_tdelibdir}/libchalkjpegexport.so
-%{tde_tdelibdir}/libchalkjpegimport.la
-%{tde_tdelibdir}/libchalkjpegimport.so
-%{tde_tdelibdir}/libchalk_openexr_export.la
-%{tde_tdelibdir}/libchalk_openexr_export.so
-%{tde_tdelibdir}/libchalk_openexr_import.la
-%{tde_tdelibdir}/libchalk_openexr_import.so
-%{tde_tdelibdir}/libchalkpart.la
-%{tde_tdelibdir}/libchalkpart.so
-%{tde_tdelibdir}/libchalkpdfimport.la
-%{tde_tdelibdir}/libchalkpdfimport.so
-%{tde_tdelibdir}/libchalkpngexport.la
-%{tde_tdelibdir}/libchalkpngexport.so
-%{tde_tdelibdir}/libchalkpngimport.la
-%{tde_tdelibdir}/libchalkpngimport.so
-%{tde_tdelibdir}/libchalk_raw_import.la
-%{tde_tdelibdir}/libchalk_raw_import.so
-%{tde_tdelibdir}/libchalktiffexport.la
-%{tde_tdelibdir}/libchalktiffexport.so
-%{tde_tdelibdir}/libchalktiffimport.la
-%{tde_tdelibdir}/libchalktiffimport.so
-%{tde_libdir}/libkdeinit_chalk.so
-%{tde_libdir}/libchalk_cmyk_*.so.*
-%{tde_libdir}/libchalkcolor.so.*
-%{tde_libdir}/libchalkcommon.so.*
-%{tde_libdir}/libchalkgrayscale.so.*
-%{tde_libdir}/libchalk_gray_*.so.*
-%{tde_libdir}/libchalkimage.so.*
-%{tde_libdir}/libchalk_lms_*.so.*
-%{tde_libdir}/libchalk_rgb_*.so.*
-%{tde_libdir}/libchalkrgb.so.*
-%{tde_libdir}/libchalkui.so.*
-%{tde_libdir}/libchalk_ycbcr_*.so.*
-%if 0%{?with_kross} > 0
-%{tde_tdelibdir}/krosschalkcore.la
-%{tde_tdelibdir}/krosschalkcore.so
-%{tde_tdelibdir}/chalkscripting.la
-%{tde_tdelibdir}/chalkscripting.so
-%{tde_libdir}/libchalkscripting.so.*
-%endif
-
-%files chalk-data
-%{tde_tdeappdir}/chalk.desktop
-%{tde_datadir}/applnk/.hidden/chalk_*.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
-%{tde_datadir}/apps/chalk
-%{tde_datadir}/apps/chalkplugins
-%lang(en) %{tde_tdedocdir}/HTML/en/chalk
-%{tde_datadir}/icons/hicolor/*/apps/chalk.png
-%{tde_datadir}/services/chalk*.desktop
-%{tde_datadir}/servicetypes/chalk*.desktop
-
-
-%changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
-- Fix kformula dependancies (for RHEL6)
-- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3]
-  Clean up lib paths in LDFLAGS - moved to LIBADD
-  For KWord and and KPresenter added linking kspell2
-  For KSpread added linking kutils
-- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307]
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4
-- Updates BuildRequires
-- Build for Fedora 17
-- Fix compilation with GCC 4.7 [Bug #958]
-- Fix compilation with Ruby 1.9 [Bug #735]
-- Fix compilation with libpng [Bug #603]
-
-* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3
-- Fix GraphicksMagick 1.3 support [Bug #353]
-- Various patches for kexi [Bug #777]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Fix HTML directory location
-
-* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
-- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/konversation/96f2a488.diff b/redhat/applications/konversation/96f2a488.diff
deleted file mode 100644
index 45aec3704..000000000
--- a/redhat/applications/konversation/96f2a488.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-commit 96f2a488786e370c355778e00c795e776e09d199
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1322168535 -0600
-
-    Fix FTBFS
-
-diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h
-index cf70b4f..aeb3062 100644
---- a/konversation/src/alias_preferences.h
-+++ b/konversation/src/alias_preferences.h
-@@ -13,6 +13,8 @@
- #ifndef EXALIASPREFERENCES_H
- #define EXALIASPREFERENCES_H
- 
-+#include <tqlistview.h>
-+
- #include "alias_preferencesui.h"
- #include "konvisettingspage.h"
- 
-diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h
-index c73da29..9cab1f0 100644
---- a/konversation/src/autoreplace_preferences.h
-+++ b/konversation/src/autoreplace_preferences.h
-@@ -13,6 +13,8 @@
- #ifndef AUTOREPLACECONFIG_H
- #define AUTOREPLACECONFIG_H
- 
-+#include <tqlistview.h>
-+
- #include "autoreplace_preferencesui.h"
- #include "konvisettingspage.h"
- 
-diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
-index a2a2582..8cf2b82 100644
---- a/konversation/src/config/konversation.kcfg
-+++ b/konversation/src/config/konversation.kcfg
-@@ -294,7 +294,7 @@
-       <whatsthis></whatsthis>
-     </entry>
-     <entry key="LogfileReaderGeometry" type="Size" name="LogfileReaderSize">
--      <default code="true">QSize(400, 200)</default>
-+      <default code="true">TQSize(400, 200)</default>
-       <label></label>
-       <whatsthis></whatsthis>
-     </entry>
-diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h
-index 67863a7..89974ca 100644
---- a/konversation/src/highlight_preferences.h
-+++ b/konversation/src/highlight_preferences.h
-@@ -17,7 +17,7 @@
- #include "konvisettingspage.h"
- 
- #include <tqobject.h>
--
-+#include <tqlistview.h>
- 
- class Highlight_Config;
- class Highlight;
-diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h
-index e910b78..a19ff03 100644
---- a/konversation/src/ignore_preferences.h
-+++ b/konversation/src/ignore_preferences.h
-@@ -17,7 +17,7 @@
- #include "konvisettingspage.h"
- 
- #include <tqptrlist.h>
--
-+#include <tqlistview.h>
- 
- class Ignore;
- class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage
-diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
-index c8cc0e1..ccf26af 100644
---- a/konversation/src/quickbuttons_preferences.h
-+++ b/konversation/src/quickbuttons_preferences.h
-@@ -13,6 +13,8 @@
- #ifndef TQUICKBUTTONSCONFIG_H
- #define TQUICKBUTTONSCONFIG_H
- 
-+#include <tqlistview.h>
-+
- #include "quickbuttons_preferencesui.h"
- #include "konvisettingspage.h"
- 
diff --git a/redhat/applications/konversation/bp000-01f5ea83.diff b/redhat/applications/konversation/bp000-01f5ea83.diff
deleted file mode 100644
index e55a04f57..000000000
--- a/redhat/applications/konversation/bp000-01f5ea83.diff
+++ /dev/null
@@ -1,3130 +0,0 @@
-commit 01f5ea83754cabfe6ebbcea0601cebaec976f708
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253563 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
-index eb53d83..3783955 100644
---- a/konversation/src/alias_preferencesui.ui
-+++ b/konversation/src/alias_preferencesui.ui
-@@ -146,7 +146,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>350</height>
-diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
-index f617836..769ba9b 100644
---- a/konversation/src/autoreplace_preferencesui.ui
-+++ b/konversation/src/autoreplace_preferencesui.ui
-@@ -54,7 +54,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>506</height>
-diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
-index 21a507d..13e026e 100644
---- a/konversation/src/channel.cpp
-+++ b/konversation/src/channel.cpp
-@@ -139,7 +139,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
- 
-     // The box holding the channel modes
-     modeBox = new TQHBox(topicWidget);
--    modeBox->tqsetSizePolicy(hfixed);
-+    modeBox->setSizePolicy(hfixed);
-     modeT = new ModeButton("T",modeBox,0);
-     modeN = new ModeButton("N",modeBox,1);
-     modeS = new ModeButton("S",modeBox,2);
-@@ -240,33 +240,33 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
-     channelInput->installEventFilter(this);
- 
-     // Set the widgets size policies
--    m_topicButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
--    topicLine->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
-+    m_topicButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-+    topicLine->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
- 
--    commandLineBox->tqsetSizePolicy(vfixed);
-+    commandLineBox->setSizePolicy(vfixed);
- 
-     limit->setMaximumSize(40,100);
--    limit->tqsetSizePolicy(hfixed);
-+    limit->setSizePolicy(hfixed);
- 
-     modeT->setMaximumSize(20,100);
--    modeT->tqsetSizePolicy(hfixed);
-+    modeT->setSizePolicy(hfixed);
-     modeN->setMaximumSize(20,100);
--    modeN->tqsetSizePolicy(hfixed);
-+    modeN->setSizePolicy(hfixed);
-     modeS->setMaximumSize(20,100);
--    modeS->tqsetSizePolicy(hfixed);
-+    modeS->setSizePolicy(hfixed);
-     modeI->setMaximumSize(20,100);
--    modeI->tqsetSizePolicy(hfixed);
-+    modeI->setSizePolicy(hfixed);
-     modeP->setMaximumSize(20,100);
--    modeP->tqsetSizePolicy(hfixed);
-+    modeP->setSizePolicy(hfixed);
-     modeM->setMaximumSize(20,100);
--    modeM->tqsetSizePolicy(hfixed);
-+    modeM->setSizePolicy(hfixed);
-     modeK->setMaximumSize(20,100);
--    modeK->tqsetSizePolicy(hfixed);
-+    modeK->setSizePolicy(hfixed);
-     modeL->setMaximumSize(20,100);
--    modeL->tqsetSizePolicy(hfixed);
-+    modeL->setSizePolicy(hfixed);
- 
--    getTextView()->tqsetSizePolicy(greedy);
--    nicknameListView->tqsetSizePolicy(hmodest);
-+    getTextView()->setSizePolicy(greedy);
-+    nicknameListView->setSizePolicy(hmodest);
- 
-     connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) );
-     connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) );
-@@ -568,7 +568,7 @@ void Channel::popupCommand(int id)
-             break;
-         case Konversation::Ping:
-         {
--            unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t();
-+            unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
-             pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t);
-         }
-         break;
-@@ -796,7 +796,7 @@ void Channel::completeNick()
-                     {
-                         nick = it.current();
- 
--                        if(nick->getChannelNick()->getNickname().tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive()) &&
-+                        if(nick->getChannelNick()->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) &&
-                           (nick->getChannelNick()->timeStamp() > timeStamp))
-                         {
-                             timeStamp = nick->getChannelNick()->timeStamp();
-@@ -822,7 +822,7 @@ void Channel::completeNick()
-                         lookNick = lookNick.section( prefixCharacter,1 );
-                     }
- 
--                    if(lookNick.tqstartsWith(pattern, Preferences::nickCompletionCaseSensitive()))
-+                    if(lookNick.startsWith(pattern, Preferences::nickCompletionCaseSensitive()))
-                     {
-                         foundNick = lookNick;
-                     }
-@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic)
- 
-     if(m_topicHistory.first().section(' ', 2) != newTopic)
-     {
--        m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(newTopic));
-+        m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic));
-         emit topicHistoryChanged();
-     }
- }
-@@ -1537,7 +1537,7 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov
-         appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic));
-     }
- 
--    m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::tqcurrentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic));
-+    m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic));
-     TQString topic = Konversation::removeIrcMarkup(newTopic);
-     topicLine->setText(topic);
- 
-@@ -1557,7 +1557,7 @@ TQString Channel::getTopic()
- void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time)
- {
-     if (time.isNull() || !time.isValid())
--        time=TQDateTime::tqcurrentDateTime();
-+        time=TQDateTime::currentDateTime();
- 
-     if(topicAuthorUnknown)
-     {
-@@ -2253,8 +2253,8 @@ void Channel::updateAppearance()
-     }
-     else
-     {
--        fg=tqcolorGroup().foreground();
--        bg=tqcolorGroup().base();
-+        fg=colorGroup().foreground();
-+        bg=colorGroup().base();
-         abg=KGlobalSettings::alternateBackgroundColor();
-     }
- 
-@@ -2797,7 +2797,7 @@ void Channel::append(const TQString& nickname, const TQString& message)
-         Nick* nick = getNickByName(nickname);
- 
-         if(nick) {
--            nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t());
-+            nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t());
-         }
-     }
- 
-@@ -2811,7 +2811,7 @@ void Channel::appendAction(const TQString& nickname, const TQString& message)
-         Nick* nick = getNickByName(nickname);
- 
-         if(nick) {
--            nick->getChannelNick()->setTimeStamp(TQDateTime::tqcurrentDateTime().toTime_t());
-+            nick->getChannelNick()->setTimeStamp(TQDateTime::currentDateTime().toTime_t());
-         }
-     }
- 
-diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
-index 364c34c..79a9168 100644
---- a/konversation/src/channellistpanel.cpp
-+++ b/konversation/src/channellistpanel.cpp
-@@ -223,7 +223,7 @@ void ChannelListPanel::saveList()
- 
-         TQString header(i18n("Konversation Channel List: %1 - %2\n\n")
-             .tqarg(m_server->getServerName())
--            .tqarg(TQDateTime::tqcurrentDateTime().toString()));
-+            .tqarg(TQDateTime::currentDateTime().toString()));
- 
-         // send header to stream
-         stream << header;
-diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
-index bfdaea8..33bb6ff 100644
---- a/konversation/src/channeloptionsui.ui
-+++ b/konversation/src/channeloptionsui.ui
-@@ -267,7 +267,7 @@ the Free Software Foundation; either version 2 of the License, or
-                                 <property name="sizeType">
-                                     <enum>Expanding</enum>
-                                 </property>
--                                <property name="tqsizeHint">
-+                                <property name="sizeHint">
-                                     <size>
-                                         <width>211</width>
-                                         <height>20</height>
-@@ -319,7 +319,7 @@ the Free Software Foundation; either version 2 of the License, or
-                                 <property name="sizeType">
-                                     <enum>Expanding</enum>
-                                 </property>
--                                <property name="tqsizeHint">
-+                                <property name="sizeHint">
-                                     <size>
-                                         <width>301</width>
-                                         <height>31</height>
-@@ -383,7 +383,7 @@ the Free Software Foundation; either version 2 of the License, or
-                         <property name="sizeType">
-                             <enum>Expanding</enum>
-                         </property>
--                        <property name="tqsizeHint">
-+                        <property name="sizeHint">
-                             <size>
-                                 <width>20</width>
-                                 <height>16</height>
-diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
-index f7eb651..9e37d92 100644
---- a/konversation/src/chatwindow.cpp
-+++ b/konversation/src/chatwindow.cpp
-@@ -219,7 +219,7 @@ void ChatWindow::setLogfileName(const TQString& name)
-     if(firstLog)
-     {
-         // status panels get special treatment here, since they have no server at the beginning
--        if (getType() == tqStatus || getType() == DccChat)
-+        if (getType() == Status || getType() == DccChat)
-         {
-             logName = name + ".log";
-         }
-@@ -236,7 +236,7 @@ void ChatWindow::setLogfileName(const TQString& name)
-             cdIntoLogPath();
-             // Show last log lines. This idea was stole ... um ... inspired by PMP :)
-             // Don't do this for the server status windows, though
--            if((getType() != tqStatus) && logfile.open(IO_ReadOnly))
-+            if((getType() != Status) && logfile.open(IO_ReadOnly))
-             {
-                 unsigned long filePosition;
- 
-@@ -343,13 +343,13 @@ void ChatWindow::logText(const TQString& text)
- 
-             if(firstLog)
-             {
--                TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::tqcurrentDateTime().toString()));
-+                TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString()));
-                 logStream << intro;
-                 firstLog=false;
-             }
- 
-             TQTime time=TQTime::currentTime();
--            TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::tqcurrentDate(Qt::LocalTime).toString()).
-+            TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()).
-                 tqarg(time.toString("hh:mm:ss")).tqarg(text));
- 
-             logStream << logLine;
-diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h
-index 947c789..d77f5d1 100644
---- a/konversation/src/chatwindow.h
-+++ b/konversation/src/chatwindow.h
-@@ -35,7 +35,7 @@ class ChatWindow : public TQVBox
- 
-         enum WindowType
-         {
--            tqStatus=0,
-+            Status=0,
-             Channel,
-             Query,
-             DccChat,
-diff --git a/konversation/src/chatwindowappearance_preferences.ui b/konversation/src/chatwindowappearance_preferences.ui
-index a332268..c1c152c 100644
---- a/konversation/src/chatwindowappearance_preferences.ui
-+++ b/konversation/src/chatwindowappearance_preferences.ui
-@@ -74,7 +74,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>191</width>
-                             <height>20</height>
-@@ -129,7 +129,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>251</width>
-                             <height>20</height>
-@@ -205,7 +205,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-@@ -233,7 +233,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-@@ -269,7 +269,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-@@ -320,7 +320,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>20</height>
-diff --git a/konversation/src/chatwindowbehaviour_preferences.ui b/konversation/src/chatwindowbehaviour_preferences.ui
-index 0e5c779..5968850 100644
---- a/konversation/src/chatwindowbehaviour_preferences.ui
-+++ b/konversation/src/chatwindowbehaviour_preferences.ui
-@@ -92,7 +92,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>410</width>
-                             <height>20</height>
-@@ -137,7 +137,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>230</width>
-                             <height>20</height>
-@@ -200,7 +200,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-@@ -236,7 +236,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>170</width>
-                             <height>20</height>
-@@ -253,7 +253,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>190</width>
-                             <height>20</height>
-@@ -331,7 +331,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>41</width>
-                     <height>20</height>
-diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui
-index 54f68ac..909e5b3 100644
---- a/konversation/src/colorsappearance_preferences.ui
-+++ b/konversation/src/colorsappearance_preferences.ui
-@@ -141,7 +141,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -158,7 +158,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -175,7 +175,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -192,7 +192,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -209,7 +209,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -226,7 +226,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -243,7 +243,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -260,7 +260,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -277,7 +277,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -294,7 +294,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -536,7 +536,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -553,7 +553,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -570,7 +570,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -587,7 +587,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -652,7 +652,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -669,7 +669,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -761,7 +761,7 @@ the Free Software Foundation; either version 2 of the License, or
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>271</width>
-                                     <height>20</height>
-@@ -962,7 +962,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -979,7 +979,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -996,7 +996,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1013,7 +1013,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1030,7 +1030,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1047,7 +1047,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1064,7 +1064,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1081,7 +1081,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1162,7 +1162,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1179,7 +1179,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1196,7 +1196,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1213,7 +1213,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -1296,7 +1296,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>0</height>
-diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp
-index 7e1d301..eba7508 100644
---- a/konversation/src/common.cpp
-+++ b/konversation/src/common.cpp
-@@ -144,7 +144,7 @@ namespace Konversation
-                 continue;
-             }
- 
--            if (urlPattern.cap(1).tqstartsWith("www.", false))
-+            if (urlPattern.cap(1).startsWith("www.", false))
-                 protocol = "http://";
-             else if (urlPattern.cap(1).isEmpty())
-                 protocol = "mailto:";
-diff --git a/konversation/src/connectionbehavior_preferences.ui b/konversation/src/connectionbehavior_preferences.ui
-index 8c2f2a1..752c26c 100644
---- a/konversation/src/connectionbehavior_preferences.ui
-+++ b/konversation/src/connectionbehavior_preferences.ui
-@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>278</width>
-                             <height>20</height>
-@@ -119,7 +119,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>280</width>
-                             <height>20</height>
-@@ -138,7 +138,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>60</height>
-diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui
-index 9ae128a..ccff213 100644
---- a/konversation/src/dcc_preferencesui.ui
-+++ b/konversation/src/dcc_preferencesui.ui
-@@ -114,7 +114,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>16</height>
-@@ -214,7 +214,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>70</width>
-                     <height>20</height>
-@@ -231,7 +231,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>70</width>
-                     <height>20</height>
-@@ -248,7 +248,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>70</width>
-                     <height>20</height>
-@@ -329,7 +329,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-@@ -396,7 +396,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
-index 58002f9..f40d1ae 100644
---- a/konversation/src/dccchat.cpp
-+++ b/konversation/src/dccchat.cpp
-@@ -418,7 +418,7 @@ void DccChat::showEvent(TQShowEvent* /* event */)
-     if(m_initialShow) {
-         m_initialShow = false;
-         TQValueList<int> sizes;
--        sizes << m_sourceLine->tqsizeHint().height() << (height() - m_sourceLine->tqsizeHint().height());
-+        sizes << m_sourceLine->sizeHint().height() << (height() - m_sourceLine->sizeHint().height());
-         m_headerSplitter->setSizes(sizes);
-     }
- }
-@@ -435,8 +435,8 @@ void DccChat::updateAppearance()
-     }
-     else
-     {
--        fg=tqcolorGroup().foreground();
--        bg=tqcolorGroup().base();
-+        fg=colorGroup().foreground();
-+        bg=colorGroup().base();
-     }
- 
-     m_dccChatInput->unsetPalette();
-diff --git a/konversation/src/dccresumedialog.cpp b/konversation/src/dccresumedialog.cpp
-index d2d3c7e..30b687b 100644
---- a/konversation/src/dccresumedialog.cpp
-+++ b/konversation/src/dccresumedialog.cpp
-@@ -97,7 +97,7 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption,
-     }
- 
-     updateDialogButtons();
--    setInitialSize(TQSize(500, tqsizeHint().height()));
-+    setInitialSize(TQSize(500, sizeHint().height()));
- 
- }
- 
-diff --git a/konversation/src/dcctransfer.cpp b/konversation/src/dcctransfer.cpp
-index cec058c..c12147f 100644
---- a/konversation/src/dcctransfer.cpp
-+++ b/konversation/src/dcctransfer.cpp
-@@ -43,7 +43,7 @@ DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent)
- 
-     connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) );
- 
--    m_timeOffer = TQDateTime::tqcurrentDateTime();
-+    m_timeOffer = TQDateTime::currentDateTime();
- }
- 
- DccTransfer::~DccTransfer()
-@@ -60,7 +60,7 @@ DccTransfer::DccTransfer( const DccTransfer& obj )
-     m_bufferSize = 0;
-     m_averageSpeed = obj.getAverageSpeed();
-     m_currentSpeed = obj.getCurrentSpeed();
--    m_status = obj.gettqStatus();
-+    m_status = obj.getStatus();
-     m_statusDetail = obj.getStatusDetail();
-     m_type = obj.getType();
-     m_fileName = obj.getFileName();
-@@ -88,20 +88,20 @@ DccTransfer::DccTransfer( const DccTransfer& obj )
- 
- void DccTransfer::setConnectionId( int id )
- {
--    if ( gettqStatus() == Configuring || gettqStatus() == Queued )
-+    if ( getStatus() == Configuring || getStatus() == Queued )
-         m_connectionId = id;
- }
- 
- void DccTransfer::setPartnerNick( const TQString& nick )
- {
--    if ( gettqStatus() == Configuring || gettqStatus() == Queued )
-+    if ( getStatus() == Configuring || getStatus() == Queued )
-         m_partnerNick = nick;
- }
- 
- bool DccTransfer::queue()
- {
-     kdDebug() << "DccTransfer::queue()" << endl;
--    if ( gettqStatus() != Configuring )
-+    if ( getStatus() != Configuring )
-         return false;
- 
-     if ( m_fileName.isEmpty() )
-@@ -110,13 +110,13 @@ bool DccTransfer::queue()
-     if ( m_connectionId == -1 || m_partnerNick.isEmpty() )
-         return false;
- 
--    settqStatus( Queued );
-+    setStatus( Queued );
-     return true;
- }
- 
- void DccTransfer::startTransferLogger()
- {
--    m_timeTransferStarted = TQDateTime::tqcurrentDateTime();
-+    m_timeTransferStarted = TQDateTime::currentDateTime();
-     m_loggerBaseTime.start();
-     m_loggerTimer.start( 100 );
- }
-@@ -124,7 +124,7 @@ void DccTransfer::startTransferLogger()
- void DccTransfer::finishTransferLogger()
- {
-     if ( m_timeTransferFinished.isNull() )
--        m_timeTransferFinished = TQDateTime::tqcurrentDateTime();
-+        m_timeTransferFinished = TQDateTime::currentDateTime();
-     m_loggerTimer.stop();
-     updateTransferMeters();
- }
-@@ -137,21 +137,21 @@ void DccTransfer::logTransfer()
-     updateTransferMeters();
- }
- 
--void DccTransfer::settqStatus( DcctqStatus status, const TQString& statusDetail )
-+void DccTransfer::setStatus( DccStatus status, const TQString& statusDetail )
- {
-     bool changed = ( status != m_status );
--    DcctqStatus oldtqStatus = m_status;
-+    DccStatus oldStatus = m_status;
-     m_status = status;
-     m_statusDetail = statusDetail;
-     if ( changed )
--        emit statusChanged( this, m_status, oldtqStatus );
-+        emit statusChanged( this, m_status, oldStatus );
- }
- 
- void DccTransfer::updateTransferMeters()
- {
-     const int timeToCalc = 5;
- 
--    if ( gettqStatus() == Transferring )
-+    if ( getStatus() == Transferring )
-     {
-         // update CurrentSpeed
- 
-@@ -174,7 +174,7 @@ void DccTransfer::updateTransferMeters()
-         if ( m_transferLogTime.count() >= 2 )
-         {
-             // FIXME: precision of average speed is too bad
--            m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::tqcurrentDateTime() );
-+            m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( TQDateTime::currentDateTime() );
-             m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000;
-         }
-         else // avoid zero devision
-@@ -240,7 +240,7 @@ DccTransfer::DccType DccTransfer::getType() const
-     return m_type;
- }
- 
--DccTransfer::DcctqStatus DccTransfer::gettqStatus() const
-+DccTransfer::DccStatus DccTransfer::getStatus() const
- {
-     return m_status;
- }
-diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
-index 64d3827..5765bdd 100644
---- a/konversation/src/dcctransfer.h
-+++ b/konversation/src/dcctransfer.h
-@@ -39,7 +39,7 @@ class DccTransfer : public TQObject
-             Send
-         };
- 
--        enum DcctqStatus
-+        enum DccStatus
-         {
-             Configuring = 0,                      // Not queud yet (this means that user can't see the item at this time)
-             Queued,                               // Newly added DCC, waiting user's response
-@@ -52,7 +52,7 @@ class DccTransfer : public TQObject
-             Aborted
-         };
- 
--        enum UnavailabletqStatus
-+        enum UnavailableStatus
-         {
-             Calculating = -1,
-             NotInTransfer = -2,
-@@ -66,7 +66,7 @@ class DccTransfer : public TQObject
-         DccTransfer( const DccTransfer& obj );
- 
-         DccType            getType()                  const;
--        DcctqStatus          gettqStatus()                const;
-+        DccStatus          getStatus()                const;
-         const TQString&     getStatusDetail()          const;
-         TQDateTime          getTimeOffer()             const;
-         int                getConnectionId()         const;
-@@ -100,7 +100,7 @@ class DccTransfer : public TQObject
-     signals:
-         void transferStarted( DccTransfer* item );
-         void done( DccTransfer* item );
--        void statusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus );
-+        void statusChanged( DccTransfer* item, int newStatus, int oldStatus );
- 
-     public slots:
-         virtual bool queue();
-@@ -108,7 +108,7 @@ class DccTransfer : public TQObject
-         virtual void abort() {};
- 
-     protected:
--        void settqStatus( DcctqStatus status, const TQString& statusDetail = TQString() );
-+        void setStatus( DccStatus status, const TQString& statusDetail = TQString() );
-         void startTransferLogger();
-         void finishTransferLogger();
- 
-@@ -122,7 +122,7 @@ class DccTransfer : public TQObject
-     protected:
-         // transfer information
-         DccType m_type;
--        DcctqStatus m_status;
-+        DccStatus m_status;
-         TQString m_statusDetail;
-         bool m_resumed;
-         bool m_reverse;
-diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp
-index 635faf2..6bd6961 100644
---- a/konversation/src/dcctransferdetailedinfopanel.cpp
-+++ b/konversation/src/dcctransferdetailedinfopanel.cpp
-@@ -61,7 +61,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item )
- 
-     // If the file is already being transferred, the timer must be started here,
-     // otherwise the information will not be updated every 0.5sec
--    if (m_item->transfer()->gettqStatus() == DccTransfer::Transferring)
-+    if (m_item->transfer()->getStatus() == DccTransfer::Transferring)
-         m_autoViewUpdateTimer->start(500, false);
-     connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
- 
-@@ -83,10 +83,10 @@ void DccTransferDetailedInfoPanel::updateView()
- 
-     // Location:
-     m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() );
--    //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->gettqStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus );
--    m_urlreqLocation->lineEdit()->setReadOnly( transfer->gettqStatus() != DccTransfer::Queued );
--    m_urlreqLocation->lineEdit()->setFrame( transfer->gettqStatus() == DccTransfer::Queued );
--    m_urlreqLocation->button()->setEnabled( transfer->gettqStatus() == DccTransfer::Queued );
-+    //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->getStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus );
-+    m_urlreqLocation->lineEdit()->setReadOnly( transfer->getStatus() != DccTransfer::Queued );
-+    m_urlreqLocation->lineEdit()->setFrame( transfer->getStatus() == DccTransfer::Queued );
-+    m_urlreqLocation->button()->setEnabled( transfer->getStatus() == DccTransfer::Queued );
-     m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() );
- 
-     // Partner:
-@@ -110,11 +110,11 @@ void DccTransferDetailedInfoPanel::updateView()
-     else
-         m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) );
- 
--    // tqStatus:
--    if ( transfer->gettqStatus() == DccTransfer::Transferring )
--        m_labeltqStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" );
-+    // Status:
-+    if ( transfer->getStatus() == DccTransfer::Transferring )
-+        m_labelStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" );
-     else
--        m_labeltqStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' );
-+        m_labelStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' );
- 
-     // Progress:
-     m_progress->setProgress( transfer->getProgress() );
-@@ -146,7 +146,7 @@ void DccTransferDetailedInfoPanel::updateView()
- 
-         // The transfer is still in progress
-         if ( transfer->getTimeTransferFinished().isNull() )
--            transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::tqcurrentDateTime() );
-+            transferringTime = transfer->getTimeTransferStarted().secsTo( TQDateTime::currentDateTime() );
-         // The transfer has finished
-         else
-             transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() );
-@@ -176,15 +176,15 @@ void DccTransferDetailedInfoPanel::updateView()
-         m_labelTimeFinished->setText( "" );
- }
- 
--void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int oldtqStatus )
-+void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newStatus, int oldStatus )
- {
-     updateView();
--    if ( newtqStatus == DccTransfer::Transferring )
-+    if ( newStatus == DccTransfer::Transferring )
-     {
-         // start auto view-update timer
-         m_autoViewUpdateTimer->start( 500, false );
-     }
--    else if ( oldtqStatus == DccTransfer::Transferring )
-+    else if ( oldStatus == DccTransfer::Transferring )
-     {
-         // stop auto view-update timer
-         m_autoViewUpdateTimer->stop();
-diff --git a/konversation/src/dcctransferdetailedinfopanel.h b/konversation/src/dcctransferdetailedinfopanel.h
-index 7fbcf65..8433822 100644
---- a/konversation/src/dcctransferdetailedinfopanel.h
-+++ b/konversation/src/dcctransferdetailedinfopanel.h
-@@ -33,7 +33,7 @@ class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI
- 
-     private slots:
-         void updateView();
--        void slotTransferStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus );
-+        void slotTransferStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus );
-         void slotLocationChanged( const TQString& url );
-         void slotOpenFolderButtonClicked();
- 
-diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
-index 24f6742..b11b2e1 100644
---- a/konversation/src/dcctransferdetailedinfopanelui.ui
-+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
-@@ -71,7 +71,7 @@
-                         <cstring>textLabel10</cstring>
-                     </property>
-                     <property name="text">
--                        <string>tqStatus:</string>
-+                        <string>Status:</string>
-                     </property>
-                 </widget>
-                 <widget class="TQLabel" row="6" column="0">
-@@ -92,7 +92,7 @@
-                 </widget>
-                 <widget class="TQLabel" row="4" column="1">
-                     <property name="name">
--                        <cstring>m_labeltqStatus</cstring>
-+                        <cstring>m_labelStatus</cstring>
-                     </property>
-                 </widget>
-                 <widget class="TQLabel" row="2" column="1">
-@@ -188,7 +188,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -218,7 +218,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -240,7 +240,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -278,7 +278,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -316,7 +316,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -386,7 +386,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -424,7 +424,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>130</width>
-                                     <height>0</height>
-@@ -470,7 +470,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>110</width>
-                             <height>20</height>
-diff --git a/konversation/src/dcctransfermanager.cpp b/konversation/src/dcctransfermanager.cpp
-index 3e4357c..ec36840 100644
---- a/konversation/src/dcctransfermanager.cpp
-+++ b/konversation/src/dcctransfermanager.cpp
-@@ -62,7 +62,7 @@ DccTransferRecv* DccTransferManager::resumeDownload( int connectionId, const TQS
-     TQValueListConstIterator< DccTransferRecv* > it;
-     for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
-     {
--        if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) &&
-+        if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) &&
-              (*it)->getConnectionId() == connectionId &&
-              (*it)->getPartnerNick() == partnerNick &&
-              (*it)->getFileName() == fileName &&
-@@ -92,7 +92,7 @@ DccTransferSend* DccTransferManager::resumeUpload( int connectionId, const TQStr
-     TQValueListConstIterator< DccTransferSend* > it;
-     for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
-     {
--        if ( ( (*it)->gettqStatus() == DccTransfer::Queued || (*it)->gettqStatus() == DccTransfer::WaitingRemote ) &&
-+        if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) &&
-              (*it)->getConnectionId() == connectionId &&
-              (*it)->getPartnerNick() == partnerNick &&
-              (*it)->getFileName() == fileName &&
-@@ -124,7 +124,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, cons
-     for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
-     {
-         if (
--            (*it)->gettqStatus() == DccTransfer::WaitingRemote &&
-+            (*it)->getStatus() == DccTransfer::WaitingRemote &&
-             (*it)->getConnectionId() == connectionId &&
-             (*it)->getPartnerNick() == partnerNick &&
-             (*it)->getFileName() == fileName &&
-@@ -155,8 +155,8 @@ bool DccTransferManager::isLocalFileInWritingProcess( const KURL& url ) const
-     TQValueListConstIterator< DccTransferRecv* > it;
-     for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
-     {
--        if ( ( (*it)->gettqStatus() == DccTransfer::Connecting ||
--               (*it)->gettqStatus() == DccTransfer::Transferring ) &&
-+        if ( ( (*it)->getStatus() == DccTransfer::Connecting ||
-+               (*it)->getStatus() == DccTransfer::Transferring ) &&
-              (*it)->getFileURL() == url )
-         {
-             return true;
-@@ -175,25 +175,25 @@ bool DccTransferManager::hasActiveTransfers()
-     TQValueListConstIterator< DccTransferSend* > it;
-     for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it )
-     {
--        if ((*it)->gettqStatus() == DccTransfer::Transferring)
-+        if ((*it)->getStatus() == DccTransfer::Transferring)
-             return true;
-     }
- 
-     TQValueListConstIterator< DccTransferRecv* > it2;
-     for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 )
-     {
--        if ((*it2)->gettqStatus() == DccTransfer::Transferring)
-+        if ((*it2)->getStatus() == DccTransfer::Transferring)
-             return true;
-     }
- 
-     return false;
- }
- 
--void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus )
-+void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus )
- {
--    kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldtqStatus << " -> " << newtqStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl;
-+    kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl;
- 
--    if ( newtqStatus == DccTransfer::Queued )
-+    if ( newStatus == DccTransfer::Queued )
-         emit newTransferQueued( item );
- }
- 
-@@ -205,7 +205,7 @@ void DccTransferManager::slotSettingsChanged()
-         TQValueListConstIterator< DccTransferRecv* > it;
-         for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it )
-         {
--            if ( (*it)->gettqStatus() == DccTransfer::Queued &&
-+            if ( (*it)->getStatus() == DccTransfer::Queued &&
-                  (*it)->getFileURL().directory() == m_defaultIncomingFolder )
-             {
-                 KURL url;
-diff --git a/konversation/src/dcctransfermanager.h b/konversation/src/dcctransfermanager.h
-index c5753f7..0a34c3b 100644
---- a/konversation/src/dcctransfermanager.h
-+++ b/konversation/src/dcctransfermanager.h
-@@ -79,7 +79,7 @@ class DccTransferManager : public TQObject
-         void initTransfer( DccTransfer* transfer );
- 
-     private slots:
--        void slotTransferStatusChanged( DccTransfer* item, int newtqStatus, int oldtqStatus );
-+        void slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus );
-         void removeSendItem( DccTransfer* item );
-         void removeRecvItem( DccTransfer* item );
- 
-diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
-index 385850b..8b89afa 100644
---- a/konversation/src/dcctransferpanel.cpp
-+++ b/konversation/src/dcctransferpanel.cpp
-@@ -76,7 +76,7 @@ void DccTransferPanel::initGUI()
- 
-     //m_listView->setColumnText(Column::TypeIcon,      "");
-     m_listView->setColumnText(Column::OfferDate,     i18n("Started at"));
--    m_listView->setColumnText(Column::tqStatus,        i18n("Status"));
-+    m_listView->setColumnText(Column::Status,        i18n("Status"));
-     m_listView->setColumnText(Column::FileName,      i18n("File"));
-     m_listView->setColumnText(Column::PartnerNick,   i18n("Partner"));
-     m_listView->setColumnText(Column::Progress,      i18n("Progress"));
-@@ -201,7 +201,7 @@ void DccTransferPanel::updateButton()
-         DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() );
- 
-         DccTransfer::DccType type = item->transfer()->getType();
--        DccTransfer::DcctqStatus status = item->transfer()->gettqStatus();
-+        DccTransfer::DccStatus status = item->transfer()->getStatus();
- 
-         selectAll = true;
-         selectAllCompleted |= ( status >= DccTransfer::Done );
-@@ -276,7 +276,7 @@ void DccTransferPanel::acceptDcc()
-         {
-             DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
-             DccTransfer* transfer = item->transfer();
--            if( transfer->getType() == DccTransfer::Receive && transfer->gettqStatus() == DccTransfer::Queued )
-+            if( transfer->getType() == DccTransfer::Receive && transfer->getStatus() == DccTransfer::Queued )
-                 transfer->start();
-         }
-         ++it;
-@@ -292,7 +292,7 @@ void DccTransferPanel::abortDcc()
-         {
-             DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
-             DccTransfer* transfer = item->transfer();
--            if( transfer->gettqStatus() < DccTransfer::Done )
-+            if( transfer->getStatus() < DccTransfer::Done )
-                 transfer->abort();
-         }
-         ++it;
-@@ -308,7 +308,7 @@ void DccTransferPanel::resendFile()
-         {
-             DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
-             DccTransfer* transfer = item->transfer();
--            if( transfer->getType() == DccTransfer::Send && transfer->gettqStatus() >= DccTransfer::Done )
-+            if( transfer->getType() == DccTransfer::Send && transfer->getStatus() >= DccTransfer::Done )
-             {
-                 DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload();
- 
-@@ -335,7 +335,7 @@ void DccTransferPanel::clearDcc()
-     {
-         DccTransferPanelItem* item = static_cast<DccTransferPanelItem*>( it.current() );
-         // should we check that [item] is not null?
--        if( it.current()->isSelected() && item->transfer()->gettqStatus() >= DccTransfer::Done )
-+        if( it.current()->isSelected() && item->transfer()->getStatus() >= DccTransfer::Done )
-             lst.append( it.current() );
-         ++it;
-     }
-@@ -377,7 +377,7 @@ void DccTransferPanel::runDcc()
-         {
-             DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
-             DccTransfer* transfer = item->transfer();
--            if( transfer->getType() == DccTransfer::Send || transfer->gettqStatus() == DccTransfer::Done )
-+            if( transfer->getType() == DccTransfer::Send || transfer->getStatus() == DccTransfer::Done )
-                 item->runFile();
-         }
-         ++it;
-@@ -392,7 +392,7 @@ void DccTransferPanel::showFileInfo()
-         if( it.current()->isSelected() )
-         {
-             DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
--            if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->gettqStatus() == DccTransfer::Done )
-+            if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->getStatus() == DccTransfer::Done )
-                 item->openFileInfoDialog();
-         }
-         ++it;
-@@ -416,7 +416,7 @@ void DccTransferPanel::selectAllCompleted()
-     while ( it.current() )
-     {
-         DccTransferPanelItem* item=static_cast<DccTransferPanelItem*>( it.current() );
--        m_listView->setSelected( *it, item->transfer()->gettqStatus() >= DccTransfer::Done );
-+        m_listView->setSelected( *it, item->transfer()->getStatus() >= DccTransfer::Done );
-         ++it;
-     }
-     updateButton();
-diff --git a/konversation/src/dcctransferpanel.h b/konversation/src/dcctransferpanel.h
-index 09afaeb..7b88bcb 100644
---- a/konversation/src/dcctransferpanel.h
-+++ b/konversation/src/dcctransferpanel.h
-@@ -39,7 +39,7 @@ class DccTransferPanel : public ChatWindow
-                 {
-                     TypeIcon,
-                     OfferDate,
--                    tqStatus,
-+                    Status,
-                     FileName,
-                     PartnerNick,
-                     Progress,
-diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
-index 8737a3b..d2cb9ee 100644
---- a/konversation/src/dcctransferpanelitem.cpp
-+++ b/konversation/src/dcctransferpanelitem.cpp
-@@ -67,10 +67,10 @@ DccTransferPanelItem::~DccTransferPanelItem()
- void DccTransferPanelItem::updateView()
- {
-     setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() );
--    setPixmap( DccTransferPanel::Column::tqStatus,   getStatusIcon() );
-+    setPixmap( DccTransferPanel::Column::Status,   getStatusIcon() );
- 
-     setText( DccTransferPanel::Column::OfferDate,     m_transfer->getTimeOffer().toString( "hh:mm:ss" ) );
--    setText( DccTransferPanel::Column::tqStatus,        getStatusText() );
-+    setText( DccTransferPanel::Column::Status,        getStatusText() );
-     setText( DccTransferPanel::Column::FileName,      m_transfer->getFileName() );
-     setText( DccTransferPanel::Column::PartnerNick,   m_transfer->getPartnerNick() );
-     setText( DccTransferPanel::Column::Position,      getPositionPrettyText() );
-@@ -104,9 +104,9 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending )
-             if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1;
-             return 0;
-             break;
--        case DccTransferPanel::Column::tqStatus:
--            if ( m_transfer->gettqStatus() > item->transfer()->gettqStatus() ) return 1;
--            if ( m_transfer->gettqStatus() < item->transfer()->gettqStatus() ) return -1;
-+        case DccTransferPanel::Column::Status:
-+            if ( m_transfer->getStatus() > item->transfer()->getStatus() ) return 1;
-+            if ( m_transfer->getStatus() < item->transfer()->getStatus() ) return -1;
-             return 0;
-             break;
-         case DccTransferPanel::Column::Position:
-@@ -130,11 +130,11 @@ int DccTransferPanelItem::compare( TQListViewItem* i, int col, bool ascending )
-     return TQListViewItem::compare( i, col, ascending );
- }
- 
--void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newtqStatus, int /* oldtqStatus */ )
-+void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newStatus, int /* oldStatus */ )
- {
-     updateView();
- 
--    if ( newtqStatus == DccTransfer::Transferring )
-+    if ( newStatus == DccTransfer::Transferring )
-         startAutoViewUpdate();
- }
- 
-@@ -167,7 +167,7 @@ void DccTransferPanelItem::showProgressBar()
- {
-     if ( m_transfer->getFileSize() )
-     {
--        TQRect rect = listView()->tqitemRect( this );
-+        TQRect rect = listView()->itemRect( this );
-         TQHeader *head = listView()->header();
-         rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() );
-         rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) );
-@@ -178,13 +178,13 @@ void DccTransferPanelItem::showProgressBar()
- 
- void DccTransferPanelItem::runFile()
- {
--    if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done )
-+    if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done )
-         new KRun( m_transfer->getFileURL(), listView() );
- }
- 
- void DccTransferPanelItem::openFileInfoDialog()
- {
--    if ( m_transfer->getType() == DccTransfer::Send || m_transfer->gettqStatus() == DccTransfer::Done )
-+    if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done )
-     {
-         TQStringList infoList;
- 
-@@ -278,7 +278,7 @@ TQPixmap DccTransferPanelItem::getTypeIcon() const
- TQPixmap DccTransferPanelItem::getStatusIcon() const
- {
-     TQString icon;
--    switch ( m_transfer->gettqStatus() )
-+    switch ( m_transfer->getStatus() )
-     {
-         case DccTransfer::Queued:
-             icon = "player_stop";
-@@ -306,7 +306,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const
- 
- TQString DccTransferPanelItem::getStatusText() const
- {
--    DccTransfer::DcctqStatus status = m_transfer->gettqStatus();
-+    DccTransfer::DccStatus status = m_transfer->getStatus();
-     DccTransfer::DccType type = m_transfer->getType();
- 
-     if ( status == DccTransfer::Queued )
-diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
-index 7e1b113..eef6305 100644
---- a/konversation/src/dcctransferpanelitem.h
-+++ b/konversation/src/dcctransferpanelitem.h
-@@ -71,7 +71,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem
-         static TQString secToHMS( long sec );
- 
-     private slots:
--        void slotStatusChanged( DccTransfer* transfer, int newtqStatus, int oldtqStatus );
-+        void slotStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus );
-         void updateView();
- 
-     private:
-diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
-index 6a5820a..9922bbb 100644
---- a/konversation/src/dcctransferrecv.cpp
-+++ b/konversation/src/dcctransferrecv.cpp
-@@ -113,44 +113,44 @@ void DccTransferRecv::cleanUp()
- // just for convenience
- void DccTransferRecv::failed( const TQString& errorMessage )
- {
--    settqStatus( Failed, errorMessage );
-+    setStatus( Failed, errorMessage );
-     cleanUp();
-     emit done( this );
- }
- 
- void DccTransferRecv::setPartnerIp( const TQString& ip )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_partnerIp = ip;
- }
- 
- void DccTransferRecv::setPartnerPort( const TQString& port )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_partnerPort = port;
- }
- 
- void DccTransferRecv::setFileSize( unsigned long fileSize )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_fileSize = fileSize;
- }
- 
- void DccTransferRecv::setFileName( const TQString& fileName )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_fileName = fileName;
- }
- 
- void DccTransferRecv::setFileURL( const KURL& url )
- {
--    if ( gettqStatus() == Configuring || gettqStatus() == Queued )
-+    if ( getStatus() == Configuring || getStatus() == Queued )
-         m_fileURL = url;
- }
- 
- void DccTransferRecv::setReverse( bool reverse, const TQString& reverseToken )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-     {
-         m_reverse = reverse;
-         if ( reverse )
-@@ -165,7 +165,7 @@ bool DccTransferRecv::queue()
- {
-     kdDebug() << "DccTransferRecv::queue()" << endl;
- 
--    if ( gettqStatus() != Configuring )
-+    if ( getStatus() != Configuring )
-         return false;
- 
-     if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() )
-@@ -237,7 +237,7 @@ void DccTransferRecv::abort()                     // public slot
-         m_writeCacheHandler->write( true );       // flush
-     }
- 
--    settqStatus( Aborted );
-+    setStatus( Aborted );
-     cleanUp();
-     emit done( this );
- }
-@@ -246,10 +246,10 @@ void DccTransferRecv::start()                     // public slot
- {
-     kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl;
- 
--    if ( gettqStatus() != Queued )
-+    if ( getStatus() != Queued )
-         return;
- 
--    settqStatus( Preparing );
-+    setStatus( Preparing );
- 
-     prepareLocalKio( false, false );
- 
-@@ -305,7 +305,7 @@ void DccTransferRecv::askAndPrepareLocalKio( const TQString& message, int enable
-             break;
-         case DccResumeDialog::RA_Cancel:
-         default:
--            settqStatus( Queued );
-+            setStatus( Queued );
-     }
- }
- 
-@@ -444,7 +444,7 @@ void DccTransferRecv::connectWithSender()
-         m_ownIp = DccCommon::getOwnIp( server );
-         m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) );
- 
--        settqStatus( WaitingRemote, i18n( "Waiting for connection" ) );
-+        setStatus( WaitingRemote, i18n( "Waiting for connection" ) );
- 
-         server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken );
- 
-@@ -460,7 +460,7 @@ void DccTransferRecv::requestResume()
- {
-     kdDebug() << "DccTransferRecv::requestResume()" << endl;
- 
--    settqStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) );
-+    setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) );
- 
-     startConnectionTimer( 30 );
- 
-@@ -503,7 +503,7 @@ void DccTransferRecv::connectToSendServer()
- 
-     // connect to sender
- 
--    settqStatus( Connecting );
-+    setStatus( Connecting );
- 
-     m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this);
- 
-@@ -577,7 +577,7 @@ void DccTransferRecv::startReceiving()
-     connect( m_recvSocket, TQT_SIGNAL( readyWrite() ),                       this, TQT_SLOT( sendAck() )               );
-     connect( m_recvSocket, TQT_SIGNAL( closed() ),                           this, TQT_SLOT( slotSocketClosed() )      );
- 
--    settqStatus( Transferring );
-+    setStatus( Transferring );
- 
-     m_transferStartPosition = m_transferringPosition;
- 
-@@ -633,7 +633,7 @@ void DccTransferRecv::sendAck()                   // slot
- void DccTransferRecv::slotLocalWriteDone()        // <-WriteCacheHandler::done()
- {
-     kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl;
--    settqStatus( Done );
-+    setStatus( Done );
-     cleanUp();
-     emit done( this );
- }
-@@ -670,7 +670,7 @@ void DccTransferRecv::connectionTimeout()         // slot
- void DccTransferRecv::slotSocketClosed()
- {
-     finishTransferLogger();
--    if ( gettqStatus() == Transferring )
-+    if ( getStatus() == Transferring )
-         failed( i18n( "Remote user disconnected" ) );
- }
- 
-diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp
-index 295a12b..db0bad2 100644
---- a/konversation/src/dcctransfersend.cpp
-+++ b/konversation/src/dcctransfersend.cpp
-@@ -91,38 +91,38 @@ void DccTransferSend::cleanUp()
- // just for convenience
- void DccTransferSend::failed( const TQString& errorMessage )
- {
--    settqStatus( Failed, errorMessage );
-+    setStatus( Failed, errorMessage );
-     cleanUp();
-     emit done( this );
- }
- 
- void DccTransferSend::setFileURL( const KURL& url )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_fileURL = url;
- }
- 
- void DccTransferSend::setFileName( const TQString& fileName )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_fileName = fileName;
- }
- 
- void DccTransferSend::setOwnIp( const TQString& ownIp )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_ownIp = ownIp;
- }
- 
- void DccTransferSend::setFileSize( KIO::filesize_t fileSize )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_fileSize = fileSize;
- }
- 
- void DccTransferSend::setReverse( bool reverse )
- {
--    if ( gettqStatus() == Configuring )
-+    if ( getStatus() == Configuring )
-         m_reverse = reverse;
- }
- 
-@@ -130,7 +130,7 @@ bool DccTransferSend::queue()
- {
-     kdDebug() << "DccTransferSend::queue()" << endl;
- 
--    if ( gettqStatus() != Configuring )
-+    if ( getStatus() != Configuring )
-         return false;
- 
-     if ( m_ownIp.isEmpty() )
-@@ -217,7 +217,7 @@ void DccTransferSend::abort()                     // public slot
- {
-     kdDebug() << "DccTransferSend::abort()" << endl;
- 
--    settqStatus( Aborted );
-+    setStatus( Aborted );
-     cleanUp();
-     emit done( this );
- }
-@@ -226,7 +226,7 @@ void DccTransferSend::start()                     // public slot
- {
-     kdDebug() << "DccTransferSend::start()" << endl;
- 
--    if ( gettqStatus() != Queued )
-+    if ( getStatus() != Queued )
-         return;
- 
-     // common procedure
-@@ -283,7 +283,7 @@ void DccTransferSend::start()                     // public slot
-         server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken );
-     }
- 
--    settqStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) );
-+    setStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) );
- }
- 
- void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQString& partnerPort )
-@@ -300,7 +300,7 @@ void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQSt
-     connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) );
-     connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) );
- 
--    settqStatus( Connecting );
-+    setStatus( Connecting );
- 
-     m_sendSocket->connect();
- }
-@@ -309,7 +309,7 @@ bool DccTransferSend::setResume( unsigned long position )
- {
-     kdDebug() << "DccTransferSend::setResume(): position=" << position << endl;
- 
--    if ( gettqStatus() > WaitingRemote )
-+    if ( getStatus() > WaitingRemote )
-         return false;
- 
-     if ( position >= m_fileSize )
-@@ -359,7 +359,7 @@ void DccTransferSend::startSending()
-         m_file.at( m_transferringPosition );
-         m_transferStartPosition = m_transferringPosition;
- 
--        settqStatus( Transferring );
-+        setStatus( Transferring );
-         m_sendSocket->enableWrite( true );
-         m_sendSocket->enableRead( m_fastSend );
-         startTransferLogger();                      // initialize CPS counter, ETA counter, etc...
-@@ -407,7 +407,7 @@ void DccTransferSend::getAck()                    // slot
-         {
-             kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl;
-             finishTransferLogger();
--            settqStatus( Done );
-+            setStatus( Done );
-             cleanUp();
-             emit done( this );
-             break;                                // for safe
-@@ -457,7 +457,7 @@ void DccTransferSend::slotSendSocketClosed()
- {
-     kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl;
-     finishTransferLogger();
--    if ( gettqStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize )
-+    if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize )
-         failed( i18n( "Remote user disconnected" ) );
- }
- 
-diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui
-index 389a252..a50b3a0 100644
---- a/konversation/src/fontappearance_preferences.ui
-+++ b/konversation/src/fontappearance_preferences.ui
-@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>161</height>
-diff --git a/konversation/src/generalbehavior_preferences.ui b/konversation/src/generalbehavior_preferences.ui
-index 164ca58..0354e67 100644
---- a/konversation/src/generalbehavior_preferences.ui
-+++ b/konversation/src/generalbehavior_preferences.ui
-@@ -60,7 +60,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>31</width>
-                             <height>20</height>
-@@ -88,7 +88,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>31</width>
-                             <height>20</height>
-@@ -301,7 +301,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>20</height>
-diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
-index 65baf8f..3b42a4d 100644
---- a/konversation/src/highlight_preferencesui.ui
-+++ b/konversation/src/highlight_preferencesui.ui
-@@ -141,7 +141,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>250</height>
-@@ -362,7 +362,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>120</width>
-                     <height>20</height>
-@@ -379,7 +379,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>50</width>
-                     <height>20</height>
-@@ -396,7 +396,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>50</width>
-                     <height>21</height>
-diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
-index b726d29..88aa423 100644
---- a/konversation/src/ignore_preferencesui.ui
-+++ b/konversation/src/ignore_preferencesui.ui
-@@ -185,7 +185,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>40</height>
-diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp
-index f597812..f2e78ec 100644
---- a/konversation/src/inputfilter.cpp
-+++ b/konversation/src/inputfilter.cpp
-@@ -371,7 +371,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     i18n("Received CTCP-%1 request from %2, sending answer.")
-                     .tqarg("TIME").tqarg(sourceNick)
-                     );
--                server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::tqcurrentDateTime().toString());
-+                server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString());
-             }
- 
-             // No known CTCP request, give a general message
-@@ -431,7 +431,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     // pong reply, calculate turnaround time
-                     if(replyReason.lower()=="ping")
-                     {
--                        int dateArrived=TQDateTime::tqcurrentDateTime().toTime_t();
-+                        int dateArrived=TQDateTime::currentDateTime().toTime_t();
-                         int dateSent=reply.toInt();
-                         int time = dateArrived-dateSent;
-                         TQString unit = "seconds";
-diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
-index 568adc9..20d3edf 100644
---- a/konversation/src/ircinput.cpp
-+++ b/konversation/src/ircinput.cpp
-@@ -61,7 +61,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
-     connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&)));
- 
-     // widget may not be resized vertically
--    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed));
-+    setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed));
- 
-     //NoWrap coupled with the size policy constrains the line edit to be one row high
-     setWordWrap(m_multiRow ? WidgetWidth : NoWrap);
-@@ -130,7 +130,7 @@ void IRCInput::updateAppearance()
- {
-     m_multiRow = Preferences::useMultiRowInputBox();
-     setWordWrap(m_multiRow ? WidgetWidth : NoWrap);
--    m_lastHeight=heightForWidth(tqsizeHint().width());
-+    m_lastHeight=heightForWidth(sizeHint().width());
-     ensureCursorVisible(); //appears to trigger updateGeometry
- }
- 
-@@ -144,7 +144,7 @@ void IRCInput::resizeContents( int w, int h )
- }
- 
- // widget must be only one line high - luckily QT will enforce this via wrappping policy
--TQSize IRCInput::tqsizeHint() const
-+TQSize IRCInput::sizeHint() const
- {
-     constPolish();
- 
-diff --git a/konversation/src/ircinput.h b/konversation/src/ircinput.h
-index f372b24..f4fa095 100644
---- a/konversation/src/ircinput.h
-+++ b/konversation/src/ircinput.h
-@@ -38,7 +38,7 @@ class IRCInput : public KTextEdit
-         int getOldCursorPosition();
-         TQString lastCompletion() const { return m_lastCompletion; }
- 
--        virtual TQSize tqsizeHint() const;
-+        virtual TQSize sizeHint() const;
-         TQString text() const;
- 
-     signals:
-diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
-index 6b3342b..fb57094 100644
---- a/konversation/src/ircview.cpp
-+++ b/konversation/src/ircview.cpp
-@@ -532,7 +532,7 @@ bool doHighlight, bool parseURL, bool self)
-                         (whoSent.find(needleReg) != -1));
- 
-                     // remember captured patterns for later
--                    captures=needleReg.tqcapturedTexts();
-+                    captures=needleReg.capturedTexts();
- 
-                 }
-                 else
-@@ -1709,7 +1709,7 @@ TQString IRCView::timeStamp()
-         }
-         else
-         {
--            TQDate date = TQDate::tqcurrentDate();
-+            TQDate date = TQDate::currentDate();
-             timeString = TQString("<font color=\"" +
-                 timeColor + "\">[%1 %2]</font> ")
-                     .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/),
-diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp
-index 9318cbf..24401dd 100644
---- a/konversation/src/ircviewbox.cpp
-+++ b/konversation/src/ircviewbox.cpp
-@@ -84,14 +84,14 @@ void IRCViewBox::searchNext(bool reversed)
-     if (match)
-     {
-         m_searchBar->setHasMatch(true);
--        m_searchBar->settqStatus(TQPixmap(), "");
-+        m_searchBar->setStatus(TQPixmap(), "");
-         return;
-     }
- 
-     if (!m_matchedOnce)
-     {
-         m_searchBar->setHasMatch(false);
--        m_searchBar->settqStatus(getIcon("messagebox_warning"),
-+        m_searchBar->setStatus(getIcon("messagebox_warning"),
-                               i18n("Phrase not found"));
-         return;
-     }
-@@ -105,13 +105,13 @@ void IRCViewBox::searchNext(bool reversed)
-     if (!match)
-     {
-         m_searchBar->setHasMatch(false);
--        m_searchBar->settqStatus(getIcon("messagebox_warning"),
-+        m_searchBar->setStatus(getIcon("messagebox_warning"),
-                               i18n("Phrase not found"));
-         return;
-     }
- 
-     m_searchBar->setHasMatch(true);
--    m_searchBar->settqStatus(getIcon("messagebox_info"),
-+    m_searchBar->setStatus(getIcon("messagebox_info"),
-                           i18n("Wrapped search"));
- }
- 
-@@ -126,12 +126,12 @@ void IRCViewBox::slotSearchChanged(const TQString& pattern)
-     if (match)
-     {
-         m_searchBar->setHasMatch(true);
--        m_searchBar->settqStatus(TQPixmap(), "");
-+        m_searchBar->setStatus(TQPixmap(), "");
-     }
-     else
-     {
-         m_searchBar->setHasMatch(false);
--        m_searchBar->settqStatus(getIcon("messagebox_warning"),
-+        m_searchBar->setStatus(getIcon("messagebox_warning"),
-             i18n("Phrase not found"));
-     }
- 
-diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
-index d8f5891..083a1ee 100644
---- a/konversation/src/konversationapplication.cpp
-+++ b/konversation/src/konversationapplication.cpp
-@@ -343,7 +343,7 @@ void KonversationApplication::readOptions()
-     osd->setShadow(Preferences::oSDDrawShadow());
- 
-     osd->setOffset(Preferences::oSDOffsetX(), Preferences::oSDOffsetY());
--    osd->tqsetAlignment((OSDWidget::Alignment)Preferences::oSDAlignment());
-+    osd->setAlignment((OSDWidget::Alignment)Preferences::oSDAlignment());
- 
-     if(Preferences::oSDUseCustomColors())
-     {
-@@ -856,7 +856,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output
-                     if(index != -1)
-                     {
-                         // remember captured patterns
--                        TQStringList captures = needleReg.tqcapturedTexts();
-+                        TQStringList captures = needleReg.capturedTexts();
- 
-                         // replace %0 - %9 in regex groups
-                         for(unsigned int capture=0;capture<captures.count();capture++)
-diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp
-index 86ddb24..bd8e61e 100644
---- a/konversation/src/konversationstatusbar.cpp
-+++ b/konversation/src/konversationstatusbar.cpp
-@@ -33,7 +33,7 @@ KonversationStatusBar::KonversationStatusBar(KonversationMainWindow* window)
- 
-     m_mainLabel = new KSqueezedTextLabel(m_window->statusBar(),"mainLabel");
-     setMainLabelText(i18n("Ready."));
--    m_mainLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-+    m_mainLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-     m_mainLabel->setMinimumWidth(0);
- 
-     // KSqueezedLabel calculates the wrong height. Popular workaround.
-diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp
-index 79cf12a..5a76682 100644
---- a/konversation/src/konvibookmarkhandler.cpp
-+++ b/konversation/src/konvibookmarkhandler.cpp
-@@ -63,7 +63,7 @@ KonviBookmarkHandler::~KonviBookmarkHandler()
- void KonviBookmarkHandler::slotEditBookmarks()
- {
-     KProcess proc;
--    proc << TQString::tqfromLatin1("keditbookmarks");
-+    proc << TQString::fromLatin1("keditbookmarks");
-     proc << "--nobrowser";
-     proc << "--caption" << i18n("Konversation Bookmarks Editor");
-     proc << m_file;
-diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp
-index 6a050af..7d09c49 100644
---- a/konversation/src/linkaddressbook/addressbook.cpp
-+++ b/konversation/src/linkaddressbook/addressbook.cpp
-@@ -98,7 +98,7 @@ namespace Konversation
-             kdDebug() << "Addressbook::presenceString() called with an empty uid" << endl;
-             return TQString("Error");
-         }
--        switch( presencetqStatus(uid))
-+        switch( presenceStatus(uid))
-         {
-             case 0:
-                 return "";
-@@ -113,7 +113,7 @@ namespace Konversation
-         }
-         return TQString("Error");
-     }
--    int Addressbook::presencetqStatus(const TQString &uid)
-+    int Addressbook::presenceStatus(const TQString &uid)
-     {
-         return presenceStatusByAddressee(addressBook->findByUid(uid));
-     }
-@@ -125,7 +125,7 @@ namespace Konversation
-             kdDebug() << "Addressbook::canReceiveFiles() called with empty uid" << endl;
-             return false;
-         }
--        int presence = presencetqStatus(uid);
-+        int presence = presenceStatus(uid);
- 
-         return (presence == 4) || (presence == 3);
-     }
-@@ -137,7 +137,7 @@ namespace Konversation
-             return false;
-         }
-         //this should return false if they are offline.
--        int result = presencetqStatus(uid);
-+        int result = presenceStatus(uid);
-         if(result == 3 || result == 4) return true;
-         return false;
-     }
-@@ -161,7 +161,7 @@ namespace Konversation
-         if(!isPresent(uid))
-             return TQPixmap();
- 
--        switch(presencetqStatus(uid))
-+        switch(presenceStatus(uid))
-         {
-             case 0:                               //Unknown
-             case 1:                               //Offline
-@@ -331,7 +331,7 @@ void Addressbook::emitContactPresenceChanged(const TQString &uid)
-         return;
-     };
- 
--    emitContactPresenceChanged(uid, presencetqStatus(uid));
-+    emitContactPresenceChanged(uid, presenceStatus(uid));
- }
- 
- }                                                 //NAMESPACE
-diff --git a/konversation/src/linkaddressbook/addressbook.h b/konversation/src/linkaddressbook/addressbook.h
-index 222a05f..95fc6c5 100644
---- a/konversation/src/linkaddressbook/addressbook.h
-+++ b/konversation/src/linkaddressbook/addressbook.h
-@@ -52,7 +52,7 @@ namespace Konversation
-             // metadata
-             TQPixmap icon( const TQString &uid );
-             TQString context( const TQString &uid );
--            virtual int presencetqStatus(const TQString &uid);
-+            virtual int presenceStatus(const TQString &uid);
-             // App capabilities
-             TQStringList protocols();
- 
-diff --git a/konversation/src/linkaddressbook/kimiface.h b/konversation/src/linkaddressbook/kimiface.h
-index bd6ab85..257bb42 100644
---- a/konversation/src/linkaddressbook/kimiface.h
-+++ b/konversation/src/linkaddressbook/kimiface.h
-@@ -88,7 +88,7 @@ class KIMIface : virtual public DCOPObject
-      * @param uid the KABC uid you want the presence for.
-      * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online)
-      */
--    virtual int presencetqStatus( const TQString & uid ) = 0;
-+    virtual int presenceStatus( const TQString & uid ) = 0;
-     /**
-      * Indicate if a given uid can receive files
-      * @param uid the KABC uid you are interested in.
-@@ -175,7 +175,7 @@ class KIMIface : virtual public DCOPObject
-      * Indicates that a contact's presence has changed
-      * @param uid the contact whose presence changed.
-      * @param appId the dcop application id of the program the signal originates from.
--     * @param presence the new numeric presence @ref presencetqStatus
-+     * @param presence the new numeric presence @ref presenceStatus
-      */
-     void contactPresenceChanged( TQString uid, TQCString appId, int presence );
- };
-diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-index 5d630c4..e67d306 100644
---- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-@@ -37,7 +37,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>405</width>
-                     <height>20</height>
-diff --git a/konversation/src/linkaddressbook/nicklisttooltip.cpp b/konversation/src/linkaddressbook/nicklisttooltip.cpp
-index f49d7a0..732b32e 100644
---- a/konversation/src/linkaddressbook/nicklisttooltip.cpp
-+++ b/konversation/src/linkaddressbook/nicklisttooltip.cpp
-@@ -52,17 +52,17 @@ namespace Konversation
-             return;
- 
-         TQString toolTip;
--        TQRect tqitemRect = m_listView->tqitemRect( item );
-+        TQRect itemRect = m_listView->itemRect( item );
- 
-         uint leftMargin = m_listView->treeStepSize() *
-             ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
-             m_listView->itemMargin();
--        uint xAdjust = tqitemRect.left() + leftMargin;
--        uint yAdjust = tqitemRect.top();
-+        uint xAdjust = itemRect.left() + leftMargin;
-+        uint yAdjust = itemRect.top();
-         TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
-         toolTip = Konversation::removeIrcMarkup(nick->getChannelNick()->tooltip());
-         if(!toolTip.isEmpty())
--            tip(tqitemRect, toolTip);
-+            tip(itemRect, toolTip);
-     }
- 
- }                                                 // namespace Konversation
-diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
-index 6315e10..9c4df71 100644
---- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
-+++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp
-@@ -51,17 +51,17 @@ namespace Konversation
-         if(!nickInfo )
-             return;
-         TQString toolTip;
--        TQRect tqitemRect = m_listView->tqitemRect( item );
-+        TQRect itemRect = m_listView->itemRect( item );
- 
-         uint leftMargin = m_listView->treeStepSize() *
-             ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
-             m_listView->itemMargin();
--        uint xAdjust = tqitemRect.left() + leftMargin;
--        uint yAdjust = tqitemRect.top();
-+        uint xAdjust = itemRect.left() + leftMargin;
-+        uint yAdjust = itemRect.top();
-         TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
-         toolTip = nickInfo->tooltip();
-         if(!toolTip.isEmpty())
--            tip(tqitemRect, toolTip);
-+            tip(itemRect, toolTip);
-     }
- 
- }                                                 // namespace Konversation
-diff --git a/konversation/src/log_preferences.ui b/konversation/src/log_preferences.ui
-index 0ffdfc7..13326e6 100644
---- a/konversation/src/log_preferences.ui
-+++ b/konversation/src/log_preferences.ui
-@@ -92,7 +92,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>10</height>
-diff --git a/konversation/src/multilinetextedit.cpp b/konversation/src/multilinetextedit.cpp
-index 880d0d1..be42a1f 100644
---- a/konversation/src/multilinetextedit.cpp
-+++ b/konversation/src/multilinetextedit.cpp
-@@ -44,7 +44,7 @@ void MultilineTextEdit::drawWhitespaces()
-   TQPainter pa(viewport());
- 
-   // get a sane color
--  TQColor col=tqcolorGroup().link();
-+  TQColor col=colorGroup().link();
-   // and a brush of the same color
-   TQBrush fillBrush(col);
-   // use it for line drawing
-diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
-index fb2cde4..17765ca 100644
---- a/konversation/src/nickinfo.cpp
-+++ b/konversation/src/nickinfo.cpp
-@@ -99,7 +99,7 @@ bool NickInfo::isIdentified() const { return m_identified; }
- TQString NickInfo::getPrettyOnlineSince() const
- {
-     TQString prettyOnlineSince;
--    int daysto = m_onlineSince.date().daysTo( TQDate::tqcurrentDate());
-+    int daysto = m_onlineSince.date().daysTo( TQDate::currentDate());
-     if(daysto == 0) prettyOnlineSince = i18n("Today");
-     else if(daysto == 1) prettyOnlineSince = i18n("Yesterday");
-     else prettyOnlineSince = m_onlineSince.toString("ddd d MMMM yyyy");
-diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui
-index 3df61f0..53b06ae 100644
---- a/konversation/src/nicklistbehavior_preferencesui.ui
-+++ b/konversation/src/nicklistbehavior_preferencesui.ui
-@@ -54,7 +54,7 @@ the Free Software Foundation; either version 2 of the License, or
-         </widget>
-         <widget class="TQCheckBox" row="3" column="0">
-             <property name="name">
--                <cstring>kcfg_SortBytqStatus</cstring>
-+                <cstring>kcfg_SortByStatus</cstring>
-             </property>
-             <property name="sizePolicy">
-                 <sizepolicy>
-@@ -133,13 +133,13 @@ the Free Software Foundation; either version 2 of the License, or
- </widget>
- <connections>
-     <connection>
--        <sender>kcfg_SortBytqStatus</sender>
-+        <sender>kcfg_SortByStatus</sender>
-         <signal>toggled(bool)</signal>
-         <receiver>sortOrder</receiver>
-         <slot>setEnabled(bool)</slot>
-     </connection>
-     <connection>
--        <sender>kcfg_SortBytqStatus</sender>
-+        <sender>kcfg_SortByStatus</sender>
-         <signal>toggled(bool)</signal>
-         <receiver>orderHintLabel</receiver>
-         <slot>setEnabled(bool)</slot>
-@@ -148,7 +148,7 @@ the Free Software Foundation; either version 2 of the License, or
- <tabstops>
-     <tabstop>kcfg_ChannelDoubleClickAction</tabstop>
-     <tabstop>kcfg_SortCaseInsensitive</tabstop>
--    <tabstop>kcfg_SortBytqStatus</tabstop>
-+    <tabstop>kcfg_SortByStatus</tabstop>
-     <tabstop>sortOrder</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
-diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp
-index ab98437..26e6bdd 100644
---- a/konversation/src/nicklistview.cpp
-+++ b/konversation/src/nicklistview.cpp
-@@ -86,14 +86,14 @@ KListView(parent)
- 
-         int newitem;
-         newitem = popup->insertItem(i18n("Open &Query"),Konversation::OpenQuery);
--        popup->tqsetWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server.  This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>");
-+        popup->setWhatsThis(newitem, "<qt>Start a private chat between you and this person.<p/><em>Technical note:</em><br>The conversation between you and this person will be sent via the server.  This means that the conversation will be affected by server lag, server stability, and will be terminated when you disconnect from the server.</qt>");
-         newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat);
--        popup->tqsetWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly.  This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected.  It also means that no irc server admin can view or spy on this chat.</qt>");
-+        popup->setWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly.  This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected.  It also means that no irc server admin can view or spy on this chat.</qt>");
- 
-         if (kapp->authorize("allow_downloading"))
-         {
-             newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend);
--            popup->tqsetWhatsThis(newitem, "<qt>Send a file to this person.  If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>");
-+            popup->setWhatsThis(newitem, "<qt>Send a file to this person.  If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>");
-         }
-         popup->insertItem(SmallIconSet("mail_generic"),i18n("&Send Email..."), Konversation::SendEmail);
- 
-diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
-index 5cc7bf1..1dd88f2 100644
---- a/konversation/src/nicksonline.cpp
-+++ b/konversation/src/nicksonline.cpp
-@@ -102,7 +102,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
-         "When you select a nickname in the list above, the buttons here are used "
-         "to associate the nickname with an entry in KAddressBook.");
-     TQWhatsThis::add(addressbookLabel, addressbookLabelWT);
--    addressbookLabel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
-+    addressbookLabel->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
-     m_editContactButton = new TQPushButton(i18n("Edit C&ontact..."),
-         buttonBox, "nicksonline_editcontact_button");
-     TQString editContactButtonWT = i18n(
-diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
-index b228a73..8bd1745 100644
---- a/konversation/src/osd.cpp
-+++ b/konversation/src/osd.cpp
-@@ -206,7 +206,7 @@ void OSDWidget::setOffset( int /*x*/, int y )
-     reposition();
- }
- 
--void OSDWidget::tqsetAlignment( Alignment a )
-+void OSDWidget::setAlignment( Alignment a )
- {
-     m_tqalignment = a;
-     reposition();
-@@ -402,7 +402,7 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
- 
- // the code was taken from pilotDaemon.cc in KPilot
-                                                   // static
--OSDWidget::KDesktopLocktqStatus OSDWidget::isKDesktopLockRunning()
-+OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning()
- {
-     if (!Preferences::oSDCheckDesktopLock())
- 	return NotLocked;
-diff --git a/konversation/src/osd.h b/konversation/src/osd.h
-index 68bf408..f71f1d7 100644
---- a/konversation/src/osd.h
-+++ b/konversation/src/osd.h
-@@ -41,7 +41,7 @@ class OSDWidget : public TQWidget
-         void setTextColor(const TQColor &newcolor);
-         void setBackgroundColor(const TQColor &newColor);
-         void setOffset( int x, int y );
--        void tqsetAlignment(Alignment);
-+        void setAlignment(Alignment);
-         void setScreen(uint screen);
-         void setText(const TQString &text) { m_currentText = text; refresh(); }
- 
-@@ -79,8 +79,8 @@ class OSDWidget : public TQWidget
-         /* called after most set*() calls to update the OSD */
-         void refresh();
- 
--        enum KDesktopLocktqStatus { NotLocked=0, Locked=1, DCOPError=2 };
--        static KDesktopLocktqStatus isKDesktopLockRunning();
-+        enum KDesktopLockStatus { NotLocked=0, Locked=1, DCOPError=2 };
-+        static KDesktopLockStatus isKDesktopLockRunning();
- 
-         static const int MARGIN = 15;
- 
-diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
-index aa68f83..7a765ef 100644
---- a/konversation/src/osd_preferences.cpp
-+++ b/konversation/src/osd_preferences.cpp
-@@ -108,7 +108,7 @@ void OSD_Config::saveSettings()
- 
-         //x is ignored anyway, but leave incase we use in future
-         konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value());
--        konvApp->osd->tqsetAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value());
-+        konvApp->osd->setAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value());
-     }
- 
- }
-@@ -116,7 +116,7 @@ void OSD_Config::saveSettings()
- void OSD_Config::showEvent(TQShowEvent*)
- {
-     //Update the preview
--    m_pOSDPreview->tqsetAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) );
-+    m_pOSDPreview->setAlignment((OSDWidget::Alignment)( kcfg_OSDAlignment->value() ) );
-     m_pOSDPreview->setOffset(kcfg_OSDOffsetX->value(),kcfg_OSDOffsetY->value());
- 
-     m_pOSDPreview->setShown(kcfg_UseOSD->isChecked());
-diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui
-index f854584..2837552 100644
---- a/konversation/src/osd_preferencesui.ui
-+++ b/konversation/src/osd_preferencesui.ui
-@@ -29,7 +29,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>10</height>
-@@ -263,7 +263,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>31</height>
-@@ -340,7 +340,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
-index 47800f3..749e278 100644
---- a/konversation/src/outputfilter.cpp
-+++ b/konversation/src/outputfilter.cpp
-@@ -181,8 +181,8 @@ namespace Konversation
-         // someone didn't notice leading spaces
-         {
-             TQString testNickServ( inputLine.stripWhiteSpace() );
--            if(testNickServ.tqstartsWith(commandChar+"nickserv", false)
--              || testNickServ.tqstartsWith(commandChar+"ns", false))
-+            if(testNickServ.startsWith(commandChar+"nickserv", false)
-+              || testNickServ.startsWith(commandChar+"ns", false))
-             {
-                     inputLine = testNickServ;
-             }
-@@ -762,7 +762,7 @@ namespace Konversation
- 
-         if (request == "PING")
-         {
--            unsigned int time_t = TQDateTime::tqcurrentDateTime().toTime_t();
-+            unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
-             result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t);
-             result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient);
-         }
-diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
-index c4e1fb5..b04c703 100644
---- a/konversation/src/query.cpp
-+++ b/konversation/src/query.cpp
-@@ -57,10 +57,10 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
-     awayState=false;
-     TQHBox *box = new TQHBox(m_headerSplitter);
-     addresseeimage = new TQLabel(box, "query_image");
--    addresseeimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-+    addresseeimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-     addresseeimage->hide();
-     addresseelogoimage = new TQLabel(box, "query_logo_image");
--    addresseelogoimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-+    addresseelogoimage->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-     addresseelogoimage->hide();
- 
-     queryHostmask=new Konversation::TopicLabel(box, "query_hostmask");
-@@ -284,8 +284,8 @@ void Query::updateAppearance()
-     }
-     else
-     {
--        fg=tqcolorGroup().foreground();
--        bg=tqcolorGroup().base();
-+        fg=colorGroup().foreground();
-+        bg=colorGroup().base();
-     }
- 
-     queryInput->unsetPalette();
-@@ -365,7 +365,7 @@ void Query::showEvent(TQShowEvent*)
-     if(m_initialShow) {
-         m_initialShow = false;
-         TQValueList<int> sizes;
--        sizes << queryHostmask->tqsizeHint().height() << (height() - queryHostmask->tqsizeHint().height());
-+        sizes << queryHostmask->sizeHint().height() << (height() - queryHostmask->sizeHint().height());
-         m_headerSplitter->setSizes(sizes);
-     }
- }
-diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui
-index e81effd..6bb1c7a 100644
---- a/konversation/src/queuetunerbase.ui
-+++ b/konversation/src/queuetunerbase.ui
-@@ -54,7 +54,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>34</height>
-@@ -96,7 +96,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>33</height>
-diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
-index 91d66a4..4e22b30 100644
---- a/konversation/src/quickbuttons_preferencesui.ui
-+++ b/konversation/src/quickbuttons_preferencesui.ui
-@@ -193,7 +193,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>230</height>
-diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp
-index 38946c0..913e435 100644
---- a/konversation/src/searchbar.cpp
-+++ b/konversation/src/searchbar.cpp
-@@ -126,7 +126,7 @@ void SearchBar::slotFind()
-         m_searchEdit->unsetPalette();
-         m_findNextButton->setEnabled(false);
-         m_findPreviousButton->setEnabled(false);
--        settqStatus(TQPixmap(), "");
-+        setStatus(TQPixmap(), "");
-         return;
-     }
- 
-@@ -140,7 +140,7 @@ void SearchBar::slotFindNext()
-         m_searchEdit->unsetPalette();
-         m_findNextButton->setEnabled(false);
-         m_findPreviousButton->setEnabled(false);
--        settqStatus(TQPixmap(), "");
-+        setStatus(TQPixmap(), "");
-         return;
-     }
- 
-@@ -154,7 +154,7 @@ void SearchBar::slotFindPrevious()
-         m_searchEdit->unsetPalette();
-         m_findNextButton->setEnabled(false);
-         m_findPreviousButton->setEnabled(false);
--        settqStatus(TQPixmap(), "");
-+        setStatus(TQPixmap(), "");
-         return;
-     }
- 
-@@ -170,7 +170,7 @@ void SearchBar::setHasMatch(bool value)
-     m_findPreviousButton->setEnabled(value);
- }
- 
--void SearchBar::settqStatus(const TQPixmap& pix, const TQString& text)
-+void SearchBar::setStatus(const TQPixmap& pix, const TQString& text)
- {
-     if(!text.isEmpty()) {
-         m_statusPixLabel->show();
-diff --git a/konversation/src/searchbar.h b/konversation/src/searchbar.h
-index 8c3204c..6fa113f 100644
---- a/konversation/src/searchbar.h
-+++ b/konversation/src/searchbar.h
-@@ -34,7 +34,7 @@ class SearchBar : public SearchBarBase
-         ~SearchBar();
- 
-         void setHasMatch(bool value);
--        void settqStatus(const TQPixmap& pix, const TQString& text);
-+        void setStatus(const TQPixmap& pix, const TQString& text);
- 
-         TQString pattern() const;
- 
-diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
-index eb9c625..f6cf5ad 100644
---- a/konversation/src/server.cpp
-+++ b/konversation/src/server.cpp
-@@ -324,7 +324,7 @@ void Server::connectSignals()
-     connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )),
-         this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& )));
- 
--    // tqStatus View
-+    // Status View
-     connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool)));
- 
-     // Scripts
-@@ -1882,10 +1882,10 @@ void Server::dccGetDone(DccTransfer* item)
-     if(showfile.startsWith("\"") && showfile.endsWith("\""))
-         showfile = showfile.mid(1, showfile.length() - 2);
- 
--    if(item->gettqStatus()==DccTransfer::Done)
-+    if(item->getStatus()==DccTransfer::Done)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
-             "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick()));
--    else if(item->gettqStatus()==DccTransfer::Failed)
-+    else if(item->getStatus()==DccTransfer::Failed)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
-             "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile,
-             item->getPartnerNick(), item->getStatusDetail()));
-@@ -1901,16 +1901,16 @@ void Server::dccSendDone(DccTransfer* item)
-     if(showfile.startsWith("\"") && showfile.endsWith("\""))
-         showfile = showfile.mid(1, showfile.length() - 2);
- 
--    if(item->gettqStatus()==DccTransfer::Done)
-+    if(item->getStatus()==DccTransfer::Done)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
-             "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick()));
--    else if(item->gettqStatus()==DccTransfer::Failed)
-+    else if(item->getStatus()==DccTransfer::Failed)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
-             "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(),
-             item->getStatusDetail()));
- }
- 
--void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus)
-+void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
- {
-     if(!item)
-         return;
-@@ -1923,13 +1923,13 @@ void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatu
-     if ( item->getType() == DccTransfer::Send )
-     {
-         // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message
--        if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() )
-+        if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() )
-             appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient",
-                 "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) );
-     }
-     else  // type == Receive
-     {
--        if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() )
-+        if ( newStatus == DccTransfer::Transferring && !item->isResumed() )
-         {
-             appendMessageToFrontmost( i18n( "DCC" ),
-                                         i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...")
-@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN
-         if (plus)
-         {
-             TQDateTime when;
--            addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t()));
-+            addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t()));
-         } else {
-             removeBan(channelName, parameter);
-         }
-@@ -3226,7 +3226,7 @@ TQString Server::awayTime() const
- 
-     if (m_away)
-     {
--        int diff = TQDateTime::tqcurrentDateTime().toTime_t() - m_awayTime;
-+        int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime;
-         int num = diff / 3600;
- 
-         if (num < 10)
-@@ -3254,7 +3254,7 @@ TQString Server::awayTime() const
- 
- void Server::startAwayTimer()
- {
--    m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t();
-+    m_awayTime = TQDateTime::currentDateTime().toTime_t();
- }
- 
- KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname)
-diff --git a/konversation/src/server.h b/konversation/src/server.h
-index 959319c..ff8b0d7 100644
---- a/konversation/src/server.h
-+++ b/konversation/src/server.h
-@@ -502,7 +502,7 @@ void resetNickSelection();
-         void resumeDccSendTransfer(const TQString& sourceNick,const TQStringList& dccArguments);
-         void dccGetDone(DccTransfer* item);
-         void dccSendDone(DccTransfer* item);
--        void dccStatusChanged(DccTransfer* item, int newtqStatus, int oldtqStatus);
-+        void dccStatusChanged(DccTransfer* item, int newStatus, int oldStatus);
-         void scriptNotFound(const TQString& name);
-         void scriptExecutionError(const TQString& name);
-         void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp);
-diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui
-index 4ef4866..933e019 100644
---- a/konversation/src/servergroupdialogui.ui
-+++ b/konversation/src/servergroupdialogui.ui
-@@ -185,7 +185,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>0</width>
-                             <height>20</height>
-@@ -264,7 +264,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>255</width>
-                             <height>20</height>
-diff --git a/konversation/src/serverlistview.cpp b/konversation/src/serverlistview.cpp
-index 0035c53..be33e43 100644
---- a/konversation/src/serverlistview.cpp
-+++ b/konversation/src/serverlistview.cpp
-@@ -66,7 +66,7 @@ void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQLis
-     else
-     {
-         // Get the closest item before us ('atpos' or the one above, if any)
--        if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
-+        if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
-             above = atpos->itemAbove();
-         else
-             above = atpos;
-diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp
-index 9615c1d..e2ff9f1 100644
---- a/konversation/src/statuspanel.cpp
-+++ b/konversation/src/statuspanel.cpp
-@@ -32,7 +32,7 @@
- 
- StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)
- {
--    setType(ChatWindow::tqStatus);
-+    setType(ChatWindow::Status);
- 
-     setChannelEncodingSupported(true);
- 
-@@ -164,8 +164,8 @@ void StatusPanel::updateAppearance()
-     }
-     else
-     {
--        fg=tqcolorGroup().foreground();
--        bg=tqcolorGroup().base();
-+        fg=colorGroup().foreground();
-+        bg=colorGroup().base();
-     }
- 
-     statusInput->unsetPalette();
-diff --git a/konversation/src/tabnotifications_preferences.ui b/konversation/src/tabnotifications_preferences.ui
-index aaf68ac..3b62feb 100644
---- a/konversation/src/tabnotifications_preferences.ui
-+++ b/konversation/src/tabnotifications_preferences.ui
-@@ -73,7 +73,7 @@
-                         <bool>true</bool>
-                     </property>
-                     <property name="whatsThis" stdset="0">
--                        <string>Application events occur in Konsole tabs, the DCC tqStatus tab and other application tabs not used directly for chatting.</string>
-+                        <string>Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting.</string>
-                     </property>
-                 </widget>
-                 <spacer row="5" column="3">
-@@ -86,7 +86,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-@@ -122,7 +122,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-@@ -154,7 +154,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>60</width>
-                             <height>21</height>
-@@ -208,7 +208,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -225,7 +225,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>21</height>
-@@ -283,7 +283,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>50</width>
-                             <height>20</height>
-@@ -337,7 +337,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>21</width>
-                     <height>60</height>
-diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui
-index 9e8dbbe..73b914c 100644
---- a/konversation/src/tabs_preferencesui.ui
-+++ b/konversation/src/tabs_preferencesui.ui
-@@ -83,7 +83,7 @@ the Free Software Foundation; either version 2 of the License, or
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>111</width>
-                                     <height>20</height>
-@@ -178,7 +178,7 @@ the Free Software Foundation; either version 2 of the License, or
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>100</height>
-diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
-index bf7d7ab..44c01e8 100644
---- a/konversation/src/theme_preferencesui.ui
-+++ b/konversation/src/theme_preferencesui.ui
-@@ -66,7 +66,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>131</width>
-                     <height>20</height>
-@@ -77,7 +77,7 @@
-             <property name="name">
-                 <cstring>frame3_2</cstring>
-             </property>
--            <property name="tqminimumSize">
-+            <property name="minimumSize">
-                 <size>
-                     <width>0</width>
-                     <height>0</height>
-diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
-index e04a1d0..0fdbe18 100644
---- a/konversation/src/topiclabel.cpp
-+++ b/konversation/src/topiclabel.cpp
-@@ -60,13 +60,13 @@ namespace Konversation
-     {
-     }
- 
--    TQSize TopicLabel::tqminimumSizeHint() const
-+    TQSize TopicLabel::minimumSizeHint() const
-     {
-         int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent();
-         return TQSize(0, minHeight);
-     }
- 
--    TQSize TopicLabel::tqsizeHint() const
-+    TQSize TopicLabel::sizeHint() const
-     {
-         int minHeight = fontMetrics().lineSpacing() + fontMetrics().descent();
-         return TQSize(0, minHeight);
-diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h
-index 4e22dbc..0a649b6 100644
---- a/konversation/src/topiclabel.h
-+++ b/konversation/src/topiclabel.h
-@@ -33,8 +33,8 @@ namespace Konversation
-             explicit TopicLabel(TQWidget *parent = 0, const char *name = 0);
-             ~TopicLabel();
- 
--            TQSize tqminimumSizeHint() const;
--            TQSize tqsizeHint() const;
-+            TQSize minimumSizeHint() const;
-+            TQSize sizeHint() const;
-             void setServer(Server* server);
- 
-             enum PopupIDs { Copy,CopyUrl,SelectAll,Bookmark };
-diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
-index 89be010..04d6635 100644
---- a/konversation/src/viewcontainer.cpp
-+++ b/konversation/src/viewcontainer.cpp
-@@ -157,7 +157,7 @@ void ViewContainer::setupTabWidget()
-     KPushButton* closeBtn = new KPushButton(m_tabWidget);
-     closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small));
-     closeBtn->resize(22, 22);
--    closeBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-+    closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-     m_tabWidget->setCornerWidget(closeBtn);
-     connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView()));
- 
-@@ -220,7 +220,7 @@ void ViewContainer::setupViewTree()
-             {
-                 ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i));
- 
--                if (view->getType() == ChatWindow::tqStatus)
-+                if (view->getType() == ChatWindow::Status)
-                 {
-                     if (view == m_frontView)
-                         m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true);
-@@ -233,7 +233,7 @@ void ViewContainer::setupViewTree()
-             {
-                 ChatWindow* view = static_cast<ChatWindow*>(m_tabWidget->page(i));
- 
--                if (!view->getType() == ChatWindow::tqStatus)
-+                if (!view->getType() == ChatWindow::Status)
-                 {
-                     if (view == m_frontView)
-                         m_viewTree->addView(view->getName(), view, m_tabWidget->tabIconSet(view), true);
-@@ -426,7 +426,7 @@ void ViewContainer::updateViewActions(int index)
-             if (action) action->setEnabled(index < (m_tabWidget->count() - 1));
-         }
- 
--        if (server && (viewType == ChatWindow::tqStatus || server == m_frontServer))
-+        if (server && (viewType == ChatWindow::Status || server == m_frontServer))
-         {
-             action = actionCollection()->action("reconnect_server");
-             if (action) action->setEnabled(true);
-@@ -457,7 +457,7 @@ void ViewContainer::updateViewActions(int index)
-         if (notifyAction)
-         {
-             notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query ||
--                                     viewType == ChatWindow::tqStatus || viewType == ChatWindow::Konsole ||
-+                                     viewType == ChatWindow::Status || viewType == ChatWindow::Konsole ||
-                                      viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog);
-             notifyAction->setChecked(view->notificationsEnabled());
-         }
-@@ -702,7 +702,7 @@ void ViewContainer::updateFrontView()
-     {
-         case ChatWindow::Channel:
-         case ChatWindow::Query:
--        case ChatWindow::tqStatus:
-+        case ChatWindow::Status:
-         case ChatWindow::ChannelList:
-         case ChatWindow::RawLog:
-             emit setStatusBarLagLabelShown(true);
-@@ -729,7 +729,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
- 
-         if (serverGroup)
-         {
--            if (view->getType() == ChatWindow::tqStatus && view->getServer()->getServerGroup() == serverGroup)
-+            if (view->getType() == ChatWindow::Status && view->getServer()->getServerGroup() == serverGroup)
-             {
-                 TQString label = view->getServer()->getDisplayName();
- 
-@@ -762,7 +762,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
- 
- 
-             if (!Preferences::tabNotificationsText())
--                m_viewTree->setViewColor(view, m_window->tqcolorGroup().foreground());
-+                m_viewTree->setViewColor(view, m_window->colorGroup().foreground());
-         }
-         else if (m_tabWidget)
-         {
-@@ -773,7 +773,7 @@ void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverG
-                 m_tabWidget->setTabIconSet(view, images->getCloseIcon());
- 
-             if (!Preferences::tabNotificationsText())
--                m_tabWidget->setTabColor(view, m_window->tqcolorGroup().foreground());
-+                m_tabWidget->setTabColor(view, m_window->colorGroup().foreground());
-         }
- 
-         if (Preferences::tabNotificationsLeds() || Preferences::tabNotificationsText())
-@@ -1040,7 +1040,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-                     m_viewTree->setViewIcon(view, images->getPrivateLed(false));
-                     break;
- 
--                case ChatWindow::tqStatus:
-+                case ChatWindow::Status:
-                     m_viewTree->setViewIcon(view, images->getServerLed(false));
-                     break;
- 
-@@ -1051,7 +1051,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-         }
- 
-         TQColor textColor = (Preferences::inputFieldsBackgroundColor()
--            ? Preferences::color(Preferences::ChannelMessage) : m_window->tqcolorGroup().foreground());
-+            ? Preferences::color(Preferences::ChannelMessage) : m_window->colorGroup().foreground());
- 
-         if (view->getType() == ChatWindow::Channel)
-         {
-@@ -1083,7 +1083,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-                     m_tabWidget->setTabIconSet(view, images->getPrivateLed(false));
-                     break;
- 
--                case ChatWindow::tqStatus:
-+                case ChatWindow::Status:
-                     m_tabWidget->setTabIconSet(view, images->getServerLed(false));
-                     break;
- 
-@@ -1093,7 +1093,7 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-             }
-         }
- 
--        TQColor textColor = m_window->tqcolorGroup().foreground();
-+        TQColor textColor = m_window->colorGroup().foreground();
- 
-         if (view->getType() == ChatWindow::Channel)
-         {
-@@ -1196,7 +1196,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-             {
-                 tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
- 
--                if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer())
-+                if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
-                 {
-                     for (int index = sindex + 1; index < m_tabWidget->count(); index++)
-                     {
-@@ -1226,7 +1226,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-             {
-                 tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
- 
--                if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer())
-+                if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
-                 {
-                     placement = sindex + 1;
-                     break;
-@@ -1245,7 +1245,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-             {
-                 tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
- 
--                if (tmp_ChatWindow->getType() == ChatWindow::tqStatus && tmp_ChatWindow->getServer() == view->getServer())
-+                if (tmp_ChatWindow->getType() == ChatWindow::Status && tmp_ChatWindow->getServer() == view->getServer())
-                 {
-                     for (int index = sindex + 1; index < m_tabWidget->count(); index++)
-                     {
-@@ -1276,7 +1276,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-                 tmp_ChatWindow = static_cast<ChatWindow*>(m_tabWidget->page(sindex));
-                 wtype = tmp_ChatWindow->getType();
- 
--                if (wtype != ChatWindow::tqStatus && wtype != ChatWindow::Channel
-+                if (wtype != ChatWindow::Status && wtype != ChatWindow::Channel
-                     && wtype != ChatWindow::RawLog && wtype != ChatWindow::Query
-                     && wtype != ChatWindow::DccChat && wtype != ChatWindow::ChannelList)
-                 {
-@@ -1286,7 +1286,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-             }
-             break;
- 
--        case ChatWindow::tqStatus:
-+        case ChatWindow::Status:
-             if (Preferences::tabNotificationsLeds())
-                 iconSet = images->getServerLed(false);
-             else if (Preferences::closeButtons())
-@@ -1299,7 +1299,7 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
-                     tmp_ChatWindow = static_cast<ChatWindow *>(m_tabWidget->page(sindex));
- 
-                     if (tmp_ChatWindow->getType() != ChatWindow::Channel
--                        && tmp_ChatWindow->getType() != ChatWindow::tqStatus
-+                        && tmp_ChatWindow->getType() != ChatWindow::Status
-                         && tmp_ChatWindow->getType() != ChatWindow::RawLog
-                         && tmp_ChatWindow->getType() != ChatWindow::Query
-                         && tmp_ChatWindow->getType() != ChatWindow::DccChat)
-@@ -1624,7 +1624,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view)
- 
-         if (codecAction)
-         {
--            if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::tqStatus)
-+            if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || viewType == ChatWindow::Status)
-             {
-                 codecAction->setEnabled(view->isChannelEncodingSupported());
-                 TQString encoding = view->getChannelEncoding();
-@@ -1682,7 +1682,7 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos)
-             }
-         }
- 
--        if (viewType == ChatWindow::tqStatus)
-+        if (viewType == ChatWindow::Status)
-         {
-             TQPtrList<KAction> serverActions;
-             KAction* action = actionCollection()->action("disconnect_server");
-@@ -1825,7 +1825,7 @@ void ViewContainer::appendToFrontmost(const TQString& type,const TQString& messa
-     }
- 
-     // This might happen if canBeFrontView() is false for active ChatWindow
--    // and the view does not belong to any server (e.g. DCC tqStatus View).
-+    // and the view does not belong to any server (e.g. DCC Status View).
-     // Discard message in this case.
-     if (!serverView) return;
- 
-@@ -1957,7 +1957,7 @@ void ViewContainer::openLogFile()
-         ChatWindow* view=static_cast<ChatWindow*>(m_frontView);
-         ChatWindow::WindowType viewType=view->getType();
-         if (viewType==ChatWindow::Channel || viewType==ChatWindow::Query ||
--            viewType==ChatWindow::tqStatus || viewType==ChatWindow::DccChat)
-+            viewType==ChatWindow::Status || viewType==ChatWindow::DccChat)
-         {
-             openLogFile(view->getName(), view->logFileName());
-         }
-diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
-index d62bee4..67efaf5 100644
---- a/konversation/src/viewtree.cpp
-+++ b/konversation/src/viewtree.cpp
-@@ -56,7 +56,7 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos)
- 
-     ViewTreeItem* view = static_cast<ViewTreeItem*>(viewTree->itemAt(pos));
- 
--    if (view && view->isTruncated()) tip(viewTree->tqitemRect(view), view->getName());
-+    if (view && view->isTruncated()) tip(viewTree->itemRect(view), view->getName());
- }
- 
- 
-@@ -503,7 +503,7 @@ void ViewTree::enableCloseButton()
- 
- bool ViewTree::isAboveIcon(TQPoint point, ViewTreeItem* item)
- {
--    TQPoint inItem = point - tqitemRect(item).topLeft();
-+    TQPoint inItem = point - itemRect(item).topLeft();
- 
-     int MARGIN = 2;
-     int LED_ICON_SIZE = 14;
-@@ -748,7 +748,7 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewI
-     else
-     {
-         // Get the closest item before us ('atpos' or the one above, if any).
--        if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
-+        if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
-             above = atpos->itemAbove();
-         else
-             above = atpos;
-@@ -913,7 +913,7 @@ ViewTreeItem* ViewTree::getParentItemForView(ChatWindow* view)
- 
-     while (item)
-     {
--        if (item->getViewType() == ChatWindow::tqStatus
-+        if (item->getViewType() == ChatWindow::Status
-             && item->getView()
-             && item->getView()->getServer() == server)
-         {
-diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp
-index 1d18a8d..f831fbb 100644
---- a/konversation/src/viewtreeitem.cpp
-+++ b/konversation/src/viewtreeitem.cpp
-@@ -246,7 +246,7 @@ bool ViewTreeItem::sortLast() const
- {
-     if (!m_isSeparator)
-     {
--        if (getViewType() == ChatWindow::tqStatus
-+        if (getViewType() == ChatWindow::Status
-             || getViewType() == ChatWindow::Channel
-             || getViewType() == ChatWindow::Query
-             || getViewType() == ChatWindow::RawLog
-diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
-index 6fbcc36..6f9860b 100644
---- a/konversation/src/watchednicknames_preferencesui.ui
-+++ b/konversation/src/watchednicknames_preferencesui.ui
-@@ -106,7 +106,7 @@ command is placed in the &lt;b&gt;Input Line&lt;/b&gt; on the server window.&lt;
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>150</width>
-                     <height>20</height>
-@@ -333,7 +333,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>160</height>
diff --git a/redhat/applications/konversation/bp001-efdae4e7.diff b/redhat/applications/konversation/bp001-efdae4e7.diff
deleted file mode 100644
index 693709e28..000000000
--- a/redhat/applications/konversation/bp001-efdae4e7.diff
+++ /dev/null
@@ -1,4114 +0,0 @@
-commit efdae4e712984b2932ca4a43942b7a93dcb8dbd3
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316340 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/konversation/scripts/fortunes.dat b/konversation/scripts/fortunes.dat
-index 7abf85d..240af34 100644
---- a/konversation/scripts/fortunes.dat
-+++ b/konversation/scripts/fortunes.dat
-@@ -419,7 +419,7 @@ Eric Youngdale: Err... is Richard Stallman here?
- Linux: The OS people choose without $200,000,000 of persuasion.
- 	-- Mike Coleman
- %
--The memory management on the PowerPC can be used to frighten small tqchildren.
-+The memory management on the PowerPC can be used to frighten small children.
- 	-- Linus Torvalds
- %
- ... faster BogoMIPS calculations (yes, it now boots 2 seconds faster than
-diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
-index c77d01a..b66eb25 100644
---- a/konversation/src/autoreplace_preferences.cpp
-+++ b/konversation/src/autoreplace_preferences.cpp
-@@ -146,7 +146,7 @@ void Autoreplace_Config::saveSettings()
-     for(unsigned int index=0;index<newList.count();index++)
-     {
-       // write the current entry's pattern and replacement (adds a "#" to preserve blanks at the end of the line)
--      config->writeEntry(TQString("Autoreplace%1").tqarg(index),newList[index]+'#');
-+      config->writeEntry(TQString("Autoreplace%1").arg(index),newList[index]+'#');
-     } // for
-   }
-   // if there were no entries at all, write a dummy entry to prevent KConfigXT from "optimizing"
-diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
-index 13e026e..b7063c0 100644
---- a/konversation/src/channel.cpp
-+++ b/konversation/src/channel.cpp
-@@ -569,7 +569,7 @@ void Channel::popupCommand(int id)
-         case Konversation::Ping:
-         {
-             unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
--            pattern=TQString(cc+"CTCP %u PING %1").tqarg(time_t);
-+            pattern=TQString(cc+"CTCP %u PING %1").arg(time_t);
-         }
-         break;
-         case Konversation::Kick:
-@@ -617,7 +617,7 @@ void Channel::popupCommand(int id)
-             break;
-         case Konversation::IgnoreNick:
-             if (nickList.size() == 1)
--                question=i18n("Do you want to ignore %1?").tqarg(nickList.first());
-+                question=i18n("Do you want to ignore %1?").arg(nickList.first());
-             else
-                 question = i18n("Do you want to ignore the selected users?");
-             if (KMessageBox::warningContinueCancel(this, question, i18n("Ignore"), i18n("Ignore"), "IgnoreNick") ==
-@@ -635,7 +635,7 @@ void Channel::popupCommand(int id)
-             }
- 
-             if (selectedIgnoredNicks.count() == 1)
--                question=i18n("Do you want to stop ignoring %1?").tqarg(selectedIgnoredNicks.first());
-+                question=i18n("Do you want to stop ignoring %1?").arg(selectedIgnoredNicks.first());
-             else
-                 question = i18n("Do you want to stop ignoring the selected users?");
-             if (KMessageBox::warningContinueCancel(this, question, i18n("Unignore"), i18n("Unignore"), "UnignoreNick") ==
-@@ -776,7 +776,7 @@ void Channel::completeNick()
-                     if(Preferences::nickCompletionMode() == 1)
-                     {
-                         TQString nicksFound = found.join(" ");
--                        appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").tqarg(nicksFound));
-+                        appendServerMessage(i18n("Completion"), i18n("Possible completions: %1.").arg(nicksFound));
-                     }
-                     else
-                     {
-@@ -1174,7 +1174,7 @@ void Channel::modeButtonClicked(int id, bool on)
-             args=limit->text();
-     }
-     // put together the mode command and send it to the server queue
--    m_server->queue(command.tqarg(getName()).tqarg((on) ? "+" : "-").tqarg(mode[id]).tqarg(args));
-+    m_server->queue(command.arg(getName()).arg((on) ? "+" : "-").arg(mode[id]).arg(args));
- }
- 
- void Channel::quickButtonClicked(const TQString &buttonText)
-@@ -1247,12 +1247,12 @@ void Channel::nickRenamed(const TQString &oldNick, const NickInfo& nickInfo)
-     if(newNick == m_server->getNickname()) /* Check newNick because  m_server->getNickname() is already updated to new nick */
-     {
-         setNickname(newNick);
--        appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").tqarg(newNick), false, true, true);
-+        appendCommandMessage(i18n("Nick"),i18n("You are now known as %1.").arg(newNick), false, true, true);
-     }
-     else
-     {
-         /* No, must've been someone else */
--        appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").tqarg(oldNick).tqarg(newNick),false);
-+        appendCommandMessage(i18n("Nick"),i18n("%1 is now known as %2.").arg(oldNick).arg(newNick),false);
-     }
- 
-     nicknameListView->sort();
-@@ -1266,7 +1266,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick)
-         m_joined = true;
-         emit joined(this);
-         appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask",
--                             "You have joined the channel %1 (%2).").tqarg(getName()).tqarg(channelNick->getHostmask()),false, false, true);
-+                             "You have joined the channel %1 (%2).").arg(getName()).arg(channelNick->getHostmask()),false, false, true);
-         m_ownChannelNick = channelNick;
-         connect(m_ownChannelNick, TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refreshModeButtons()));
-         refreshModeButtons();
-@@ -1283,7 +1283,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick)
-         TQString nick = channelNick->getNickname();
-         TQString hostname = channelNick->getHostmask();
-         appendCommandMessage(i18n("Join"), i18n("%1 is the nick joining and %2 the hostmask of that nick",
--                             "%1 has joined this channel (%2).").tqarg(nick).tqarg(hostname),false, false);
-+                             "%1 has joined this channel (%2).").arg(nick).arg(hostname),false, false);
-         addNickname(channelNick);
-     }
- }
-@@ -1307,15 +1307,15 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo
-             if (displayReason.isEmpty())
-                 appendCommandMessage(i18n("Quit"), i18n("You have left this server."), false);
-             else
--                appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").tqarg(displayReason), false);
-+                appendCommandMessage(i18n("Quit"), i18n("%1 adds the reason", "You have left this server (%1).").arg(displayReason), false);
-         }
-         else
-         {
-             if (displayReason.isEmpty())
--                appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").tqarg(getName()), false);
-+                appendCommandMessage(i18n("Part"), i18n("You have left channel %1.").arg(getName()), false);
-             else
-                 appendCommandMessage(i18n("Part"), i18n("%1 adds the channel and %2 the reason",
--                                     "You have left channel %1 (%2).").tqarg(getName()).tqarg(displayReason), false);
-+                                     "You have left channel %1 (%2).").arg(getName()).arg(displayReason), false);
- 
-         }
- 
-@@ -1326,18 +1326,18 @@ void Channel::removeNick(ChannelNickPtr channelNick, const TQString &reason, boo
-         if (quit)
-         {
-             if (displayReason.isEmpty())
--                appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").tqarg(channelNick->getNickname()), false);
-+                appendCommandMessage(i18n("Quit"), i18n("%1 has left this server.").arg(channelNick->getNickname()), false);
-             else
-                 appendCommandMessage(i18n("Quit"), i18n("%1 adds the nick and %2 the reason",
--                                     "%1 has left this server (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false);
-+                                     "%1 has left this server (%2).").arg(channelNick->getNickname()).arg(displayReason), false);
-         }
-         else
-         {
-             if (displayReason.isEmpty())
--                appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").tqarg(channelNick->getNickname()), false);
-+                appendCommandMessage(i18n("Part"), i18n("%1 has left this channel.").arg(channelNick->getNickname()), false);
-             else
-                 appendCommandMessage(i18n("Part"), i18n("%1 adds the nick and %2 the reason",
--                                     "%1 has left this channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), false);
-+                                     "%1 has left this channel (%2).").arg(channelNick->getNickname()).arg(displayReason), false);
-         }
- 
-         if(channelNick->isAnyTypeOfOp())
-@@ -1375,10 +1375,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const
-         if(kicker == m_server->getNickname())
-         {
-             if (displayReason.isEmpty())
--                appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").tqarg(getName()));
-+                appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").arg(getName()));
-             else
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel and %2 the reason",
--                                              "You have kicked yourself from channel %1 (%2).").tqarg(getName()).tqarg(displayReason));
-+                                              "You have kicked yourself from channel %1 (%2).").arg(getName()).arg(displayReason));
-         }
-         else
-         {
-@@ -1386,13 +1386,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const
-             {
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 adds the kicker",
-                                               "You have been kicked from channel %1 by %2.")
--                                              .tqarg(getName()).tqarg(kicker), true);
-+                                              .arg(getName()).arg(kicker), true);
-             }
-             else
-             {
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 the kicker and %3 the reason",
-                                               "You have been kicked from channel %1 by %2 (%3).")
--                                              .tqarg(getName()).tqarg(kicker).tqarg(displayReason), true);
-+                                              .arg(getName()).arg(kicker).arg(displayReason), true);
-             }
- 
-             KonversationApplication::instance()->notificationHandler()->kick(this,getName(), kicker);
-@@ -1412,10 +1412,10 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const
-         if(kicker == m_server->getNickname())
-         {
-             if (displayReason.isEmpty())
--                appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").tqarg(channelNick->getNickname()));
-+                appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").arg(channelNick->getNickname()));
-             else
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick and %2 the reason",
--                                     "You have kicked %1 from the channel (%2).").tqarg(channelNick->getNickname()).tqarg(displayReason), true);
-+                                     "You have kicked %1 from the channel (%2).").arg(channelNick->getNickname()).arg(displayReason), true);
-         }
-         else
-         {
-@@ -1423,13 +1423,13 @@ void Channel::kickNick(ChannelNickPtr channelNick, const TQString &kicker, const
-             {
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 adds the kicker",
-                                      "%1 has been kicked from the channel by %2.")
--                                     .tqarg(channelNick->getNickname()).tqarg(kicker), true);
-+                                     .arg(channelNick->getNickname()).arg(kicker), true);
-             }
-             else
-             {
-                 appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 the kicker and %3 the reason",
-                                      "%1 has been kicked from the channel by %2 (%3).")
--                                     .tqarg(channelNick->getNickname()).tqarg(kicker).tqarg(displayReason), true);
-+                                     .arg(channelNick->getNickname()).arg(kicker).arg(displayReason), true);
-             }
-         }
- 
-@@ -1511,7 +1511,7 @@ void Channel::emitUpdateInfo()
- 
- void Channel::setTopic(const TQString &newTopic)
- {
--    appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").tqarg(newTopic));
-+    appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").arg(newTopic));
-     TQString topic = Konversation::removeIrcMarkup(newTopic);
-     topicLine->setText(topic);
-     topicAuthorUnknown=true; // if we only get called with a topic, it was a 332, which usually has a 333 next
-@@ -1521,7 +1521,7 @@ void Channel::setTopic(const TQString &newTopic)
- 
-     if(m_topicHistory.first().section(' ', 2) != newTopic)
-     {
--        m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(newTopic));
-+        m_topicHistory.prepend(TQString("%1 "+i18n("unknown")+" %2").arg(TQDateTime::currentDateTime().toTime_t()).arg(newTopic));
-         emit topicHistoryChanged();
-     }
- }
-@@ -1530,14 +1530,14 @@ void Channel::setTopic(const TQString &nickname, const TQString &newTopic) // Ov
- {
-     if(nickname == m_server->getNickname())
-     {
--        appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").tqarg(newTopic));
-+        appendCommandMessage(i18n("Topic"), i18n("You set the channel topic to \"%1\".").arg(newTopic));
-     }
-     else
-     {
--        appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").tqarg(nickname).tqarg(newTopic));
-+        appendCommandMessage(i18n("Topic"), i18n("%1 sets the channel topic to \"%2\".").arg(nickname).arg(newTopic));
-     }
- 
--    m_topicHistory.prepend(TQString("%1 %2 %3").tqarg(TQDateTime::currentDateTime().toTime_t()).tqarg(nickname).tqarg(newTopic));
-+    m_topicHistory.prepend(TQString("%1 %2 %3").arg(TQDateTime::currentDateTime().toTime_t()).arg(nickname).arg(newTopic));
-     TQString topic = Konversation::removeIrcMarkup(newTopic);
-     topicLine->setText(topic);
- 
-@@ -1561,7 +1561,7 @@ void Channel::setTopicAuthor(const TQString& newAuthor, TQDateTime time)
- 
-     if(topicAuthorUnknown)
-     {
--        m_topicHistory[0] =  TQString("%1").tqarg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2);
-+        m_topicHistory[0] =  TQString("%1").arg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2);
-         topicAuthorUnknown = false;
- 
-         emit topicHistoryChanged();
-@@ -1599,14 +1599,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You give channel owner privileges to yourself.");
-                     else
--                        message=i18n("You give channel owner privileges to %1.").tqarg(parameter);
-+                        message=i18n("You give channel owner privileges to %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 gives channel owner privileges to you.").tqarg(sourceNick);
-+                        message=i18n("%1 gives channel owner privileges to you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 gives channel owner privileges to %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 gives channel owner privileges to %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             else
-@@ -1616,14 +1616,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You take channel owner privileges from yourself.");
-                     else
--                        message=i18n("You take channel owner privileges from %1.").tqarg(parameter);
-+                        message=i18n("You take channel owner privileges from %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 takes channel owner privileges from you.").tqarg(sourceNick);
-+                        message=i18n("%1 takes channel owner privileges from you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 takes channel owner privileges from %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 takes channel owner privileges from %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             if(parameterChannelNick)
-@@ -1642,14 +1642,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You give channel admin privileges to yourself.");
-                     else
--                        message=i18n("You give channel admin privileges to %1.").tqarg(parameter);
-+                        message=i18n("You give channel admin privileges to %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 gives channel admin privileges to you.").tqarg(sourceNick);
-+                        message=i18n("%1 gives channel admin privileges to you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 gives channel admin privileges to %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 gives channel admin privileges to %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             else
-@@ -1659,14 +1659,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You take channel admin privileges from yourself.");
-                     else
--                        message=i18n("You take channel admin privileges from %1.").tqarg(parameter);
-+                        message=i18n("You take channel admin privileges from %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 takes channel admin privileges from you.").tqarg(sourceNick);
-+                        message=i18n("%1 takes channel admin privileges from you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 takes channel admin privileges from %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 takes channel admin privileges from %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             if(parameterChannelNick)
-@@ -1685,14 +1685,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You give channel operator privileges to yourself.");
-                     else
--                        message=i18n("You give channel operator privileges to %1.").tqarg(parameter);
-+                        message=i18n("You give channel operator privileges to %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 gives channel operator privileges to you.").tqarg(sourceNick);
-+                        message=i18n("%1 gives channel operator privileges to you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 gives channel operator privileges to %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 gives channel operator privileges to %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             else
-@@ -1702,14 +1702,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You take channel operator privileges from yourself.");
-                     else
--                        message=i18n("You take channel operator privileges from %1.").tqarg(parameter);
-+                        message=i18n("You take channel operator privileges from %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 takes channel operator privileges from you.").tqarg(sourceNick);
-+                        message=i18n("%1 takes channel operator privileges from you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 takes channel operator privileges from %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 takes channel operator privileges from %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             if(parameterChannelNick)
-@@ -1728,14 +1728,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You give channel halfop privileges to yourself.");
-                     else
--                        message=i18n("You give channel halfop privileges to %1.").tqarg(parameter);
-+                        message=i18n("You give channel halfop privileges to %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 gives channel halfop privileges to you.").tqarg(sourceNick);
-+                        message=i18n("%1 gives channel halfop privileges to you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 gives channel halfop privileges to %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 gives channel halfop privileges to %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             else
-@@ -1745,14 +1745,14 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                     if(toMe)
-                         message=i18n("You take channel halfop privileges from yourself.");
-                     else
--                        message=i18n("You take channel halfop privileges from %1.").tqarg(parameter);
-+                        message=i18n("You take channel halfop privileges from %1.").arg(parameter);
-                 }
-                 else
-                 {
-                     if(toMe)
--                        message=i18n("%1 takes channel halfop privileges from you.").tqarg(sourceNick);
-+                        message=i18n("%1 takes channel halfop privileges from you.").arg(sourceNick);
-                     else
--                        message=i18n("%1 takes channel halfop privileges from %2.").tqarg(sourceNick).tqarg(parameter);
-+                        message=i18n("%1 takes channel halfop privileges from %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             if(parameterChannelNick)
-@@ -1771,12 +1771,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                 if(fromMe)
-                 {
-                     if(toMe) message=i18n("You give yourself permission to talk.");
--                    else     message=i18n("You give %1  permission to talk.").tqarg(parameter);
-+                    else     message=i18n("You give %1  permission to talk.").arg(parameter);
-                 }
-                 else
-                 {
--                    if(toMe) message=i18n("%1 gives you permission to talk.").tqarg(sourceNick);
--                    else     message=i18n("%1 gives %2 permission to talk.").tqarg(sourceNick).tqarg(parameter);
-+                    if(toMe) message=i18n("%1 gives you permission to talk.").arg(sourceNick);
-+                    else     message=i18n("%1 gives %2 permission to talk.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             else
-@@ -1784,12 +1784,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-                 if(fromMe)
-                 {
-                     if(toMe) message=i18n("You take the permission to talk from yourself.");
--                    else     message=i18n("You take the permission to talk from %1.").tqarg(parameter);
-+                    else     message=i18n("You take the permission to talk from %1.").arg(parameter);
-                 }
-                 else
-                 {
--                    if(toMe) message=i18n("%1 takes the permission to talk from you.").tqarg(sourceNick);
--                    else     message=i18n("%1 takes the permission to talk from %2.").tqarg(sourceNick).tqarg(parameter);
-+                    if(toMe) message=i18n("%1 takes the permission to talk from you.").arg(sourceNick);
-+                    else     message=i18n("%1 takes the permission to talk from %2.").arg(sourceNick).arg(parameter);
-                 }
-             }
-             if(parameterChannelNick)
-@@ -1803,12 +1803,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'no colors allowed'.");
--                else message=i18n("%1 sets the channel mode to 'no colors allowed'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'no colors allowed'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'allow color codes'.");
--                else message=i18n("%1 sets the channel mode to 'allow color codes'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'allow color codes'.").arg(sourceNick);
-             }
-             break;
- 
-@@ -1816,12 +1816,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'invite only'.");
--                else message=i18n("%1 sets the channel mode to 'invite only'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'invite only'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You remove the 'invite only' mode from the channel.");
--                else message=i18n("%1 removes the 'invite only' mode from the channel.").tqarg(sourceNick);
-+                else message=i18n("%1 removes the 'invite only' mode from the channel.").arg(sourceNick);
-             }
-             modeI->setDown(plus);
-             break;
-@@ -1830,12 +1830,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'moderated'.");
--                else message=i18n("%1 sets the channel mode to 'moderated'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'moderated'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'unmoderated'.");
--                else message=i18n("%1 sets the channel mode to 'unmoderated'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'unmoderated'.").arg(sourceNick);
-             }
-             modeM->setDown(plus);
-             break;
-@@ -1844,12 +1844,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'no messages from outside'.");
--                else message=i18n("%1 sets the channel mode to 'no messages from outside'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'no messages from outside'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'allow messages from outside'.");
--                else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'allow messages from outside'.").arg(sourceNick);
-             }
-             modeN->setDown(plus);
-             break;
-@@ -1858,12 +1858,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'private'.");
--                else message=i18n("%1 sets the channel mode to 'private'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'private'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'public'.");
--                else message=i18n("%1 sets the channel mode to 'public'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'public'.").arg(sourceNick);
-             }
-             modeP->setDown(plus);
-             if(plus) modeS->setDown(false);
-@@ -1873,12 +1873,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'secret'.");
--                else message=i18n("%1 sets the channel mode to 'secret'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'secret'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You set the channel mode to 'visible'.");
--                else message=i18n("%1 sets the channel mode to 'visible'.").tqarg(sourceNick);
-+                else message=i18n("%1 sets the channel mode to 'visible'.").arg(sourceNick);
-             }
-             modeS->setDown(plus);
-             if(plus) modeP->setDown(false);
-@@ -1890,12 +1890,12 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-             if(plus)
-             {
-                 if(fromMe) message=i18n("You switch on 'topic protection'.");
--                else message=i18n("%1 switches on 'topic protection'.").tqarg(sourceNick);
-+                else message=i18n("%1 switches on 'topic protection'.").arg(sourceNick);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You switch off 'topic protection'.");
--                else message=i18n("%1 switches off 'topic protection'.").tqarg(sourceNick);
-+                else message=i18n("%1 switches off 'topic protection'.").arg(sourceNick);
-             }
-             modeT->setDown(plus);
-             break;
-@@ -1903,13 +1903,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-         case 'k':
-             if(plus)
-             {
--                if(fromMe) message=i18n("You set the channel key to '%1'.").tqarg(parameter);
--                else message=i18n("%1 sets the channel key to '%2'.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You set the channel key to '%1'.").arg(parameter);
-+                else message=i18n("%1 sets the channel key to '%2'.").arg(sourceNick).arg(parameter);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You remove the channel key.");
--                else message=i18n("%1 removes the channel key.").tqarg(sourceNick);
-+                else message=i18n("%1 removes the channel key.").arg(sourceNick);
-             }
-             modeK->setDown(plus);
-             break;
-@@ -1917,13 +1917,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-         case 'l':
-             if(plus)
-             {
--                if(fromMe) message=i18n("You set the channel limit to %1 nicks.").tqarg(parameter);
--                else message=i18n("%1 sets the channel limit to %2 nicks.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You set the channel limit to %1 nicks.").arg(parameter);
-+                else message=i18n("%1 sets the channel limit to %2 nicks.").arg(sourceNick).arg(parameter);
-             }
-             else
-             {
-                 if(fromMe) message=i18n("You remove the channel limit.");
--                else message=i18n("%1 removes the channel limit.").tqarg(sourceNick);
-+                else message=i18n("%1 removes the channel limit.").arg(sourceNick);
-             }
-             modeL->setDown(plus);
-             if(plus) limit->setText(parameter);
-@@ -1933,51 +1933,51 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
-         case 'b':
-             if(plus)
-             {
--                if(fromMe) message=i18n("You set a ban on %1.").tqarg(parameter);
--                else message=i18n("%1 sets a ban on %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You set a ban on %1.").arg(parameter);
-+                else message=i18n("%1 sets a ban on %2.").arg(sourceNick).arg(parameter);
-             }
-             else
-             {
--                if(fromMe) message=i18n("You remove the ban on %1.").tqarg(parameter);
--                else message=i18n("%1 removes the ban on %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You remove the ban on %1.").arg(parameter);
-+                else message=i18n("%1 removes the ban on %2.").arg(sourceNick).arg(parameter);
-             }
-             break;
- 
-         case 'e':
-             if(plus)
-             {
--                if(fromMe) message=i18n("You set a ban exception on %1.").tqarg(parameter);
--                else message=i18n("%1 sets a ban exception on %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You set a ban exception on %1.").arg(parameter);
-+                else message=i18n("%1 sets a ban exception on %2.").arg(sourceNick).arg(parameter);
-             }
-             else
-             {
--                if(fromMe) message=i18n("You remove the ban exception on %1.").tqarg(parameter);
--                else message=i18n("%1 removes the ban exception on %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You remove the ban exception on %1.").arg(parameter);
-+                else message=i18n("%1 removes the ban exception on %2.").arg(sourceNick).arg(parameter);
-             }
-             break;
- 
-         case 'I':
-             if(plus)
-             {
--                if(fromMe) message=i18n("You set invitation mask %1.").tqarg(parameter);
--                else message=i18n("%1 sets invitation mask %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You set invitation mask %1.").arg(parameter);
-+                else message=i18n("%1 sets invitation mask %2.").arg(sourceNick).arg(parameter);
-             }
-             else
-             {
--                if(fromMe) message=i18n("You remove the invitation mask %1.").tqarg(parameter);
--                else message=i18n("%1 removes the invitation mask %2.").tqarg(sourceNick).tqarg(parameter);
-+                if(fromMe) message=i18n("You remove the invitation mask %1.").arg(parameter);
-+                else message=i18n("%1 removes the invitation mask %2.").arg(sourceNick).arg(parameter);
-             }
-             break;
-         default:
- 	    if(plus)
- 	    {
--	        if(fromMe) message=i18n("You set channel mode +%1").tqarg(mode);
--		else message=i18n("%1 sets channel mode +%2").tqarg(sourceNick).tqarg(mode);
-+	        if(fromMe) message=i18n("You set channel mode +%1").arg(mode);
-+		else message=i18n("%1 sets channel mode +%2").arg(sourceNick).arg(mode);
- 	    }
- 	    else
- 	    {
--	        if (fromMe) message=i18n("You set channel mode -%1").tqarg(mode);
--		else message= i18n("%1 sets channel mode -%2").tqarg(sourceNick).tqarg(mode);
-+	        if (fromMe) message=i18n("You set channel mode -%1").arg(mode);
-+		else message= i18n("%1 sets channel mode -%2").arg(sourceNick).arg(mode);
- 	    }
-     }
- 
-@@ -2067,7 +2067,7 @@ void Channel::updateModeWidgets(char mode, bool plus, const TQString &parameter)
-     }
-     else
-     {
--        TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").tqarg(mode)));
-+        TQStringList removable = m_modeList.grep(TQRegExp(TQString("^%1.*").arg(mode)));
- 
-         for(TQStringList::iterator it = removable.begin(); it != removable.end(); ++it)
-         {
-@@ -2393,12 +2393,12 @@ void Channel::refreshModeButtons()
-     TQString opOnly;
-     if(!enable) opOnly = i18n("You have to be an operator to change this.");
- 
--    TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only.  %1").tqarg(opOnly));
--    TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside.  %1").tqarg(opOnly));
--    TQToolTip::add(modeS, i18n("Secret channel.  %1").tqarg(opOnly));
--    TQToolTip::add(modeI, i18n("Invite only channel.  %1").tqarg(opOnly));
--    TQToolTip::add(modeP, i18n("Private channel.  %1").tqarg(opOnly));
--    TQToolTip::add(modeM, i18n("Moderated channel.  %1").tqarg(opOnly));
-+    TQToolTip::add(modeT, i18n("Topic can be changed by channel operator only.  %1").arg(opOnly));
-+    TQToolTip::add(modeN, i18n("No messages to channel from clients on the outside.  %1").arg(opOnly));
-+    TQToolTip::add(modeS, i18n("Secret channel.  %1").arg(opOnly));
-+    TQToolTip::add(modeI, i18n("Invite only channel.  %1").arg(opOnly));
-+    TQToolTip::add(modeP, i18n("Private channel.  %1").arg(opOnly));
-+    TQToolTip::add(modeM, i18n("Moderated channel.  %1").arg(opOnly));
-     TQToolTip::add(modeK, i18n("Protect channel with a password."));
-     TQToolTip::add(modeL, i18n("Set user limit to channel."));
- 
-@@ -2538,7 +2538,7 @@ bool Channel::closeYourself(bool confirm)
- {
-     int result=KMessageBox::Continue;
-     if (confirm)
--        result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").tqarg(getName()),
-+        result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").arg(getName()),
-             i18n("Leave Channel"), i18n("Leave"), "QuitChannelTab");
- 
-     if (result==KMessageBox::Continue)
-@@ -2668,7 +2668,7 @@ TQString Channel::getChannelEncoding() // virtual
- 
- TQString Channel::getChannelEncodingDefaultDesc()  // virtual
- {
--    return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName());
-+    return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName());
- }
- 
- void Channel::showNicknameBox(bool show)
-diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
-index 79a9168..165a177 100644
---- a/konversation/src/channellistpanel.cpp
-+++ b/konversation/src/channellistpanel.cpp
-@@ -222,8 +222,8 @@ void ChannelListPanel::saveList()
-         TQTextStream stream(&listFile);
- 
-         TQString header(i18n("Konversation Channel List: %1 - %2\n\n")
--            .tqarg(m_server->getServerName())
--            .tqarg(TQDateTime::currentDateTime().toString()));
-+            .arg(m_server->getServerName())
-+            .arg(TQDateTime::currentDateTime().toString()));
- 
-         // send header to stream
-         stream << header;
-@@ -483,8 +483,8 @@ void ChannelListPanel::applyFilterClicked()
- 
- void ChannelListPanel::updateUsersChannels()
- {
--    emit updateNumChannels(i18n("Channels: %1 (%2 shown)").tqarg(getNumChannels()).tqarg(getVisibleChannels()));
--    emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").tqarg(getNumUsers()).tqarg(getVisibleUsers()));
-+    emit updateNumChannels(i18n("Channels: %1 (%2 shown)").arg(getNumChannels()).arg(getVisibleChannels()));
-+    emit updateNumUsers(i18n("Non-unique users: %1 (%2 shown)").arg(getNumUsers()).arg(getVisibleUsers()));
- }
- 
- bool ChannelListPanel::closeYourself()
-@@ -585,7 +585,7 @@ void ChannelListPanel::serverOnline(bool online)
- void ChannelListPanel::emitUpdateInfo()
- {
-     TQString info;
--    info = i18n("Channel List for %1").tqarg(m_server->getDisplayName());
-+    info = i18n("Channel List for %1").arg(m_server->getDisplayName());
-     emit updateInfo(info);
- }
- 
-diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
-index 27e5f7f..7cb34cd 100644
---- a/konversation/src/channeloptionsdialog.cpp
-+++ b/konversation/src/channeloptionsdialog.cpp
-@@ -35,7 +35,7 @@ namespace Konversation
- {
- 
-     ChannelOptionsDialog::ChannelOptionsDialog(Channel *channel)
--        : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").tqarg(channel->getName()), Ok|Cancel, Ok)
-+        : KDialogBase(channel, "channelOptions", false, i18n("Channel Settings for %1").arg(channel->getName()), Ok|Cancel, Ok)
-     {
-         Q_ASSERT(channel);
-         m_widget = new ChannelOptionsUI(this);
-@@ -124,16 +124,16 @@ namespace Konversation
- 
-             if(tmp.isEmpty() && plus)
-             {
--                m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("+").tqarg(modeString[0]).tqarg(modeString.mid(1)));
-+                m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("+").arg(modeString[0]).arg(modeString.mid(1)));
-             }
-             else if(!tmp.isEmpty() && !plus)
-             {
-                 //FIXME: Bahamuth requires the key parameter for -k, but ircd breaks on -l with limit number.
-                 //Hence two versions of this.
-                 if (modeString[0] == 'k')
--                    m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg(modeString.mid(1)));
-+                    m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg(modeString.mid(1)));
-                 else
--                    m_channel->getServer()->queue(command.tqarg(m_channel->getName()).tqarg("-").tqarg(modeString[0]).tqarg(""));
-+                    m_channel->getServer()->queue(command.arg(m_channel->getName()).arg("-").arg(modeString[0]).arg(""));
-             }
-         }
-         hide();
-diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
-index 9e37d92..ab7c6ad 100644
---- a/konversation/src/chatwindow.cpp
-+++ b/konversation/src/chatwindow.cpp
-@@ -247,9 +247,9 @@ void ChatWindow::setLogfileName(const TQString& name)
-                 TQStringList firstColumns;
-                 TQStringList messages;
-                 int offset = 0;
--                unsigned int lastPacketHeadPosition = backlog.tqdevice()->size();
-+                unsigned int lastPacketHeadPosition = backlog.device()->size();
-                 const unsigned int packetSize = 4096;
--                while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.tqdevice()->size() > packetSize * offset)
-+                while(messages.count() < (unsigned int)Preferences::backlogLines() && backlog.device()->size() > packetSize * offset)
-                 {
-                     TQStringList firstColumnsInPacket;
-                     TQStringList messagesInPacket;
-@@ -257,30 +257,30 @@ void ChatWindow::setLogfileName(const TQString& name)
-                     // packetSize * offset < size <= packetSize * ( offset + 1 )
- 
-                     // Check if the log is bigger than packetSize * ( offset + 1 )
--                    if(backlog.tqdevice()->size() > packetSize * ( offset + 1 ))
-+                    if(backlog.device()->size() > packetSize * ( offset + 1 ))
-                     {
-                         // Set file pointer to the packet size above the offset
--                        backlog.tqdevice()->at(backlog.tqdevice()->size() - packetSize * ( offset + 1 ));
-+                        backlog.device()->at(backlog.device()->size() - packetSize * ( offset + 1 ));
-                         // Skip first line, since it may be incomplete
-                         backlog.readLine();
-                     }
-                     else
-                     {
-                         // Set file pointer to the head
--                        backlog.tqdevice()->reset();
-+                        backlog.device()->reset();
-                     }
- 
--                    unsigned int currentPacketHeadPosition = backlog.tqdevice()->at();
-+                    unsigned int currentPacketHeadPosition = backlog.device()->at();
- 
-                     // Loop until end of file reached
--                    while(!backlog.atEnd() && backlog.tqdevice()->at() < lastPacketHeadPosition)
-+                    while(!backlog.atEnd() && backlog.device()->at() < lastPacketHeadPosition)
-                     {
-                         // remember actual file position to check for deadlocks
--                        filePosition = backlog.tqdevice()->at();
-+                        filePosition = backlog.device()->at();
-                         backlogLine = backlog.readLine();
- 
-                         // check for deadlocks
--                        if(backlog.tqdevice()->at() == filePosition) backlog.tqdevice()->at(filePosition + 1);
-+                        if(backlog.device()->at() == filePosition) backlog.device()->at(filePosition + 1);
- 
-                         // if a tab character is present in the line
-                         if(backlogLine.find('\t') != -1)
-@@ -343,14 +343,14 @@ void ChatWindow::logText(const TQString& text)
- 
-             if(firstLog)
-             {
--                TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").tqarg(TQDateTime::currentDateTime().toString()));
-+                TQString intro(i18n("\n*** Logfile started\n*** on %1\n\n").arg(TQDateTime::currentDateTime().toString()));
-                 logStream << intro;
-                 firstLog=false;
-             }
- 
-             TQTime time=TQTime::currentTime();
--            TQString logLine(TQString("[%1] [%2] %3\n").tqarg(TQDate::currentDate(Qt::LocalTime).toString()).
--                tqarg(time.toString("hh:mm:ss")).tqarg(text));
-+            TQString logLine(TQString("[%1] [%2] %3\n").arg(TQDate::currentDate(Qt::LocalTime).toString()).
-+                arg(time.toString("hh:mm:ss")).arg(text));
- 
-             logStream << logLine;
- 
-diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h
-index d77f5d1..840a815 100644
---- a/konversation/src/chatwindow.h
-+++ b/konversation/src/chatwindow.h
-@@ -165,7 +165,7 @@ class ChatWindow : public TQVBox
- 
-     protected:
- 
--        /** Some tqchildren may handle the name themselves, and not want this public.
-+        /** Some children may handle the name themselves, and not want this public.
-          *  Increase the visibility in the subclass if you want outsiders to call this.
-          *  The name is the string that is shown in the tab.
-          *  @param newName The name to show in the tab
-diff --git a/konversation/src/common.cpp b/konversation/src/common.cpp
-index eba7508..d3449fc 100644
---- a/konversation/src/common.cpp
-+++ b/konversation/src/common.cpp
-@@ -78,7 +78,7 @@ namespace Konversation
-                 pos += chanExp.cap(1).length();
- 
-                 // HACK:Use space as a placeholder for \ as TQt tries to be clever and does a replace to / in urls in TQTextEdit
--                insertText = link.tqarg(TQString(href).replace('\\', " "), href);
-+                insertText = link.arg(TQString(href).replace('\\', " "), href);
-                 filteredLine.replace(pos, urlLen, insertText);
-                 pos += insertText.length();
-             }
-@@ -151,7 +151,7 @@ namespace Konversation
- 
-             // Use \x0b as a placeholder for & so we can readd them after changing all & in the normal text to &amp;
-             // HACK Replace % with \x03 in the url to keep TQt from doing stupid things
--            insertText = link.tqarg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append;
-+            insertText = link.arg(protocol, TQString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append;
-             filteredLine.replace(pos, urlLen, insertText);
-             pos += insertText.length();
-             KonversationApplication::instance()->storeUrl(fromNick, href);
-diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp
-index 763f191..294adec 100644
---- a/konversation/src/connectionmanager.cpp
-+++ b/konversation/src/connectionmanager.cpp
-@@ -203,15 +203,15 @@ void ConnectionManager::handleReconnect(Server* server)
- 
-             server->getStatusView()->appendServerMessage(i18n("Info"),
-                 i18n("Trying to connect to %1 in %2 seconds.")
--                .tqarg(settings.server().host())
--                .tqarg(Preferences::reconnectDelay()));
-+                .arg(settings.server().host())
-+                .arg(Preferences::reconnectDelay()));
-         }
-         else
-         {
-             server->getStatusView()->appendServerMessage(i18n("Info"),
-                 i18n("Trying to reconnect to %1 in %2 seconds.")
--                .tqarg(settings.server().host())
--                .tqarg(Preferences::reconnectDelay()));
-+                .arg(settings.server().host())
-+                .arg(Preferences::reconnectDelay()));
-         }
- 
-         server->getConnectionSettings().incrementReconnectCount();
-@@ -437,8 +437,8 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo
-         int result = KMessageBox::warningContinueCancel(
-             mainWindow,
-             i18n("You are already connected to %1. Do you want to open another connection?")
--                .tqarg(dupe->getDisplayName()),
--            i18n("Already connected to %1").tqarg(dupe->getDisplayName()),
-+                .arg(dupe->getDisplayName()),
-+            i18n("Already connected to %1").arg(dupe->getDisplayName()),
-             i18n("Create connection"),
-             "ReuseExistingConnection");
- 
-@@ -453,12 +453,12 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo
-             int result = KMessageBox::warningContinueCancel(
-                 mainWindow,
-                 i18n("You are presently connected to %1 via '%2' (port %3). Do you want to switch to '%4' (port %5) instead?")
--                    .tqarg(dupe->getDisplayName())
--                    .tqarg(dupe->getServerName())
--                    .tqarg(dupe->getPort())
--                    .tqarg(settings.server().host())
--                    .tqarg(settings.server().port()),
--                i18n("Already connected to %1").tqarg(dupe->getDisplayName()),
-+                    .arg(dupe->getDisplayName())
-+                    .arg(dupe->getServerName())
-+                    .arg(dupe->getPort())
-+                    .arg(settings.server().host())
-+                    .arg(settings.server().port()),
-+                i18n("Already connected to %1").arg(dupe->getDisplayName()),
-                 i18n("Switch Server"),
-                 "ReconnectWithDifferentServer");
- 
-@@ -513,7 +513,7 @@ bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive)
-         {
-             int result = KMessageBox::warningContinueCancel(mainWindow,
-                             i18n("<qt>Your identity \"%1\" is not set up correctly:<br>%2</qt>")
--                                .tqarg(identity->getName()).tqarg(errors),
-+                                .arg(identity->getName()).arg(errors),
-                             i18n("Identity Settings"),
-                             i18n("Edit Identity..."));
- 
-diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui
-index ccff213..a1a4da2 100644
---- a/konversation/src/dcc_preferencesui.ui
-+++ b/konversation/src/dcc_preferencesui.ui
-@@ -360,7 +360,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="text">
-                         <string>to</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                 </widget>
-@@ -427,7 +427,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     <property name="text">
-                         <string>to</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                 </widget>
-diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
-index f40d1ae..15eb235 100644
---- a/konversation/src/dccchat.cpp
-+++ b/konversation/src/dccchat.cpp
-@@ -134,7 +134,7 @@ void DccChat::listenForPartner()
-         m_listenSocket = DccCommon::createServerSocketAndListen( TQT_TQOBJECT(this), &failedReason );
-     if ( !m_listenSocket )
-     {
--        getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).tqarg( failedReason ) );
-+        getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) );
-         return;
-     }
- 
-@@ -144,8 +144,8 @@ void DccChat::listenForPartner()
-     m_ownPort = DccCommon::getServerSocketPort( m_listenSocket );
-     kdDebug() << "DccChat::listenForPartner(): using port " << m_ownPort << endl;
- 
--    getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").tqarg( m_partnerNick ).tqarg( m_ownPort ) );
--    m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).tqarg( m_partnerNick ).tqarg( m_ownPort ) );
-+    getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").arg( m_partnerNick ).arg( m_ownPort ) );
-+    m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).arg( m_partnerNick ).arg( m_ownPort ) );
-     kdDebug() << "DccChat::listenForPartner() [END]" << endl;
- }
- 
-@@ -157,9 +157,9 @@ void DccChat::connectToPartner()
-     m_partnerHost=ip.toString();
- 
-     getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "%1 = nickname, %2 = IP, %3 = port",
--        "Establishing DCC Chat connection to %1 (%2:%3)..." ).tqarg( m_partnerNick ).tqarg( m_partnerHost ).tqarg( m_partnerPort ) );
-+        "Establishing DCC Chat connection to %1 (%2:%3)..." ).arg( m_partnerNick ).arg( m_partnerHost ).arg( m_partnerPort ) );
- 
--    m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).tqarg( m_partnerNick ).tqarg( host ).tqarg( m_partnerPort ) );
-+    m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) );
- 
-     m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, TQString::number( m_partnerPort ), TQT_TQOBJECT(this) );
- 
-@@ -179,7 +179,7 @@ void DccChat::connectToPartner()
-     m_dccSocket->connect();
-     
- #if 0
--    //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").tqarg(host));
-+    //getTextView()->appendServerMessage(i18n("DCC"),i18n("Looking for host %1...").arg(host));
- #endif
- 
- }
-@@ -195,14 +195,14 @@ void DccChat::lookupFinished()
- 
- void DccChat::dccChatConnectionSuccess()
- {
--    getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) );
-+    getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) );
-     m_dccSocket->enableRead(true);
-     m_dccChatInput->setEnabled(true);
- }
- 
- void DccChat::dccChatBroken(int error)
- {
--    getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").tqarg(error));
-+    getTextView()->appendServerMessage(i18n("Error"),i18n("Connection broken, error code %1.").arg(error));
-     m_dccSocket->enableRead(false);
-     m_dccSocket->blockSignals(true);
-     m_dccSocket->close();
-@@ -241,7 +241,7 @@ void DccChat::readData()
-                 if( ctcpCommand.lower() == "action" )
-                     appendAction( m_partnerNick, ctcpArgument );
-                 else
--                    getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).tqarg( ctcp ).tqarg( m_partnerNick ) );
-+                    getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).arg( ctcp ).arg( m_partnerNick ) );
-             }
-             else getTextView()->append( m_partnerNick, *itLine );
-         }                                         // endfor
-@@ -295,7 +295,7 @@ void DccChat::sendDccChatText(const TQString& sendLine)
-             if (cmd == cc+"me")
-             {
-                 appendAction( m_ownNick, line.section( " ", 1 ) );
--                line=TQString("\x01%1 %2\x01").tqarg("ACTION").tqarg(line.section(" ",1));
-+                line=TQString("\x01%1 %2\x01").arg("ACTION").arg(line.section(" ",1));
-             }
-             else if (cmd == cc+"close")
-             {
-@@ -336,7 +336,7 @@ void DccChat::heardPartner()
-     m_dccSocket->enableRead(true);
-     m_dccChatInput->setEnabled(true);
- 
--    getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).tqarg( m_partnerNick ) );
-+    getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Established DCC Chat connection to %1." ).arg( m_partnerNick ) );
- }
- 
- void DccChat::socketClosed()
-@@ -410,7 +410,7 @@ TQString DccChat::getChannelEncoding() // virtual
- 
- TQString DccChat::getChannelEncodingDefaultDesc()  // virtual
- {
--    return i18n("Default ( %1 )").tqarg(Konversation::IRCCharsets::self()->encodingForLocale());
-+    return i18n("Default ( %1 )").arg(Konversation::IRCCharsets::self()->encodingForLocale());
- }
- 
- void DccChat::showEvent(TQShowEvent* /* event */)
-diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp
-index 6bd6961..8aec7d0 100644
---- a/konversation/src/dcctransferdetailedinfopanel.cpp
-+++ b/konversation/src/dcctransferdetailedinfopanel.cpp
-@@ -98,17 +98,17 @@ void DccTransferDetailedInfoPanel::updateView()
-     else
-         partnerInfoServerName = i18n( "Unknown server" );
-     TQString partnerInfo( i18n( "%1 on %2" )
--        .tqarg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() )
--        .tqarg( partnerInfoServerName ) );
-+        .arg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() )
-+        .arg( partnerInfoServerName ) );
-     if ( !transfer->getPartnerIp().isEmpty() )
--        partnerInfo += i18n( ", %1 (port %2)" ).tqarg( transfer->getPartnerIp() ).tqarg( transfer->getPartnerPort() );
-+        partnerInfo += i18n( ", %1 (port %2)" ).arg( transfer->getPartnerIp() ).arg( transfer->getPartnerPort() );
-     m_labelPartner->setText( partnerInfo );
- 
-     // Self:
-     if ( transfer->getOwnIp().isEmpty() )
-         m_labelSelf->setText( "" );
-     else
--        m_labelSelf->setText( i18n( "%1 (port %2)" ).tqarg( transfer->getOwnIp() ).tqarg( transfer->getOwnPort() ) );
-+        m_labelSelf->setText( i18n( "%1 (port %2)" ).arg( transfer->getOwnIp() ).arg( transfer->getOwnPort() ) );
- 
-     // Status:
-     if ( transfer->getStatus() == DccTransfer::Transferring )
-@@ -133,7 +133,7 @@ void DccTransferDetailedInfoPanel::updateView()
- 
-     // Resumed:
-     if ( transfer->isResumed() )
--        m_labelIsResumed->setText( i18n( "Yes, %1" ).tqarg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) );
-+        m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) );
-     else
-         m_labelIsResumed->setText( i18n( "No" ) );
- 
-diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
-index b11b2e1..967b1ae 100644
---- a/konversation/src/dcctransferdetailedinfopanelui.ui
-+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
-@@ -194,7 +194,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -224,7 +224,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -246,7 +246,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -284,7 +284,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -322,7 +322,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -370,7 +370,7 @@
-                             <property name="name">
-                                 <cstring>m_labelTimeFinished</cstring>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -392,7 +392,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -430,7 +430,7 @@
-                                     <height>0</height>
-                                 </size>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -438,7 +438,7 @@
-                             <property name="name">
-                                 <cstring>m_labelTimeOffered</cstring>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -454,7 +454,7 @@
-                             <property name="name">
-                                 <cstring>m_labelTimeStarted</cstring>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
-index d2cb9ee..e0ebc49 100644
---- a/konversation/src/dcctransferpanelitem.cpp
-+++ b/konversation/src/dcctransferpanelitem.cpp
-@@ -156,9 +156,9 @@ void DccTransferPanelItem::stopAutoViewUpdate()
-     }
- }
- 
--void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment ) // virtual public
-+void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ) // virtual public
- {
--    KListViewItem::paintCell( painter, colorgroup, column, width, tqalignment );
-+    KListViewItem::paintCell( painter, colorgroup, column, width, alignment );
-     if ( column == DccTransferPanel::Column::Progress )
-         showProgressBar();
- }
-@@ -229,7 +229,7 @@ void DccTransferPanelItem::openFileInfoDialog()
-                 #ifdef USE_INFOLIST
-                 KMessageBox::informationList(
-                     listView(),
--                    i18n("Available information for file %1:").tqarg(path),
-+                    i18n("Available information for file %1:").arg(path),
-                     infoList,
-                     i18n("File Information")
-                     );
-@@ -372,9 +372,9 @@ TQString DccTransferPanelItem::getCurrentSpeedPrettyText() const
- TQString DccTransferPanelItem::getSenderAddressPrettyText() const
- {
-     if ( m_transfer->getType() == DccTransfer::Send )
--        return TQString( "%1:%2" ).tqarg( m_transfer->getOwnIp() ).tqarg( m_transfer->getOwnPort() );
-+        return TQString( "%1:%2" ).arg( m_transfer->getOwnIp() ).arg( m_transfer->getOwnPort() );
-     else
--        return TQString( "%1:%2" ).tqarg( m_transfer->getPartnerIp() ).tqarg( m_transfer->getPartnerPort() );
-+        return TQString( "%1:%2" ).arg( m_transfer->getPartnerIp() ).arg( m_transfer->getPartnerPort() );
- }
- 
- TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed )
-@@ -384,7 +384,7 @@ TQString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed )
-     else if ( speed == DccTransfer::NotInTransfer )
-         return TQString();
-     else
--        return i18n("%1/sec").tqarg( KIO::convertSize( (KIO::fileoffset_t)speed ) );
-+        return i18n("%1/sec").arg( KIO::convertSize( (KIO::fileoffset_t)speed ) );
- }
- 
- TQString DccTransferPanelItem::secToHMS( long sec )
-@@ -395,9 +395,9 @@ TQString DccTransferPanelItem::secToHMS( long sec )
- 
-         // remHour can be more than 25, so we can't use TQTime here.
-         return TQString( "%1:%2:%3" )
--            .tqarg( TQString::number( remHour ).rightJustify( 2, '0', false ) )
--            .tqarg( TQString::number( remMin ).rightJustify( 2, '0' ) )
--            .tqarg( TQString::number( remSec ).rightJustify( 2, '0' ) );
-+            .arg( TQString::number( remHour ).rightJustify( 2, '0', false ) )
-+            .arg( TQString::number( remMin ).rightJustify( 2, '0' ) )
-+            .arg( TQString::number( remSec ).rightJustify( 2, '0' ) );
- }
- 
- #include "dcctransferpanelitem.moc"
-diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
-index eef6305..5a50f61 100644
---- a/konversation/src/dcctransferpanelitem.h
-+++ b/konversation/src/dcctransferpanelitem.h
-@@ -46,7 +46,7 @@ class DccTransferPanelItem : public TQObject, public KListViewItem
-         DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer );
-         virtual ~DccTransferPanelItem();
- 
--        virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int tqalignment );
-+        virtual void paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment );
- 
-         virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
- 
-diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
-index 9922bbb..9134a8d 100644
---- a/konversation/src/dcctransferrecv.cpp
-+++ b/konversation/src/dcctransferrecv.cpp
-@@ -182,7 +182,7 @@ bool DccTransferRecv::queue()
-     // check if the sender IP is valid
-     if ( m_partnerIp == "0.0.0.0" )
-     {
--        failed( i18n( "Invalid sender address (%1)" ).tqarg( m_partnerIp ) );
-+        failed( i18n( "Invalid sender address (%1)" ).arg( m_partnerIp ) );
-         return false;
-     }
- 
-@@ -270,7 +270,7 @@ void DccTransferRecv::prepareLocalKio( bool overwrite, bool resume, KIO::fileoff
-     {
-         askAndPrepareLocalKio( i18n( "<b>Cannot create the folder.</b><br>"
-             "Folder: %1<br>" )
--            .tqarg( m_fileURL.upURL().prettyURL() ),
-+            .arg( m_fileURL.upURL().prettyURL() ),
-             DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
-             DccResumeDialog::RA_Rename );
-         return;
-@@ -352,7 +352,7 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size )
-         {
-             askAndPrepareLocalKio( i18n( "<b>The file is used by another transfer.</b><br>"
-                 "%1<br>" )
--                .tqarg( m_fileURL.prettyURL() ),
-+                .arg( m_fileURL.prettyURL() ),
-                 DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
-                 DccResumeDialog::RA_Rename );
-         }
-@@ -365,8 +365,8 @@ void DccTransferRecv::slotLocalCanResume( KIO::Job* job, KIO::filesize_t size )
-             askAndPrepareLocalKio( i18n( "<b>A partial file exists.</b><br>"
-                 "%1<br>"
-                 "Size of the partial file: %2 bytes<br>" )
--                .tqarg( m_fileURL.prettyURL() )
--                .tqarg( KGlobal::locale()->formatNumber( size, 0 ) ),
-+                .arg( m_fileURL.prettyURL() )
-+                .arg( KGlobal::locale()->formatNumber( size, 0 ) ),
-                 DccResumeDialog::RA_Resume | DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
-                 DccResumeDialog::RA_Resume,
-                 size );
-@@ -392,7 +392,7 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job )
-         case KIO::ERR_FILE_ALREADY_EXIST:
-             askAndPrepareLocalKio( i18n( "<b>The file already exists.</b><br>"
-                 "%1<br>" )
--                .tqarg( m_fileURL.prettyURL() ),
-+                .arg( m_fileURL.prettyURL() ),
-                 DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
-                 DccResumeDialog::RA_Overwrite );
-             break;
-@@ -400,8 +400,8 @@ void DccTransferRecv::slotLocalGotResult( KIO::Job* job )
-             askAndPrepareLocalKio( i18n( "<b>Could not open the file.<br>"
-                 "Error: %1</b><br>"
-                 "%2<br>" )
--                .tqarg( transferJob->error() )
--                .tqarg( m_fileURL.prettyURL() ),
-+                .arg( transferJob->error() )
-+                .arg( m_fileURL.prettyURL() ),
-                 DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
-                 DccResumeDialog::RA_Rename );
-     }
-@@ -564,7 +564,7 @@ void DccTransferRecv::slotServerSocketReadyAccept()
- 
- void DccTransferRecv::slotServerSocketGotError( int /* errorCode*/ )
- {
--    failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) );
-+    failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) );
- }
- 
- void DccTransferRecv::startReceiving()
-@@ -591,7 +591,7 @@ void DccTransferRecv::startReceiving()
- void DccTransferRecv::connectionFailed( int errorCode )
- {
-     kdDebug() << "DccTransferRecv::connectionFailed(): code = " << errorCode << ", string = " << m_recvSocket->KSocketBase::errorString() << endl;
--    failed( i18n( "Connection failure: %1" ).tqarg( m_recvSocket->KSocketBase::errorString() ) );
-+    failed( i18n( "Connection failure: %1" ).arg( m_recvSocket->KSocketBase::errorString() ) );
- }
- 
- void DccTransferRecv::readData()                  // slot
-@@ -642,7 +642,7 @@ void DccTransferRecv::slotLocalWriteDone()        // <-WriteCacheHandler::done()
- void DccTransferRecv::slotLocalGotWriteError( const TQString& errorString )
- {
-     kdDebug() << "DccTransferRecv::slotLocalGotWriteError()" << endl;
--    failed( i18n( "KIO error: %1" ).tqarg( errorString ) );
-+    failed( i18n( "KIO error: %1" ).arg( errorString ) );
- }
- 
- void DccTransferRecv::startConnectionTimer( int sec )
-diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp
-index db0bad2..1ed371f 100644
---- a/konversation/src/dcctransfersend.cpp
-+++ b/konversation/src/dcctransfersend.cpp
-@@ -170,7 +170,7 @@ bool DccTransferSend::queue()
-     //Check the file exists
-     if ( !KIO::NetAccess::exists( m_fileURL, true, NULL ) )
-     {
--        failed( i18n( "The url \"%1\" does not exist" ).tqarg( m_fileURL.prettyURL() ) );
-+        failed( i18n( "The url \"%1\" does not exist" ).arg( m_fileURL.prettyURL() ) );
-         return false;
-     }
- 
-@@ -178,7 +178,7 @@ bool DccTransferSend::queue()
-     //Download the file.  Does nothing if it's local (file:/)
-     if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, NULL ) )
-     {
--        failed( i18n( "Could not retrieve \"%1\"" ).tqarg( m_fileURL.prettyURL() ) );
-+        failed( i18n( "Could not retrieve \"%1\"" ).arg( m_fileURL.prettyURL() ) );
-         kdDebug() << "DccTransferSend::DccTransferSend(): KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString() << endl;
-         return false;
-     }
-@@ -187,7 +187,7 @@ bool DccTransferSend::queue()
-     if ( m_fileName.isEmpty() )
-     {
-         bool pressedOk;
--        m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "<qt>The file that you are sending to <i>%1</i> does not have a filename.<br>Please enter a filename to be presented to the receiver, or cancel the dcc transfer</qt>" ).tqarg( getPartnerNick() ), "unknown", &pressedOk, NULL );
-+        m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "<qt>The file that you are sending to <i>%1</i> does not have a filename.<br>Please enter a filename to be presented to the receiver, or cancel the dcc transfer</qt>" ).arg( getPartnerNick() ), "unknown", &pressedOk, NULL );
- 
-         if ( !pressedOk )
-         {
-@@ -365,7 +365,7 @@ void DccTransferSend::startSending()
-         startTransferLogger();                      // initialize CPS counter, ETA counter, etc...
-     }
-     else
--        failed( i18n( "Could not open the file: %1" ).tqarg( getTQFileErrorString( m_file.status() ) ) );
-+        failed( i18n( "Could not open the file: %1" ).arg( getTQFileErrorString( m_file.status() ) ) );
- }
- 
- void DccTransferSend::writeData()                 // slot
-@@ -418,7 +418,7 @@ void DccTransferSend::getAck()                    // slot
- void DccTransferSend::slotGotSocketError( int errorCode )
- {
-     kdDebug() << "DccTransferSend::slotGotSocketError(): code =  " << errorCode << " string = " << m_serverSocket->errorString() << endl;
--    failed( i18n( "Socket error: %1" ).tqarg( m_serverSocket->errorString() ) );
-+    failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) );
- }
- 
- void DccTransferSend::startConnectionTimer( int sec )
-@@ -445,7 +445,7 @@ void DccTransferSend::slotConnectionTimeout()         // slot
- 
- void DccTransferSend::slotConnectionFailed( int /* errorCode */ )
- {
--    failed( i18n( "Connection failure: %1" ).tqarg( m_sendSocket->KSocketBase::errorString() ) );
-+    failed( i18n( "Connection failure: %1" ).arg( m_sendSocket->KSocketBase::errorString() ) );
- }
- 
- void DccTransferSend::slotServerSocketClosed()
-@@ -472,16 +472,16 @@ TQString DccTransferSend::getTQFileErrorString( int code )
-             errorString=i18n("The operation was successful. Should never happen in an error dialog.");
-             break;
-         case IO_ReadError:
--            errorString=i18n("Could not read from file \"%1\".").tqarg( m_fileName );
-+            errorString=i18n("Could not read from file \"%1\".").arg( m_fileName );
-             break;
-         case IO_WriteError:
--            errorString=i18n("Could not write to file \"%1\".").tqarg( m_fileName );
-+            errorString=i18n("Could not write to file \"%1\".").arg( m_fileName );
-             break;
-         case IO_FatalError:
-             errorString=i18n("A fatal unrecoverable error occurred.");
-             break;
-         case IO_OpenError:
--            errorString=i18n("Could not open file \"%1\".").tqarg( m_fileName );
-+            errorString=i18n("Could not open file \"%1\".").arg( m_fileName );
-             break;
- 
-             // Same case value? Damn!
-@@ -499,7 +499,7 @@ TQString DccTransferSend::getTQFileErrorString( int code )
-             errorString=i18n("An unspecified error happened on close.");
-             break;
-         default:
--            errorString=i18n("Unknown error. Code %1").tqarg(code);
-+            errorString=i18n("Unknown error. Code %1").arg(code);
-             break;
-     }
- 
-diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp
-index c1fe023..96e967f 100644
---- a/konversation/src/emoticon.cpp
-+++ b/konversation/src/emoticon.cpp
-@@ -159,7 +159,7 @@ namespace Konversation
- 
-         for(EmotIconMap::iterator it = self()->m_emotIconMap.begin(); it != self()->m_emotIconMap.end(); ++it)
-         {
--            TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").tqarg(it.data()));
-+            TQRegExp regExp(TQString("(^|\\s)%1($|\\s)").arg(it.data()));
-             filteredTxt.replace(regExp, " <img width=\"" + TQString::number(fm.height()) + "\" height=\"" + TQString::number(fm.height())
-                 + "\" src=\"" + it.key() + "\" alt=\"" + it.data() + "\">&nbsp;");
-         }
-diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
-index 3b72fda..c59a545 100644
---- a/konversation/src/highlight_preferences.cpp
-+++ b/konversation/src/highlight_preferences.cpp
-@@ -228,7 +228,7 @@ void Highlight_Config::highlightColorChanged(const TQColor& newColor)
-   if(!newItemSelected && item)
-   {
-     item->setColor(newColor);
--    item->tqrepaint();
-+    item->repaint();
-     emit modified();
-   }
- }
-@@ -327,7 +327,7 @@ void Highlight_Config::saveSettings()
-   int i = 0;
-   for(Highlight* hl = hiList.first(); hl; hl = hiList.next())
-   {
--    config->setGroup(TQString("Highlight%1").tqarg(i));
-+    config->setGroup(TQString("Highlight%1").arg(i));
-     config->writeEntry("Pattern", hl->getPattern());
-     config->writeEntry("RegExp", hl->getRegExp());
-     config->writeEntry("Color", hl->getColor());
-@@ -339,9 +339,9 @@ void Highlight_Config::saveSettings()
-   Preferences::setHighlightList(hiList);
- 
-   // Remove unused entries...
--  while(config->hasGroup(TQString("Highlight%1").tqarg(i)))
-+  while(config->hasGroup(TQString("Highlight%1").arg(i)))
-   {
--    config->deleteGroup(TQString("Highlight%1").tqarg(i));
-+    config->deleteGroup(TQString("Highlight%1").arg(i));
-     i++;
-   }
- 
-diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp
-index 138ca2f..f6784a6 100644
---- a/konversation/src/highlightviewitem.cpp
-+++ b/konversation/src/highlightviewitem.cpp
-@@ -35,12 +35,12 @@ HighlightViewItem::~HighlightViewItem()
- {
- }
- 
--void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int tqalignment)
-+void HighlightViewItem::paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int alignment)
- {
-     // copy all colors from cg and only then change needed colors
-     itemColorGroup=cg;
-     itemColorGroup.setColor(TQColorGroup::Text, itemColor);
--    TQCheckListItem::paintCell(p, itemColorGroup, column, width, tqalignment);
-+    TQCheckListItem::paintCell(p, itemColorGroup, column, width, alignment);
- }
- 
- HighlightViewItem* HighlightViewItem::itemBelow()
-diff --git a/konversation/src/highlightviewitem.h b/konversation/src/highlightviewitem.h
-index 805f806..d2d15dc 100644
---- a/konversation/src/highlightviewitem.h
-+++ b/konversation/src/highlightviewitem.h
-@@ -67,6 +67,6 @@ class HighlightViewItem : public TQCheckListItem
-         bool m_changed;  // true if the checkbox has been changed
- 
-         void stateChange(bool newState);  // reimplemented to store changed value
--        void paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int tqalignment);
-+        void paintCell(TQPainter* p, const TQColorGroup &cg, int column, int width, int alignment);
- };
- #endif
-diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp
-index f2e78ec..e1fb804 100644
---- a/konversation/src/inputfilter.cpp
-+++ b/konversation/src/inputfilter.cpp
-@@ -201,17 +201,17 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received CTCP-PING request from %1 to channel %2, sending answer.")
--                            .tqarg(sourceNick).tqarg(parameterList[0])
-+                            .arg(sourceNick).arg(parameterList[0])
-                             );
-                     }
-                     else
-                     {
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received CTCP-%1 request from %2, sending answer.")
--                            .tqarg("PING").tqarg(sourceNick)
-+                            .arg("PING").arg(sourceNick)
-                             );
-                     }
--                    server->ctcpReply(sourceNick,TQString("PING %1").tqarg(ctcpArgument));
-+                    server->ctcpReply(sourceNick,TQString("PING %1").arg(ctcpArgument));
-                 }
-             }
- 
-@@ -224,14 +224,14 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received Version request from %1 to channel %2.")
--                            .tqarg(sourceNick).tqarg(parameterList[0])
-+                            .arg(sourceNick).arg(parameterList[0])
-                             );
-                     }
-                     else
-                     {
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received Version request from %1.")
--                            .tqarg(sourceNick)
-+                            .arg(sourceNick)
-                             );
-                     }
- 
-@@ -244,7 +244,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     {
-                         // Do not internationalize the below version string
-                         reply = TQString("Konversation %1 (C) 2002-2008 by the Konversation team")
--                            .tqarg(TQString(KONVI_VERSION));
-+                            .arg(TQString(KONVI_VERSION));
-                     }
-                     server->ctcpReply(sourceNick,"VERSION "+reply);
-                 }
-@@ -298,7 +298,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                         {
-                             server->appendMessageToFrontmost(i18n("DCC"),
-                                 i18n("Received invalid DCC SEND request from %1.")
--                                .tqarg(sourceNick)
-+                                .arg(sourceNick)
-                                 );
-                         }
-                     }
-@@ -313,7 +313,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                         {
-                             server->appendMessageToFrontmost(i18n("DCC"),
-                                 i18n("Received invalid DCC ACCEPT request from %1.")
--                                .tqarg(sourceNick)
-+                                .arg(sourceNick)
-                                 );
-                         }
-                     }
-@@ -328,7 +328,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                         {
-                             server->appendMessageToFrontmost(i18n("DCC"),
-                                 i18n("Received invalid DCC RESUME request from %1.")
--                                .tqarg(sourceNick)
-+                                .arg(sourceNick)
-                                 );
-                         }
-                     }
-@@ -344,7 +344,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                         {
-                             server->appendMessageToFrontmost(i18n("DCC"),
-                                 i18n("Received invalid DCC CHAT request from %1.")
--                                .tqarg(sourceNick)
-+                                .arg(sourceNick)
-                                 );
-                         }
-                     }
-@@ -352,7 +352,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("DCC"),
-                             i18n("Unknown DCC command %1 received from %2.")
--                            .tqarg(ctcpArgument).tqarg(sourceNick)
-+                            .arg(ctcpArgument).arg(sourceNick)
-                             );
-                     }
-                 }
-@@ -361,7 +361,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-             {
-                 server->appendMessageToFrontmost(i18n("CTCP"),
-                     i18n("Received CTCP-%1 request from %2, sending answer.")
--                    .tqarg("CLIENTINFO").tqarg(sourceNick)
-+                    .arg("CLIENTINFO").arg(sourceNick)
-                     );
-                 server->ctcpReply(sourceNick,TQString("CLIENTINFO ACTION CLIENTINFO DCC PING TIME VERSION"));
-             }
-@@ -369,7 +369,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-             {
-                 server->appendMessageToFrontmost(i18n("CTCP"),
-                     i18n("Received CTCP-%1 request from %2, sending answer.")
--                    .tqarg("TIME").tqarg(sourceNick)
-+                    .arg("TIME").arg(sourceNick)
-                     );
-                 server->ctcpReply(sourceNick,TQString("TIME ")+TQDateTime::currentDateTime().toString());
-             }
-@@ -384,12 +384,12 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                             parameterList[0],
-                             "CTCP",
-                             i18n("Received unknown CTCP-%1 request from %2 to Channel %3.")
--                            .tqarg(ctcp).tqarg(sourceNick).tqarg(parameterList[0])
-+                            .arg(ctcp).arg(sourceNick).arg(parameterList[0])
-                             );
-                     else
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received unknown CTCP-%1 request from %2.")
--                            .tqarg(ctcp).tqarg(sourceNick)
-+                            .arg(ctcp).arg(sourceNick)
-                             );
-                 }
-             }
-@@ -414,7 +414,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
- 
-                 server->appendServerMessageToChannel(parameterList[0], i18n("Notice"),
-                     i18n("-%1 to %2- %3")
--                    .tqarg(sourceNick).tqarg(parameterList[0]).tqarg(trailing)
-+                    .arg(sourceNick).arg(parameterList[0]).arg(trailing)
-                     );
-             }
-             // Private notice
-@@ -441,9 +441,9 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
- 
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received CTCP-PING reply from %1: %2 %3.")
--                            .tqarg(sourceNick)
--                            .tqarg(time)
--                            .tqarg(unit)
-+                            .arg(sourceNick)
-+                            .arg(time)
-+                            .arg(unit)
-                             );
-                     }
-                     // all other ctcp replies get a general message
-@@ -451,7 +451,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("CTCP"),
-                             i18n("Received CTCP-%1 reply from %2: %3.")
--                            .tqarg(replyReason).tqarg(sourceNick).tqarg(reply)
-+                            .arg(replyReason).arg(sourceNick).arg(reply)
-                             );
-                     }
-                 }
-@@ -474,7 +474,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
-                         if(nickInfo)
-                             nickInfo->setIdentified(true);
-                     }
--                    server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").tqarg(sourceNick).tqarg(trailing));
-+                    server->appendMessageToFrontmost(i18n("Notice"), i18n("-%1- %2").arg(sourceNick).arg(trailing));
-                 }
-             }
-         }
-@@ -608,7 +608,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
- 
-         server->appendMessageToFrontmost(i18n("Invite"),
-             i18n("%1 invited you to channel %2.")
--            .tqarg(sourceNick).tqarg(channel)
-+            .arg(sourceNick).arg(channel)
-             );
-         emit invitation(sourceNick,channel);
-     }
-@@ -668,7 +668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-         }
-         else if(command=="notice")
-         {
--            server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").tqarg(prefix).tqarg(trailing));
-+            server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").arg(prefix).arg(trailing));
-         }
-         else if(command=="kick")
-         {
-@@ -714,10 +714,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             {
-                 server->appendStatusMessage(i18n("Welcome"),
-                     i18n("Server %1 (Version %2), User modes: %3, Channel modes: %4")
--                    .tqarg(parameterList[1])
--                    .tqarg(parameterList[2])
--                    .tqarg(parameterList[3])
--                    .tqarg(parameterList[4])
-+                    .arg(parameterList[1])
-+                    .arg(parameterList[2])
-+                    .arg(parameterList[3])
-+                    .arg(parameterList[4])
-                     );
-                 server->setAllowedChannelModes(parameterList[4]);
-                 break;
-@@ -781,7 +781,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             }
-             case RPL_UMODEIS:
-             {
--                TQString message=TQString("%1 %2").tqarg(i18n("Your personal modes are:")).tqarg(parameterList.join(" ").section(' ',1) + ' '+trailing);
-+                TQString message=TQString("%1 %2").arg(i18n("Your personal modes are:")).arg(parameterList.join(" ").section(' ',1) + ' '+trailing);
-                 server->appendMessageToFrontmost("Info", message);
-                 break;
-             }
-@@ -853,7 +853,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             case RPL_CHANNELURLIS:
-             {// :niven.freenode.net 328 argonel #channel :http://www.buggeroff.com/
-                 server->appendCommandMessageToChannel(parameterList[1], i18n("URL"),
--                    i18n("Channel URL: %1").tqarg(trailing));
-+                    i18n("Channel URL: %1").arg(trailing));
-                 break;
-             }
-             case RPL_CHANNELCREATED:
-@@ -862,7 +862,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 when.setTime_t(parameterList[2].toUInt());
-                 server->appendCommandMessageToChannel(parameterList[1],i18n("Created"),
-                     i18n("This channel was created on %1.")
--                    .tqarg(when.toString(Qt::LocalDate))
-+                    .arg(when.toString(Qt::LocalDate))
-                     );
- 
-                 if(Preferences::autoWhoContinuousEnabled())
-@@ -877,7 +877,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 // Display message only if this was not an automatic request.
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
--                    server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").tqarg(parameterList[1]).tqarg(parameterList[2]));
-+                    server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").arg(parameterList[1]).arg(parameterList[2]));
-                 }
-                 break;
-             }
-@@ -927,7 +927,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             // Topic set messages
-             case RPL_NOTOPIC:
-             {
--                server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").tqarg(parameterList[1]) /*.tqarg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be?
-+                server->appendMessageToFrontmost(i18n("TOPIC"),i18n("The channel %1 has no topic set.").arg(parameterList[1]) /*.arg(parameterList[2])*/); //FIXME ok, whats the second parameter supposed to be?
- 
-                 break;
-             }
-@@ -946,7 +946,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 }
-                 else
-                 {
--                    server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").tqarg(parameterList[1]).tqarg(topic));
-+                    server->appendMessageToFrontmost(i18n("Topic"),i18n("The channel topic for %1 is: \"%2\"").arg(parameterList[1]).arg(topic));
-                 }
- 
-                 break;
-@@ -962,15 +962,15 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 {
-                     server->appendCommandMessageToChannel(parameterList[1],i18n("Topic"),
-                         i18n("The topic was set by %1 on %2.")
--                        .tqarg(parameterList[2]).tqarg(when.toString(Qt::LocalDate)),
-+                        .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)),
-                         false);
-                 }
-                 else
-                 {
-                     server->appendMessageToFrontmost(i18n("Topic"),i18n("The topic for %1 was set by %2 on %3.")
--                        .tqarg(parameterList[1])
--                        .tqarg(parameterList[2])
--                        .tqarg(when.toString(Qt::LocalDate))
-+                        .arg(parameterList[1])
-+                        .arg(parameterList[2])
-+                        .arg(when.toString(Qt::LocalDate))
-                         );
-                     setAutomaticRequest("TOPIC",parameterList[1],false);
-                 }
-@@ -983,7 +983,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 // Display message only if this was not an automatic request.
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
--                    server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").tqarg(parameterList[1]).tqarg(parameterList[2]));
-+                    server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").arg(parameterList[1]).arg(parameterList[2]));
-                 }
-                 break;
-             }
-@@ -993,11 +993,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 // IP resolve purposes, and clear it from the automaticRequest list
-                 if(getAutomaticRequest("DNS",parameterList[1])==0)
-                 {
--                    server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").tqarg(parameterList[1]));
-+                    server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").arg(parameterList[1]));
-                 }
-                 else if(getAutomaticRequest("WHOIS",parameterList[1])==0) //Display message only if this was not an automatic request.
-                 {
--                    server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").tqarg(parameterList[1]));
-+                    server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").arg(parameterList[1]));
-                     setAutomaticRequest("DNS", parameterList[1], false);
-                 }
- 
-@@ -1008,7 +1008,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 // Display message only if this was not an automatic request.
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
--                    server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").tqarg(parameterList[1]));
-+                    server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").arg(parameterList[1]));
-                 }
-                 break;
-             }
-@@ -1036,7 +1036,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                         server->obtainNickInfo(server->getNickname()) ;
-                         server->renameNick(server->getNickname(), newNick);
-                         // Show message
--                        server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").tqarg(newNick));
-+                        server->appendMessageToFrontmost(i18n("Nick"), i18n("Nickname already in use. Trying %1.").arg(newNick));
-                         // Send nickchange request to the server
-                         server->queue("NICK "+newNick);
-                     }
-@@ -1062,7 +1062,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->obtainNickInfo(server->getNickname()) ;
-                         server->renameNick(server->getNickname(), newNick);
--                        server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).tqarg(newNick)) ;
-+                        server->appendMessageToFrontmost(i18n("Nick"), i18n("Erroneus nickname. Changing nick to %1." ).arg(newNick)) ;
-                         server->queue("NICK "+newNick);
-                     }
-                 }
-@@ -1070,7 +1070,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             }
-             case ERR_NOTONCHANNEL:
-             {
--                server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").tqarg(parameterList[1]));
-+                server->appendMessageToFrontmost(i18n("Error"),i18n("You are not on %1.").arg(parameterList[1]));
- 
-                 break;
-             }
-@@ -1115,14 +1115,14 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             {
-                 TQString current(trailing.section(' ',3));
-                 //TQString max(trailing.section(' ',5,5));
--                server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").tqarg(current));
-+                server->appendStatusMessage(i18n("Users"),i18n("Current users on the network: %1").arg(current));
-                 break;
-             }
-             case RPL_LOCALUSERS:                  // Current local users: 589 Max: 845
-             {
-                 TQString current(trailing.section(' ',3));
-                 //TQString max(trailing.section(' ',5,5));
--                server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").tqarg(prefix).tqarg(current));
-+                server->appendStatusMessage(i18n("Users"),i18n("Current users on %1: %2.").arg(prefix).arg(current));
-                 break;
-             }
-             case RPL_ISON:
-@@ -1145,7 +1145,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
-                     server->appendMessageToFrontmost(i18n("Away"),i18n("%1 is away: %2")
--                        .tqarg(parameterList[1]).tqarg(trailing)
-+                        .arg(parameterList[1]).arg(trailing)
-                         );
-                 }
- 
-@@ -1155,7 +1155,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             {
-                 server->appendMessageToFrontmost(i18n("Invite"),
-                     i18n("You invited %1 to channel %2.")
--                    .tqarg(parameterList[1]).tqarg(parameterList[2])
-+                    .arg(parameterList[1]).arg(parameterList[2])
-                     );
-                 break;
-             }
-@@ -1173,7 +1173,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 NickInfo* nickInfo = server->getNickInfo(parameterList[1]);
-                 if(nickInfo)
-                 {
--                    nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
-+                    nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3]));
-                     nickInfo->setRealName(trailing);
-                 }
-                 // Display message only if this was not an automatic request.
-@@ -1184,10 +1184,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     escapedRealName.replace("<","&lt;").replace(">","&gt;");
-                     server->appendMessageToFrontmost(i18n("Whois"),
-                         i18n("%1 is %2@%3 (%4)")
--                        .tqarg(parameterList[1])
--                        .tqarg(parameterList[2])
--                        .tqarg(parameterList[3])
--                        .tqarg(escapedRealName), false);   // Don't parse any urls
-+                        .arg(parameterList[1])
-+                        .arg(parameterList[2])
-+                        .arg(parameterList[3])
-+                        .arg(escapedRealName), false);   // Don't parse any urls
-                 }
-                 else
-                 {
-@@ -1200,17 +1200,17 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                             TQString ip = resolved.first().address().nodeName();
-                             server->appendMessageToFrontmost(i18n("DNS"),
-                                 i18n("Resolved %1 (%2) to address: %3")
--                                .tqarg(parameterList[1])
--                                .tqarg(parameterList[3])
--                                .tqarg(ip)
-+                                .arg(parameterList[1])
-+                                .arg(parameterList[3])
-+                                .arg(ip)
-                                 );
-                         }
-                         else
-                         {
-                             server->appendMessageToFrontmost(i18n("Error"),
-                                 i18n("Unable to resolve address for %1 (%2)")
--                                .tqarg(parameterList[1])
--                                .tqarg(parameterList[3])
-+                                .arg(parameterList[1])
-+                                .arg(parameterList[3])
-                                 );
-                         }
- 
-@@ -1235,7 +1235,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     // Prints "psn is an identified user"
-                     //server->appendStatusMessage(i18n("Whois"),parameterList.join(" ").section(' ',1)+' '+trailing);
-                     // The above line works fine, but can't be i18n'ised. So use the below instead.. I hope this is okay.
--                    server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").tqarg(parameterList[1]));
-+                    server->appendMessageToFrontmost(i18n("Whois"), i18n("%1 is an identified user.").arg(parameterList[1]));
-                 }
-                 break;
-             }
-@@ -1250,7 +1250,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 bool bAway = parameterList[6].upper().startsWith("G");
-                 if(nickInfo)
-                 {
--                    nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
-+                    nickInfo->setHostmask(i18n("%1@%2").arg(parameterList[2]).arg(parameterList[3]));
-                                                   //Strip off the "0 "
-                     nickInfo->setRealName(trailing.section(" ", 1));
-                     nickInfo->setAway(bAway);
-@@ -1265,11 +1265,11 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     if(getAutomaticRequest("WHO",whoRequestList.front())==0)
-                     {
-                         server->appendMessageToFrontmost(i18n("Who"),
--                            i18n("%1 is %2@%3 (%4)%5").tqarg(parameterList[5])
--                            .tqarg(parameterList[2])
--                            .tqarg(parameterList[3])
--                            .tqarg(trailing.section(" ", 1))
--                            .tqarg(bAway?i18n(" (Away)"):TQString())
-+                            i18n("%1 is %2@%3 (%4)%5").arg(parameterList[5])
-+                            .arg(parameterList[2])
-+                            .arg(parameterList[3])
-+                            .arg(trailing.section(" ", 1))
-+                            .arg(bAway?i18n(" (Away)"):TQString())
-                             , false); // Don't parse as url
-                     }
-                 }
-@@ -1287,7 +1287,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                         {
-                             server->appendMessageToFrontmost(i18n("Who"),
-                                 i18n("End of /WHO list for %1")
--                                .tqarg(parameterList[1]));
-+                                .arg(parameterList[1]));
-                         }
-                         else
-                         {
-@@ -1372,43 +1372,43 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 is a user on channels: %2")
--                            .tqarg(parameterList[1])
--                            .tqarg(userChannels.join(" "))
-+                            .arg(parameterList[1])
-+                            .arg(userChannels.join(" "))
-                             );
-                     }
-                     if(voiceChannels.count())
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 has voice on channels: %2")
--                            .tqarg(parameterList[1]).tqarg(voiceChannels.join(" "))
-+                            .arg(parameterList[1]).arg(voiceChannels.join(" "))
-                             );
-                     }
-                     if(halfopChannels.count())
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 is a halfop on channels: %2")
--                            .tqarg(parameterList[1]).tqarg(halfopChannels.join(" "))
-+                            .arg(parameterList[1]).arg(halfopChannels.join(" "))
-                             );
-                     }
-                     if(opChannels.count())
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 is an operator on channels: %2")
--                            .tqarg(parameterList[1]).tqarg(opChannels.join(" "))
-+                            .arg(parameterList[1]).arg(opChannels.join(" "))
-                             );
-                     }
-                     if(ownerChannels.count())
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 is owner of channels: %2")
--                            .tqarg(parameterList[1]).tqarg(ownerChannels.join(" "))
-+                            .arg(parameterList[1]).arg(ownerChannels.join(" "))
-                             );
-                     }
-                     if(adminChannels.count())
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 is admin on channels: %2")
--                            .tqarg(parameterList[1]).tqarg(adminChannels.join(" "))
-+                            .arg(parameterList[1]).arg(adminChannels.join(" "))
-                             );
-                     }
-                 }
-@@ -1430,8 +1430,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
-                     server->appendMessageToFrontmost(i18n("Whois"),
--                        i18n("%1 is online via %2 (%3).").tqarg(parameterList[1])
--                        .tqarg(parameterList[2]).tqarg(trailing)
-+                        i18n("%1 is online via %2 (%3).").arg(parameterList[1])
-+                        .arg(parameterList[2]).arg(trailing)
-                         );
-                 }
-                 break;
-@@ -1443,7 +1443,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 {
-                     server->appendMessageToFrontmost(i18n("Whois"),
-                         i18n("%1 is available for help.")
--                        .tqarg(parameterList[1])
-+                        .arg(parameterList[1])
-                         );
-                 }
-                 break;
-@@ -1454,9 +1454,9 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 if(getAutomaticRequest("WHOIS",parameterList[1])==0)
-                 {
-                     if (trailing.lower().simplifyWhiteSpace().startsWith("is an irc operator"))
--                        server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").tqarg(parameterList[1]));
-+                        server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").arg(parameterList[1]));
-                     else
--                        server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").tqarg(parameterList[1]).tqarg(trailing));
-+                        server->appendMessageToFrontmost(i18n("Whois"),TQString("%1 %2").arg(parameterList[1]).arg(trailing));
-                 }
-                 break;
-             }
-@@ -1482,8 +1482,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 = name of person, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)",
-                             "%1 has been idle for %2, %3, %4, and %5.")
--                            .tqarg(parameterList[1])
--                            .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString)
-+                            .arg(parameterList[1])
-+                            .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString)
-                             );
-                         // or longer than an hour
-                     }
-@@ -1495,8 +1495,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 = name of person, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)",
-                             "%1 has been idle for %2, %3, and %4.")
--                            .tqarg(parameterList[1])
--                            .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString)
-+                            .arg(parameterList[1])
-+                            .arg(hoursString).arg(minutesString).arg(secondsString)
-                             );
-                         // or longer than a minute
-                     }
-@@ -1507,8 +1507,8 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 = name of person, %2 = (x minutes), %3 = (x seconds)",
-                             "%1 has been idle for %2 and %3.")
--                            .tqarg(parameterList[1])
--                            .tqarg(minutesString).tqarg(secondsString)
-+                            .arg(parameterList[1])
-+                            .arg(minutesString).arg(secondsString)
-                             );
-                         // or just some seconds
-                     }
-@@ -1516,7 +1516,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 has been idle for 1 second.", "%1 has been idle for %n seconds.", seconds)
--                            .tqarg(parameterList[1])
-+                            .arg(parameterList[1])
-                             );
-                     }
-                 }
-@@ -1535,7 +1535,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("Whois"),
-                             i18n("%1 has been online since %2.")
--                            .tqarg(parameterList[1]).tqarg(when.toString(Qt::LocalDate))
-+                            .arg(parameterList[1]).arg(when.toString(Qt::LocalDate))
-                             );
-                     }
-                 }
-@@ -1586,10 +1586,10 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     {
-                         server->appendMessageToFrontmost(i18n("Userhost"),
-                             i18n("%1 = nick, %2 = shows if nick is op, %3 = hostmask, %4 = shows away", "%1%2 is %3%4.")
--                            .tqarg(nick)
--                            .tqarg((ircOp) ? i18n(" (IRC Operator)") : TQString())
--                            .tqarg(mask)
--                            .tqarg((away) ? i18n(" (away)") : TQString()));
-+                            .arg(nick)
-+                            .arg((ircOp) ? i18n(" (IRC Operator)") : TQString())
-+                            .arg(mask)
-+                            .arg((away) ? i18n(" (away)") : TQString()));
-                     }
- 
-                     // was this an automatic request?
-@@ -1614,7 +1614,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 {
-                     TQString message;
-                     message=i18n("%1 (%n user): %2", "%1 (%n users): %2", parameterList[2].toInt());
--                    server->appendMessageToFrontmost(i18n("List"),message.tqarg(parameterList[1]).tqarg(trailing));
-+                    server->appendMessageToFrontmost(i18n("List"),message.arg(parameterList[1]).arg(trailing));
-                 }
-                 else                              // send them to /LIST window
-                 {
-@@ -1668,7 +1668,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                     TQDateTime when;
-                     when.setTime_t(parameterList[4].toUInt());
- 
--                    server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on <date>", "%1 set by %2 on %3").tqarg(parameterList[2]).tqarg(parameterList[3].section('!', 0, 0)).tqarg(when.toString(Qt::LocalDate)));
-+                    server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("BanList message: e.g. *!*@aol.com set by MrGrim on <date>", "%1 set by %2 on %3").arg(parameterList[2]).arg(parameterList[3].section('!', 0, 0)).arg(when.toString(Qt::LocalDate)));
-                 }
-                 break;
-             }
-@@ -1678,7 +1678,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-                 {
-                     setAutomaticRequest("BANLIST", parameterList[1], false);
-                 } else {
--                    server->appendMessageToFrontmost(i18n("BanList:%1").tqarg(parameterList[1]), i18n("End of Ban List."));
-+                    server->appendMessageToFrontmost(i18n("BanList:%1").arg(parameterList[1]), i18n("End of Ban List."));
-                 }
-                 break;
-             }
-@@ -1706,7 +1706,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             }
-             case ERR_UNAVAILRESOURCE:
-             {
--                server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").tqarg(parameterList[1]));
-+                server->appendMessageToFrontmost(i18n("Error"),i18n("%1 is currently unavailable.").arg(parameterList[1]));
- 
-                 break;
-             }
-@@ -1722,7 +1722,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             }
-             case ERR_UNKNOWNCOMMAND:
-             {
--                server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").tqarg(parameterList[1]));
-+                server->appendMessageToFrontmost(i18n("Error"),i18n("%1: Unknown command.").arg(parameterList[1]));
- 
-                 break;
-             }
-@@ -1734,7 +1734,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
-             }
-             case ERR_NEEDMOREPARAMS:
-             {
--                server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").tqarg(parameterList[1]));
-+                server->appendMessageToFrontmost(i18n("Error"),i18n("%1: This command requires more parameters.").arg(parameterList[1]));
- 
-                 break;
-             }
-@@ -1776,7 +1776,7 @@ void InputFilter::parseModes(const TQString &sourceNick, const TQStringList &par
-             }
-             else
-             {   //XXX someone might care about the potentially unnecessary plural here
--                message = TQString("%1 %2 %3").tqarg(sourceNick).tqarg(i18n("has changed your personal modes:")).tqarg(modestring);
-+                message = TQString("%1 %2 %3").arg(sourceNick).arg(i18n("has changed your personal modes:")).arg(modestring);
-             }
-         }
-         if (!message.isEmpty())
-diff --git a/konversation/src/irccolorchooserui.ui b/konversation/src/irccolorchooserui.ui
-index 00a3cae..3bfd4f7 100644
---- a/konversation/src/irccolorchooserui.ui
-+++ b/konversation/src/irccolorchooserui.ui
-@@ -32,7 +32,7 @@
-             <property name="text">
-                 <string>Preview</string>
-             </property>
--            <property name="tqalignment">
-+            <property name="alignment">
-                 <set>AlignCenter</set>
-             </property>
-             <property name="toolTip" stdset="0">
-diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
-index 20d3edf..e76b032 100644
---- a/konversation/src/ircinput.cpp
-+++ b/konversation/src/ircinput.cpp
-@@ -476,7 +476,7 @@ bool IRCInput::checkPaste(TQString& text)
-             (this,
-             i18n("<qt>You are attempting to paste a large portion of text (%1 bytes or %2 lines) into "
-             "the chat. This can cause connection resets or flood kills. "
--            "Do you really want to continue?</qt>").tqarg(text.length()).tqarg(lines+1),
-+            "Do you really want to continue?</qt>").arg(text.length()).arg(lines+1),
-             i18n("Large Paste Warning"),
-             i18n("Paste"),
-             i18n("&Edit..."),
-diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
-index fb57094..94a10b5 100644
---- a/konversation/src/ircview.cpp
-+++ b/konversation/src/ircview.cpp
-@@ -267,7 +267,7 @@ void IRCView::highlightedSlot(const TQString& _link)
-         m_currentNick = link.mid(1);
-         m_nickPopup->changeTitle(m_nickPopupId,m_currentNick);
-         m_isOnNick = true;
--        emit setStatusBarTempText(i18n("Open a query with %1").tqarg(m_currentNick));
-+        emit setStatusBarTempText(i18n("Open a query with %1").arg(m_currentNick));
-     }
-     else
-     {
-@@ -284,7 +284,7 @@ void IRCView::highlightedSlot(const TQString& _link)
- 
-         m_channelPopup->changeTitle(m_channelPopupId,prettyId);
-         m_isOnChannel = true;
--        emit setStatusBarTempText(i18n("Join the channel %1").tqarg(m_currentChannel));
-+        emit setStatusBarTempText(i18n("Join the channel %1").arg(m_currentChannel));
-     }
- }
- 
-@@ -353,7 +353,7 @@ void IRCView::replaceDecoration(TQString& line, char decoration, char replacemen
- 
-     while((pos=line.find(decoration))!=-1)
-     {
--        line.replace(pos,1,(decorated) ? TQString("</%1>").tqarg(replacement) : TQString("<%1>").tqarg(replacement));
-+        line.replace(pos,1,(decorated) ? TQString("</%1>").arg(replacement) : TQString("<%1>").arg(replacement));
-         decorated = !decorated;
-     }
- }
-@@ -573,7 +573,7 @@ bool doHighlight, bool parseURL, bool self)
-                 // replace %0 - %9 in regex groups
-                 for(unsigned int capture=0;capture<captures.count();capture++)
-                 {
--                  m_autoTextToSend.replace(TQString("%%1").tqarg(capture),captures[capture]);
-+                  m_autoTextToSend.replace(TQString("%%1").arg(capture),captures[capture]);
-                 }
-                 m_autoTextToSend.replace(TQRegExp("%[0-9]"),TQString());
-             }
-@@ -692,9 +692,9 @@ void IRCView::append(const TQString& nick,const TQString& message)
-         line = "<p><font color=\"" + channelColor + "\">%1" + nickLine + " %3</font></p>\n";
-     }
- 
--    line = line.tqarg(timeStamp(), nick, filter(message, channelColor, nick, true));
-+    line = line.arg(timeStamp(), nick, filter(message, channelColor, nick, true));
- 
--    emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message));
-+    emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message));
- 
-     doAppend(line);
- }
-@@ -874,9 +874,9 @@ void IRCView::appendQuery(const TQString& nick, const TQString& message, bool in
-         line = "<p><font color=\"" + queryColor + "\">%1 " + nickLine + " %3</font></p>\n";
-     }
- 
--    line = line.tqarg(timeStamp(), nick, filter(message, queryColor, nick, true));
-+    line = line.arg(timeStamp(), nick, filter(message, queryColor, nick, true));
- 
--    emit textToLog(TQString("<%1>\t%2").tqarg(nick).tqarg(message));
-+    emit textToLog(TQString("<%1>\t%2").arg(nick).arg(message));
- 
-     doAppend(line);
- }
-@@ -917,9 +917,9 @@ void IRCView::appendAction(const TQString& nick,const TQString& message)
-         line = "<p><font color=\"" + actionColor + "\">%1 * " + nickLine + " %3</font></p>\n";
-     }
- 
--    line = line.tqarg(timeStamp(), nick, filter(message, actionColor, nick, true));
-+    line = line.arg(timeStamp(), nick, filter(message, actionColor, nick, true));
- 
--    emit textToLog(TQString("\t * %1 %2").tqarg(nick).tqarg(message));
-+    emit textToLog(TQString("\t * %1 %2").arg(nick).arg(message));
- 
-     doAppend(line);
- }
-@@ -951,11 +951,11 @@ void IRCView::appendServerMessage(const TQString& type, const TQString& message,
-     }
- 
-     if(type != i18n("Notify"))
--        line = line.tqarg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL));
-+        line = line.arg(timeStamp(), type, filter(message, serverColor, 0 , true, parseURL));
-     else
--        line = "<font color=\"" + serverColor + "\">"+line.tqarg(timeStamp(), type, message)+"</font>";
-+        line = "<font color=\"" + serverColor + "\">"+line.arg(timeStamp(), type, message)+"</font>";
- 
--    emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message));
-+    emit textToLog(TQString("%1\t%2").arg(type).arg(message));
- 
-     doAppend(line);
- }
-@@ -993,9 +993,9 @@ void IRCView::appendCommandMessage(const TQString& type,const TQString& message,
-         line = "<p><font color=\"" + commandColor + "\">%1 %2 %3</font></p>\n";
-     }
- 
--    line = line.tqarg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self));
-+    line = line.arg(timeStamp(), prefix, filter(message, commandColor, 0, true, parseURL, self));
- 
--    emit textToLog(TQString("%1\t%2").tqarg(type).tqarg(message));
-+    emit textToLog(TQString("%1\t%2").arg(type).arg(message));
- 
-     doAppend(line, self);
- }
-@@ -1031,7 +1031,7 @@ void IRCView::appendBacklogMessage(const TQString& firstColumn,const TQString& r
-         line = "<p><font color=\"" + backlogColor + "\">%1 %2 %3</font></p>\n";
-     }
- 
--    line = line.tqarg(time, nick, filter(message, backlogColor, NULL, false, false));
-+    line = line.arg(time, nick, filter(message, backlogColor, NULL, false, false));
- 
-     doAppend(line);
- }
-@@ -1251,7 +1251,7 @@ void IRCView::contentsMouseMoveEvent(TQMouseEvent* ev)
-         if (m_server && m_urlToDrag.startsWith("##"))
-         {
-             //FIXME consistent IRC URL serialization
--            ux = TQString("irc://%1:%2/%3").tqarg(m_server->getServerName()).tqarg(m_server->getPort()).tqarg(m_urlToDrag.mid(2));
-+            ux = TQString("irc://%1:%2/%3").arg(m_server->getServerName()).arg(m_server->getPort()).arg(m_urlToDrag.mid(2));
-         }
-         else if (m_urlToDrag.startsWith("#"))
-         {
-@@ -1545,7 +1545,7 @@ void IRCView::searchAgain()
- 
-         if(!find(m_pattern, m_caseSensitive, m_wholeWords, m_forward, &m_findParagraph, &m_findIndex))
-         {
--            KMessageBox::information(this,i18n("No matches found for \"%1\".").tqarg(m_pattern),i18n("Information"));
-+            KMessageBox::information(this,i18n("No matches found for \"%1\".").arg(m_pattern),i18n("Information"));
-         }
- 
-     }
-@@ -1705,14 +1705,14 @@ TQString IRCView::timeStamp()
- 
-         if(!Preferences::showDate())
-         {
--            timeString = TQString("<font color=\"" + timeColor + "\">[%1]</font> ").tqarg(time.toString(timeFormat));
-+            timeString = TQString("<font color=\"" + timeColor + "\">[%1]</font> ").arg(time.toString(timeFormat));
-         }
-         else
-         {
-             TQDate date = TQDate::currentDate();
-             timeString = TQString("<font color=\"" +
-                 timeColor + "\">[%1 %2]</font> ")
--                    .tqarg(KGlobal::locale()->formatDate(date, true /*short format*/),
-+                    .arg(KGlobal::locale()->formatDate(date, true /*short format*/),
-                          time.toString(timeFormat));
-         }
- 
-diff --git a/konversation/src/joinchanneldialog.cpp b/konversation/src/joinchanneldialog.cpp
-index 63ad6c3..d50eb8c 100644
---- a/konversation/src/joinchanneldialog.cpp
-+++ b/konversation/src/joinchanneldialog.cpp
-@@ -26,7 +26,7 @@ namespace Konversation
- {
- 
-     JoinChannelDialog::JoinChannelDialog(Server* server, TQWidget *parent, const char *name)
--        : KDialogBase(parent, name, true, i18n("Join Channel on %1").tqarg(server->getDisplayName()), Ok|Cancel, Ok)
-+        : KDialogBase(parent, name, true, i18n("Join Channel on %1").arg(server->getDisplayName()), Ok|Cancel, Ok)
-     {
-         m_server = server;
-         m_widget = new JoinChannelUI(this);
-diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp
-index b6e4b2a..e0054af 100644
---- a/konversation/src/konvdcop.cpp
-+++ b/konversation/src/konvdcop.cpp
-@@ -128,13 +128,13 @@ void KonvDCOP::info(const TQString& string)
- void KonvDCOP::debug(const TQString& string)
- {
-     kdDebug() << "KonvDCOP::debug()" << endl;
--    emit dcopInfo(TQString("Debug: %1").tqarg(string));
-+    emit dcopInfo(TQString("Debug: %1").arg(string));
- }
- 
- void KonvDCOP::error(const TQString& string)
- {
-     kdDebug() << "KonvDCOP::error()" << endl;
--    emit dcopInfo(TQString("Error: %1").tqarg(string));
-+    emit dcopInfo(TQString("Error: %1").arg(string));
- }
- 
- void KonvDCOP::insertMarkerLine()
-@@ -153,7 +153,7 @@ TQString KonvDCOP::getNickname(const TQString& serverName)
- 
-     if (!server)
-     {
--        error( i18n( "getNickname: Server %1 is not found." ).tqarg( serverName ) );
-+        error( i18n( "getNickname: Server %1 is not found." ).arg( serverName ) );
-         return TQString();
-     }
- 
-diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
-index 083a1ee..c1a489f 100644
---- a/konversation/src/konversationapplication.cpp
-+++ b/konversation/src/konversationapplication.cpp
-@@ -446,9 +446,9 @@ void KonversationApplication::readOptions()
-     TQStringList buttonList(Preferences::quickButtonList());
-     // Read all quick buttons
-     int index=0;
--    while(config->hasKey(TQString("Button%1").tqarg(index)))
-+    while(config->hasKey(TQString("Button%1").arg(index)))
-     {
--      buttonList.append(config->readEntry(TQString("Button%1").tqarg(index++)));
-+      buttonList.append(config->readEntry(TQString("Button%1").arg(index++)));
-     } // while
-     // Put back the changed button list
-     Preferences::setQuickButtonList(buttonList);
-@@ -462,10 +462,10 @@ void KonversationApplication::readOptions()
-     TQStringList autoreplaceList(Preferences::autoreplaceList());
-     // Read all entries
-     index=0;
--    while(config->hasKey(TQString("Autoreplace%1").tqarg(index)))
-+    while(config->hasKey(TQString("Autoreplace%1").arg(index)))
-     {
-       // read entry and get length of the string
--      TQString entry=config->readEntry(TQString("Autoreplace%1").tqarg(index++));
-+      TQString entry=config->readEntry(TQString("Autoreplace%1").arg(index++));
-       unsigned int length=entry.length()-1;
-       // if there's a "#" in the end, strip it (used to preserve blanks at the end of the replacement text)
-       // there should always be one, but older versions did not do it, so we check first
-@@ -494,9 +494,9 @@ void KonversationApplication::readOptions()
-     {
-         int i = 0;
- 
--        while(config->hasGroup(TQString("Highlight%1").tqarg(i)))
-+        while(config->hasGroup(TQString("Highlight%1").arg(i)))
-         {
--            config->setGroup(TQString("Highlight%1").tqarg(i));
-+            config->setGroup(TQString("Highlight%1").arg(i));
-             Preferences::addHighlight(config->readEntry("Pattern"),
-                 config->readBoolEntry("RegExp"),
-                 config->readColorEntry("Color"),
-@@ -512,9 +512,9 @@ void KonversationApplication::readOptions()
-     if(config->hasKey("Ignore0")) Preferences::clearIgnoreList();
-     // Read all ignores
-     index=0;
--    while(config->hasKey(TQString("Ignore%1").tqarg(index)))
-+    while(config->hasKey(TQString("Ignore%1").arg(index)))
-     {
--        Preferences::addIgnore(config->readEntry(TQString("Ignore%1").tqarg(index++)));
-+        Preferences::addIgnore(config->readEntry(TQString("Ignore%1").arg(index++)));
-     }
- 
-     // Aliases
-@@ -563,7 +563,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
-     for(IdentityList::ConstIterator it = identityList.begin(); it != identityList.end(); ++it)
-     {
-         IdentityPtr identity = (*it);
--        config->setGroup(TQString("Identity %1").tqarg(index));
-+        config->setGroup(TQString("Identity %1").arg(index));
- 
-         config->writeEntry("Name",identity->getName());
-         config->writeEntry("Ident",identity->getIdent());
-@@ -643,7 +643,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
- 
-         for(it2 = serverlist.begin(); it2 != serverlist.end(); ++it2)
-         {
--            groupName = TQString("Server %1").tqarg(index2);
-+            groupName = TQString("Server %1").arg(index2);
-             servers.append(groupName);
-             config->setGroup(groupName);
-             config->writeEntry("Server", (*it2).host());
-@@ -658,7 +658,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
- 
-         for(it3 = channelList.begin(); it3 != channelList.end(); ++it3)
-         {
--            groupName = TQString("Channel %1").tqarg(index3);
-+            groupName = TQString("Channel %1").arg(index3);
-             channels.append(groupName);
-             config->setGroup(groupName);
-             config->writeEntry("Name", (*it3).name());
-@@ -671,7 +671,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
- 
-         for(it3 = channelList.begin(); it3 != channelList.end(); ++it3)
-         {
--            groupName = TQString("Channel %1").tqarg(index3);
-+            groupName = TQString("Channel %1").arg(index3);
-             channelHistory.append(groupName);
-             config->setGroup(groupName);
-             config->writeEntry("Name", (*it3).name());
-@@ -680,7 +680,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
-             index3++;
-         }
- 
--        config->setGroup(TQString("ServerGroup %1").tqarg(TQString::number(index).rightJustify(width,'0')));
-+        config->setGroup(TQString("ServerGroup %1").arg(TQString::number(index).rightJustify(width,'0')));
-         config->writeEntry("Name", (*it)->name());
-         config->writeEntry("Identity", (*it)->identity()->getName());
-         config->writeEntry("ServerList", servers);
-@@ -704,7 +704,7 @@ void KonversationApplication::saveOptions(bool updateGUI)
-     index=0;
-     while(item)
-     {
--        config->writeEntry(TQString("Ignore%1").tqarg(index),TQString("%1,%2").tqarg(item->getName()).tqarg(item->getFlags()));
-+        config->writeEntry(TQString("Ignore%1").arg(index),TQString("%1,%2").arg(item->getName()).arg(item->getFlags()));
-         item=ignoreList.next();
-         index++;
-     }
-@@ -861,7 +861,7 @@ TQString KonversationApplication::doAutoreplace(const TQString& text,bool output
-                         // replace %0 - %9 in regex groups
-                         for(unsigned int capture=0;capture<captures.count();capture++)
-                         {
--                            replacement.replace(TQString("%%1").tqarg(capture),captures[capture]);
-+                            replacement.replace(TQString("%%1").arg(capture),captures[capture]);
-                         }
-                         replacement.replace(TQRegExp("%[0-9]"),TQString());
-                         // replace input with replacement
-diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
-index 7ca3837..b42a742 100644
---- a/konversation/src/konversationmainwindow.cpp
-+++ b/konversation/src/konversationmainwindow.cpp
-@@ -246,8 +246,8 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window",
- 
-     for (uint i = 1; i <= 10; ++i)
-     {
--        KAction* tabSelectionAction = new KAction(i18n("Go to Tab %1").tqarg(i), 0, KShortcut(TQString("Alt+%1").tqarg(i%10)),
--            tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").tqarg(i).local8Bit());
-+        KAction* tabSelectionAction = new KAction(i18n("Go to Tab %1").arg(i), 0, KShortcut(TQString("Alt+%1").arg(i%10)),
-+            tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
-         tabSelectionMapper->setMapping( tabSelectionAction, i-1);
-     }
- 
-@@ -487,7 +487,7 @@ void KonversationMainWindow::toggleMenubar(bool dontShowWarning)
-         {
-             TQString accel = hideMenuBarAction->shortcut().toString();
-             KMessageBox::information(this,
--                i18n("<qt>This will hide the menu bar completely. You can show it again by typing %1.</qt>").tqarg(accel),
-+                i18n("<qt>This will hide the menu bar completely. You can show it again by typing %1.</qt>").arg(accel),
-                 "Hide menu bar","HideMenuBarWarning");
-         }
-         menuBar()->hide();
-diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp
-index bd8e61e..bdfc9ca 100644
---- a/konversation/src/konversationstatusbar.cpp
-+++ b/konversation/src/konversationstatusbar.cpp
-@@ -148,9 +148,9 @@ void KonversationStatusBar::updateLagLabel(Server* lagServer, int msec)
-         if (msec == -1)
-             lagString += i18n("Lag: Unknown");
-         else if (msec < 1000)
--            lagString += i18n("Lag: %1 ms").tqarg(msec);
-+            lagString += i18n("Lag: %1 ms").arg(msec);
-         else
--            lagString += i18n("Lag: %1 s").tqarg(msec / 1000);
-+            lagString += i18n("Lag: %1 s").arg(msec / 1000);
- 
-         m_lagLabel->setText(lagString);
- 
-@@ -179,8 +179,8 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec)
-             const TQString hoursString = i18n("1 hour", "%n hours", (hours % 24));
-             const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60));
-             const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60));
--            lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").tqarg(lagServer->getServerName())
--                .tqarg(daysString).tqarg(hoursString).tqarg(minutesString).tqarg(secondsString);
-+            lagString = i18n("%1 = name of server, %2 = (x days), %3 = (x hours), %4 = (x minutes), %5 = (x seconds)", "No answer from server %1 for more than %2, %3, %4, and %5.").arg(lagServer->getServerName())
-+                .arg(daysString).arg(hoursString).arg(minutesString).arg(secondsString);
-             // or longer than an hour
-         }
-         else if (hours)
-@@ -188,21 +188,21 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec)
-             const TQString hoursString = i18n("1 hour", "%n hours", hours);
-             const TQString minutesString = i18n("1 minute", "%n minutes", (minutes % 60));
-             const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60));
--            lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").tqarg(lagServer->getServerName())
--                .tqarg(hoursString).tqarg(minutesString).tqarg(secondsString);
-+            lagString = i18n("%1 = name of server, %2 = (x hours), %3 = (x minutes), %4 = (x seconds)", "No answer from server %1 for more than %2, %3, and %4.").arg(lagServer->getServerName())
-+                .arg(hoursString).arg(minutesString).arg(secondsString);
-             // or longer than a minute
-         }
-         else if (minutes)
-         {
-             const TQString minutesString = i18n("1 minute", "%n minutes", minutes);
-             const TQString secondsString = i18n("1 second", "%n seconds", (seconds % 60));
--            lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").tqarg(lagServer->getServerName())
--                .tqarg(minutesString).tqarg(secondsString);
-+            lagString = i18n("%1 = name of server, %2 = (x minutes), %3 = (x seconds)", "No answer from server %1 for more than %2 and %3.").arg(lagServer->getServerName())
-+                .arg(minutesString).arg(secondsString);
-             // or just some seconds
-         }
-         else
-         {
--            lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).tqarg(lagServer->getServerName());
-+            lagString = i18n("No answer from server %1 for more than 1 second.", "No answer from server %1 for more than %n seconds.", seconds).arg(lagServer->getServerName());
-         }
- 
-         setMainLabelText(lagString);
-@@ -211,7 +211,7 @@ void KonversationStatusBar::setTooLongLag(Server* lagServer, int msec)
-     if (lagServer==m_window->getViewContainer()->getFrontServer())
-     {
-         TQString lagString = lagServer->getServerName() + " - ";
--        lagString.append(i18n("Lag: %1 s").tqarg(msec/1000));
-+        lagString.append(i18n("Lag: %1 s").arg(msec/1000));
- 
-         if (m_lagLabel->isHidden()) m_lagLabel->show();
-         m_lagLabel->setText(lagString);
-diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp
-index 7d09c49..1b8f4cb 100644
---- a/konversation/src/linkaddressbook/addressbook.cpp
-+++ b/konversation/src/linkaddressbook/addressbook.cpp
-@@ -226,7 +226,7 @@ namespace Konversation
-         {
-             TQString user = addressee.fullEmail();
-             if(!user.isEmpty()) user = " (" + user + ')';
--            focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").tqarg(user));
-+            focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but the requested user%1 is not online.").arg(user));
-             return;
-         }
- 
-@@ -286,7 +286,7 @@ void Addressbook::sendFile(const TQString &uid, const KURL &sourceURL, const TQS
-     {
-         TQString user = addressee.fullEmail();
-         if(!user.isEmpty()) user = " (" + user + ')';
--        focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").tqarg(user));
-+        focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation to send a file to a contact, but the requested user%1 is not currently online.").arg(user));
-         return;
-     }
-     nickInfo->getServer()->addDccSend(nickInfo->getNickname(), sourceURL, altFileName, fileSize);
-diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
-index 91cdba2..48f6973 100644
---- a/konversation/src/linkaddressbook/addressbook_base.cpp
-+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
-@@ -463,9 +463,9 @@ namespace Konversation
-                 else
-                 {
-                     if(nicksWithoutAddressee.count() > 1)
--                        message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").tqarg(nicksWithoutAddressee.join(", "));
-+                        message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts. ").arg(nicksWithoutAddressee.join(", "));
-                     else
--                        message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").tqarg(nicksWithoutAddressee.join(", "));
-+                        message = i18n("One of the contacts (%1) that you have selected is not associated with an addressbook contact. ").arg(nicksWithoutAddressee.join(", "));
-                 }
-                 message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook.");
-             }
-@@ -481,15 +481,15 @@ namespace Konversation
-                 else
-                 {
-                     if(nicksWithoutEmails.count() > 1)
--                        message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", "));
-+                        message = i18n("Some of the contacts (%1) that you have selected do not have an email address associated with them. ").arg(nicksWithoutEmails.join(", "));
-                     else
--                        message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").tqarg(nicksWithoutEmails.join(", "));
-+                        message = i18n("One of the contacts (%1) that you have selected does not have an email address associated with them. ").arg(nicksWithoutEmails.join(", "));
-                 }
-                 message += i18n("You can right click on a contact, and choose to edit the addressbook contact, adding an email for them.");
-             }
-             else
-             {
--                message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them.  ").tqarg(nicksWithoutAddressee.join(", ").tqarg(nicksWithoutEmails.join(", ")));
-+                message = i18n("Some of the contacts (%1) that you have selected are not associated with addressbook contacts, and some of the contacts (%2) do not have an email address associated with them.  ").arg(nicksWithoutAddressee.join(", ").arg(nicksWithoutEmails.join(", ")));
-                 message += i18n("You can right click on a contact, and choose to edit the Addressbook Associations to link them to a contact in your addressbook, and choose to edit the addressbook contact, adding an email for them.");
-             }
-             if(nicksWithEmails.isEmpty())
-diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
-index 6968f4d..e6fe29e 100644
---- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
-+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
-@@ -115,13 +115,13 @@ void LinkAddressbookUI::slotLoadAddressees()
-     /*AddresseeItem *item =*/ new AddresseeItem( m_mainWidget->addresseeListView, (*it));
- 
-     if(num_contacts_with_nick == 0)
--        m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").tqarg(m_ircnick));
-+        m_mainWidget->lblHeader->setText(i18n("Choose the person who '%1' is.").arg(m_ircnick));
-     else if(num_contacts_with_nick == 1 && realname.isEmpty())
--        m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").tqarg(m_ircnick));
-+        m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with a contact.").arg(m_ircnick));
-     else if(num_contacts_with_nick == 1 && !realname.isEmpty())
--        m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").tqarg(m_ircnick).tqarg(realname));
-+        m_mainWidget->lblHeader->setText(i18n("Currently '%1' is associated with contact '%2'.").arg(m_ircnick).arg(realname));
-     else
--        m_mainWidget->lblHeader->setText(i18n("<qt><b>Warning:</b> '%1' is currently being listed as belonging to multiple contacts.  Please select the correct contact.</qt>").tqarg(m_ircnick));
-+        m_mainWidget->lblHeader->setText(i18n("<qt><b>Warning:</b> '%1' is currently being listed as belonging to multiple contacts.  Please select the correct contact.</qt>").arg(m_ircnick));
- 
- }
- 
-diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
-index 74ea0e8..5e14f64 100644
---- a/konversation/src/logfilereader.cpp
-+++ b/konversation/src/logfilereader.cpp
-@@ -111,8 +111,8 @@ void LogfileReader::updateView()
-         stream.setEncoding(TQTextStream::UnicodeUTF8);
- 
-         // Set file pointer to <pos> bytes from the end
--        if(stream.tqdevice()->size()>pos)
--            stream.tqdevice()->at(stream.tqdevice()->size()-pos);
-+        if(stream.device()->size()>pos)
-+            stream.device()->at(stream.device()->size()-pos);
-         // Skip first line, since it may be incomplete
-         stream.readLine();
-         TQString str;
-diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
-index 3226d2e..640003a 100644
---- a/konversation/src/nick.cpp
-+++ b/konversation/src/nick.cpp
-@@ -124,7 +124,7 @@ void Nick::refresh()
-     }
- 
-     setText(2, calculateLabel2());
--    tqrepaint();
-+    repaint();
- 
-     if(m_flags != flags)
-     {
-diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
-index 1dd88f2..47a79e8 100644
---- a/konversation/src/nicksonline.cpp
-+++ b/konversation/src/nicksonline.cpp
-@@ -249,12 +249,12 @@ bool& needWhois)
-             niInfo += " (" + nickInfo->getRealName() + ')';
-         if (!nickInfo->getNetServer().isEmpty())
-         {
--            niInfo += i18n( " online via %1" ).tqarg( nickInfo->getNetServer() );
-+            niInfo += i18n( " online via %1" ).arg( nickInfo->getNetServer() );
-             if (!nickInfo->getNetServerInfo().isEmpty())
-                 niInfo += " (" + nickInfo->getNetServerInfo() + ')';
-         }
-         if (!nickInfo->getOnlineSince().isNull())
--            niInfo += i18n( " since %1" ).tqarg( nickInfo->getPrettyOnlineSince() );
-+            niInfo += i18n( " since %1" ).arg( nickInfo->getPrettyOnlineSince() );
-     }
-     needWhois = niInfo.isEmpty();
-     if (!info.isEmpty() && !needWhois) info += ' ';
-diff --git a/konversation/src/notificationhandler.cpp b/konversation/src/notificationhandler.cpp
-index ea5c8ef..7b615e0 100644
---- a/konversation/src/notificationhandler.cpp
-+++ b/konversation/src/notificationhandler.cpp
-@@ -50,7 +50,7 @@ namespace Konversation
-         TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message));
-         TQString cutup = addLineBreaks(cleanedMessage);
- 
--        KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<qt>&lt;%1&gt; %2</qt>").tqarg(fromNick).tqarg(cutup));
-+        KNotifyClient::event(m_mainWindow->winId(), "message", TQString("<qt>&lt;%1&gt; %2</qt>").arg(fromNick).arg(cutup));
- 
-         if(!Preferences::trayNotifyOnlyOwnNick())
-         {
-@@ -76,7 +76,7 @@ namespace Konversation
-         TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message));
-         TQString cutup = addLineBreaks(cleanedMessage);
- 
--        KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<qt>&lt;%1&gt; %2</qt>").tqarg(fromNick).tqarg(cutup));
-+        KNotifyClient::event(m_mainWindow->winId(), "nick", TQString("<qt>&lt;%1&gt; %2</qt>").arg(fromNick).arg(cutup));
- 
-         startTrayNotification(chatWin);
- 
-@@ -86,7 +86,7 @@ namespace Konversation
-             (!m_mainWindow->isActiveWindow() ||
-             (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
-         {
--            konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(cleanedMessage));
-+            konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(cleanedMessage));
-         }
-     }
- 
-@@ -102,7 +102,7 @@ namespace Konversation
-         TQString cleanedMessage = TQStyleSheet::escape(Konversation::removeIrcMarkup(message));
-         TQString cutup = addLineBreaks(cleanedMessage);
- 
--        KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<qt>&lt;%1&gt; %2</qt>").tqarg(fromNick).tqarg(cutup));
-+        KNotifyClient::event(m_mainWindow->winId(), "queryMessage", TQString("<qt>&lt;%1&gt; %2</qt>").arg(fromNick).arg(cutup));
- 
-         startTrayNotification(chatWin);
- 
-@@ -111,7 +111,7 @@ namespace Konversation
-         if(Preferences::oSDShowQuery() && (!m_mainWindow->isActiveWindow() ||
-            (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
-         {
--            konvApp->osd->showOSD(i18n("[Query] <%1> %2").tqarg(fromNick).tqarg(cleanedMessage));
-+            konvApp->osd->showOSD(i18n("[Query] <%1> %2").arg(fromNick).arg(cleanedMessage));
-         }
-     }
- 
-@@ -135,14 +135,14 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").tqarg(nick, chatWin->getName()));
-+        KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").arg(nick, chatWin->getName()));
- 
-         // OnScreen Message
-         if(Preferences::oSDShowChannelEvent() &&
-             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
-         {
-             KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
--            konvApp->osd->showOSD(i18n("%1 joined %2").tqarg(nick, chatWin->getName()));
-+            konvApp->osd->showOSD(i18n("%1 joined %2").arg(nick, chatWin->getName()));
-         }
-     }
- 
-@@ -154,14 +154,14 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").tqarg(nick, chatWin->getName()));
-+        KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").arg(nick, chatWin->getName()));
- 
-         // OnScreen Message
-         if(Preferences::oSDShowChannelEvent() &&
-             (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView())))
-         {
-             KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
--            konvApp->osd->showOSD(i18n("%1 parted %2").tqarg(nick, chatWin->getName()));
-+            konvApp->osd->showOSD(i18n("%1 parted %2").arg(nick, chatWin->getName()));
-         }
-     }
- 
-@@ -173,7 +173,7 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").tqarg(nick, chatWin->getServer()->getServerName()));
-+        KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").arg(nick, chatWin->getServer()->getServerName()));
-     }
- 
-     void NotificationHandler::nickChange(ChatWindow* chatWin, const TQString& oldNick, const TQString& newNick)
-@@ -184,7 +184,7 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").tqarg(oldNick, newNick));
-+        KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").arg(oldNick, newNick));
-     }
- 
-     void NotificationHandler::dccIncoming(ChatWindow* chatWin, const TQString& fromNick)
-@@ -195,7 +195,7 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").tqarg(fromNick));
-+        KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").arg(fromNick));
-     }
- 
-     void NotificationHandler::mode(ChatWindow* chatWin, const TQString& /*nick*/)
-@@ -220,7 +220,7 @@ namespace Konversation
-         startTrayNotification(chatWin);
- 
-         KNotifyClient::event(m_mainWindow->winId(), "query",
--            i18n("%1 has started a conversation (query) with you.").tqarg(fromNick));
-+            i18n("%1 has started a conversation (query) with you.").arg(fromNick));
-     }
- 
-     void NotificationHandler::nickOnline(ChatWindow* chatWin, const TQString& nick)
-@@ -232,7 +232,7 @@ namespace Konversation
-             return;
- 
-         KNotifyClient::event(m_mainWindow->winId(), "notify",
--            i18n("%1 is online (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName()));
-+            i18n("%1 is online (%2).").arg(nick).arg(chatWin->getServer()->getServerName()));
-     }
- 
-     void NotificationHandler::nickOffline(ChatWindow* chatWin, const TQString& nick)
-@@ -244,7 +244,7 @@ namespace Konversation
-             return;
- 
-         KNotifyClient::event(m_mainWindow->winId(), "notify",
--            i18n("%1 went offline (%2).").tqarg(nick).tqarg(chatWin->getServer()->getServerName()));
-+            i18n("%1 went offline (%2).").arg(nick).arg(chatWin->getServer()->getServerName()));
-     }
- 
-     void NotificationHandler::kick(ChatWindow* chatWin, const TQString& channel,const TQString& nick)
-@@ -256,7 +256,7 @@ namespace Konversation
-             return;
- 
-         KNotifyClient::event(m_mainWindow->winId(), "kick",
--            i18n("You are kicked by %1 from %2").tqarg(nick).tqarg(channel));
-+            i18n("You are kicked by %1 from %2").arg(nick).arg(channel));
-     }
- 
-     void NotificationHandler::dccChat(ChatWindow* chatWin, const TQString& nick)
-@@ -268,7 +268,7 @@ namespace Konversation
-             return;
- 
-         KNotifyClient::event(m_mainWindow->winId(), "dccChat",
--            i18n("%1 started a dcc chat with you").tqarg(nick));
-+            i18n("%1 started a dcc chat with you").arg(nick));
-     }
- 
-     void NotificationHandler::highlight(ChatWindow* chatWin, const TQString& fromNick, const TQString& message)
-@@ -288,10 +288,10 @@ namespace Konversation
-             // if there was no nick associated, this must be a command message, so don't try displaying
-             // an empty nick in <>
-             if(fromNick.isEmpty())
--                konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").tqarg(chatWin->getName()).tqarg(message));
-+                konvApp->osd->showOSD(i18n("[HighLight] (%1) *** %2").arg(chatWin->getName()).arg(message));
-             // normal highlight message
-             else
--                konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").tqarg(chatWin->getName()).tqarg(fromNick).tqarg(message));
-+                konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(message));
-         }
-     }
- 
-@@ -301,7 +301,7 @@ namespace Konversation
-             return;
- 
-         KNotifyClient::event(m_mainWindow->winId(), "connectionFailure",
--            i18n("Failed to connect to %1").tqarg(server));
-+            i18n("Failed to connect to %1").arg(server));
-     }
- 
-     void NotificationHandler::channelJoin(ChatWindow* chatWin, const TQString& channel)
-@@ -312,7 +312,7 @@ namespace Konversation
-         if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway())
-             return;
- 
--        KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").tqarg(channel));
-+        KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").arg(channel));
-     }
- 
-     TQString NotificationHandler::addLineBreaks(const TQString& string)
-diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
-index 8bd1745..9935576 100644
---- a/konversation/src/osd.cpp
-+++ b/konversation/src/osd.cpp
-@@ -34,7 +34,7 @@ OSDWidget::OSDWidget( const TQString &appName, TQWidget *parent, const char *nam
- , m_appName( appName )
- , m_duration( 5000 )
- , m_shadow( true )
--, m_tqalignment( Middle )
-+, m_alignment( Middle )
- , m_screen( 0 )
- , m_y( MARGIN )
- , m_dirty( false )
-@@ -208,7 +208,7 @@ void OSDWidget::setOffset( int /*x*/, int y )
- 
- void OSDWidget::setAlignment( Alignment a )
- {
--    m_tqalignment = a;
-+    m_alignment = a;
-     reposition();
- }
- 
-@@ -277,7 +277,7 @@ void OSDWidget::reposition( TQSize newSize )
- 
-     //TODO m_y is the middle of the OSD, and don't exceed screen margins
- 
--    switch ( m_tqalignment )
-+    switch ( m_alignment )
-     {
-         case Left:
-             break;
-@@ -371,12 +371,12 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
- 
-         if( eGlobalPosX < (hcenter-snapZone) )
-         {
--            m_tqalignment = Left;
-+            m_alignment = Left;
-             destination.rx() = MARGIN;
-         }
-         else if( eGlobalPosX > (hcenter+snapZone) )
-         {
--            m_tqalignment = Right;
-+            m_alignment = Right;
-             destination.rx() = screen.width() - MARGIN - width();
-         }
-         else
-@@ -388,10 +388,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
- 
-             if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) )
-             {
--                m_tqalignment = Center;
-+                m_alignment = Center;
-                 destination.ry() = vcenter - height()/2;
-             }
--            else m_tqalignment = Middle;
-+            else m_alignment = Middle;
-         }
- 
-         destination += screen.topLeft();
-diff --git a/konversation/src/osd.h b/konversation/src/osd.h
-index f71f1d7..9dac20a 100644
---- a/konversation/src/osd.h
-+++ b/konversation/src/osd.h
-@@ -48,7 +48,7 @@ class OSDWidget : public TQWidget
-         void unsetColors();
- 
-         int screen()    { return m_screen; }
--        int tqalignment() { return m_tqalignment; }
-+        int alignment() { return m_alignment; }
-         int y()         { return m_y; }
- 
-     signals:
-@@ -93,7 +93,7 @@ class OSDWidget : public TQWidget
-         TQString     m_currentText;
-         bool        m_shadow;
- 
--        Alignment   m_tqalignment;
-+        Alignment   m_alignment;
-         int         m_screen;
-         uint        m_y;
- 
-diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
-index 7a765ef..61e8115 100644
---- a/konversation/src/osd_preferences.cpp
-+++ b/konversation/src/osd_preferences.cpp
-@@ -143,7 +143,7 @@ void OSD_Config::slotPositionChanged()
- {
-     kcfg_OSDScreen->setCurrentItem(m_pOSDPreview->screen());
- 
--    kcfg_OSDAlignment->setValue( m_pOSDPreview->tqalignment() );
-+    kcfg_OSDAlignment->setValue( m_pOSDPreview->alignment() );
-     kcfg_OSDOffsetX->setValue( m_pOSDPreview->x());
-     kcfg_OSDOffsetY->setValue( m_pOSDPreview->y());
- }
-diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
-index 749e278..46dee2f 100644
---- a/konversation/src/outputfilter.cpp
-+++ b/konversation/src/outputfilter.cpp
-@@ -334,7 +334,7 @@ namespace Konversation
-         else if(parameter == "off")
-             konvApp->showQueueTuner(false);
-         else
--            result = usage(i18n("Usage: %1queuetuner [on | off]").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1queuetuner [on | off]").arg(commandChar));
- 
-         return result;
-     }
-@@ -380,7 +380,7 @@ namespace Konversation
-         if (channelName.isEmpty())
-         {
-             if (destination.isEmpty() || !isAChannel(destination))
--                return usage(i18n("Usage: %1JOIN <channel> [password]").tqarg(commandChar));
-+                return usage(i18n("Usage: %1JOIN <channel> [password]").arg(commandChar));
-             channelName=destination;
-         }
-         else if (!isAChannel(channelName))
-@@ -413,7 +413,7 @@ namespace Konversation
- 
-             if(victim.isEmpty())
-             {
--                result = usage(i18n("Usage: %1KICK <nick> [reason]").tqarg(commandChar));
-+                result = usage(i18n("Usage: %1KICK <nick> [reason]").arg(commandChar));
-             }
-             else
-             {
-@@ -431,7 +431,7 @@ namespace Konversation
-         }
-         else
-         {
--            result = error(i18n("%1KICK only works from within channels.").tqarg(commandChar));
-+            result = error(i18n("%1KICK only works from within channels.").arg(commandChar));
-         }
- 
-         return result;
-@@ -451,7 +451,7 @@ namespace Konversation
-             }
-             else
-             {
--                result = error(i18n("%1PART without parameters only works from within a channel or a query.").tqarg(commandChar));
-+                result = error(i18n("%1PART without parameters only works from within a channel or a query.").arg(commandChar));
-             }
-         }
-         else
-@@ -481,7 +481,7 @@ namespace Konversation
-                 }
-                 else
-                 {
--                    result = error(i18n("%1PART without channel name only works from within a channel.").tqarg(commandChar));
-+                    result = error(i18n("%1PART without channel name only works from within a channel.").arg(commandChar));
-                 }
-             }
-         }
-@@ -503,7 +503,7 @@ namespace Konversation
-             }
-             else
-             {
--                result = error(i18n("%1TOPIC without parameters only works from within a channel.").tqarg(commandChar));
-+                result = error(i18n("%1TOPIC without parameters only works from within a channel.").arg(commandChar));
-             }
-         }
-         else
-@@ -545,7 +545,7 @@ namespace Konversation
-                 }
-                 else
-                 {
--                    result = error(i18n("%1TOPIC without channel name only works from within a channel.").tqarg(commandChar));
-+                    result = error(i18n("%1TOPIC without channel name only works from within a channel.").arg(commandChar));
-                 }
-             }
-         }
-@@ -572,7 +572,7 @@ namespace Konversation
-         result.toServer = "NAMES ";
-         if (parameter.isNull())
-         {
--            return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").tqarg(commandChar));
-+            return error(i18n("%1NAMES with no target may disconnect you from the server. Specify '*' if you really want this.").arg(commandChar));
-         }
-         else if (parameter != TQChar('*'))
-         {
-@@ -593,7 +593,7 @@ namespace Konversation
-         else if (parm.isEmpty()) // this can only mean one thing.. we're in the Server tab
-             m_server->closeYourself(false);
-         else
--            return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").tqarg(commandChar));
-+            return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").arg(commandChar));
-         return OutputFilterResult();
-     }
- 
-@@ -619,13 +619,13 @@ namespace Konversation
- 
-         if(parameter.isEmpty() || message.isEmpty())
-         {
--            result = usage(i18n("Usage: %1NOTICE <recipient> <message>").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1NOTICE <recipient> <message>").arg(commandChar));
-         }
-         else
-         {
-             result.typeString = i18n("Notice");
-             result.toServer = "NOTICE " + recipient + " :" + message;
--            result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").tqarg(recipient).tqarg(message);
-+            result.output=i18n("%1 is the message, %2 the recipient nickname","Sending notice \"%2\" to %1.").arg(recipient).arg(message);
-             result.type = Program;
-         }
- 
-@@ -644,7 +644,7 @@ namespace Konversation
-         }
-         else
-         {
--            result = usage(i18n("Usage: %1ME text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1ME text").arg(commandChar));
-         }
- 
-         return result;
-@@ -681,7 +681,7 @@ namespace Konversation
-         else if (message.startsWith(commandChar+"me"))
-         {
-             result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "ACTION " + message.mid(4) + '\x01';
--            output = TQString("* %1 %2").tqarg(myNick).tqarg(message.mid(4));
-+            output = TQString("* %1 %2").arg(myNick).arg(message.mid(4));
-         }
-         else
-         {
-@@ -763,13 +763,13 @@ namespace Konversation
-         if (request == "PING")
-         {
-             unsigned int time_t = TQDateTime::currentDateTime().toTime_t();
--            result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").tqarg(recipient).tqarg(time_t);
--            result.output = i18n("Sending CTCP-%1 request to %2.").tqarg("PING").tqarg(recipient);
-+            result.toServer = TQString("PRIVMSG %1 :\x01PING %2\x01").arg(recipient).arg(time_t);
-+            result.output = i18n("Sending CTCP-%1 request to %2.").arg("PING").arg(recipient);
-         }
-         else
-         {
-             result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + out + '\x01';
--            result.output = i18n("Sending CTCP-%1 request to %2.").tqarg(out).tqarg(recipient);
-+            result.output = i18n("Sending CTCP-%1 request to %2.").arg(out).arg(recipient);
-         }
- 
-         result.typeString = i18n("CTCP");
-@@ -863,7 +863,7 @@ namespace Konversation
-                 else if(parameterList.count()>2)
-                 {
-                     // TODO: make sure this will work:
--                    //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").tqarg(commandChar);
-+                    //output=i18n("Usage: %1DCC SEND nickname [fi6lename] [filename] ...").arg(commandChar);
-                     KURL fileURL(parameterList[2]);
- 
-                     //We could easily check if the remote file exists, but then we might
-@@ -874,12 +874,12 @@ namespace Konversation
-                     }
-                     else
-                     {
--                        result = error(i18n("File \"%1\" does not exist.").tqarg(parameterList[2]));
-+                        result = error(i18n("File \"%1\" does not exist.").arg(parameterList[2]));
-                     }
-                 }
-                 else                              // Don't know how this should happen, but ...
-                 {
--                    result = usage(i18n("Usage: %1DCC [SEND nickname filename]").tqarg(commandChar));
-+                    result = usage(i18n("Usage: %1DCC [SEND nickname filename]").arg(commandChar));
-                 }
-             }
-             // TODO: DCC Chat etc. comes here
-@@ -891,12 +891,12 @@ namespace Konversation
-                 }
-                 else
-                 {
--                    result = usage(i18n("Usage: %1DCC [CHAT nickname]").tqarg(commandChar));
-+                    result = usage(i18n("Usage: %1DCC [CHAT nickname]").arg(commandChar));
-                 }
-             }
-             else
-             {
--                result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").tqarg(commandChar).tqarg(parameterList[0]));
-+                result = error(i18n("Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE.").arg(commandChar).arg(parameterList[0]));
-             }
-         }
- 
-@@ -993,7 +993,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1INVITE <nick> [channel]").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1INVITE <nick> [channel]").arg(commandChar));
-         }
-         else
-         {
-@@ -1008,7 +1008,7 @@ namespace Konversation
-                 }
-                 else
-                 {
--                    result = error(i18n("%1INVITE without channel name works only from within channels.").tqarg(commandChar));
-+                    result = error(i18n("%1INVITE without channel name works only from within channels.").arg(commandChar));
-                 }
-             }
- 
-@@ -1020,7 +1020,7 @@ namespace Konversation
-                 }
-                 else
-                 {
--                    result = error(i18n("%1 is not a channel.").tqarg(channel));
-+                    result = error(i18n("%1 is not a channel.").arg(channel));
-                 }
-             }
-         }
-@@ -1034,7 +1034,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1EXEC <script> [parameter list]").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1EXEC <script> [parameter list]").arg(commandChar));
-         }
-         else
-         {
-@@ -1067,7 +1067,7 @@ namespace Konversation
-         }
-         else
-         {
--            result = usage(i18n("Usage: %1RAW [OPEN | CLOSE]").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1RAW [OPEN | CLOSE]").arg(commandChar));
-         }
- 
-         return result;
-@@ -1110,7 +1110,7 @@ namespace Konversation
-         if(list.isEmpty())
-             result.output = i18n("Current notify list is empty.");
-         else
--            result.output = i18n("Current notify list: %1").tqarg(list);
-+            result.output = i18n("Current notify list: %1").arg(list);
- 
-         result.type = Program;
-         return result;
-@@ -1191,9 +1191,9 @@ namespace Konversation
-                 {
-                     // destination is no channel => error
-                     if (!kick)
--                        result = error(i18n("%1BAN without channel name works only from inside a channel.").tqarg(commandChar));
-+                        result = error(i18n("%1BAN without channel name works only from inside a channel.").arg(commandChar));
-                     else
--                        result = error(i18n("%1KICKBAN without channel name works only from inside a channel.").tqarg(commandChar));
-+                        result = error(i18n("%1KICKBAN without channel name works only from inside a channel.").arg(commandChar));
- 
-                     // no usage information after error
-                     showUsage = false;
-@@ -1226,9 +1226,9 @@ namespace Konversation
-         if (showUsage)
-         {
-             if (!kick)
--                result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask>").tqarg(commandChar));
-+                result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask>").arg(commandChar));
-             else
--                result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask> [reason]").tqarg(commandChar));
-+                result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask> [reason]").arg(commandChar));
-         }
- 
-         return result;
-@@ -1268,7 +1268,7 @@ namespace Konversation
-             else
-             {
-                 // destination is no channel => error
--                result = error(i18n("%1UNBAN without channel name works only from inside a channel.").tqarg(commandChar));
-+                result = error(i18n("%1UNBAN without channel name works only from inside a channel.").arg(commandChar));
-                 // no usage information after error
-                 showUsage = false;
-             }
-@@ -1283,7 +1283,7 @@ namespace Konversation
- 
-         if(showUsage)
-         {
--            result = usage(i18n("Usage: %1UNBAN [channel] pattern").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1UNBAN [channel] pattern").arg(commandChar));
-         }
- 
-         return result;
-@@ -1331,7 +1331,7 @@ namespace Konversation
-                     Preferences::addIgnore(parameterList[index] + ',' + TQString::number(value));
-                 }
- 
--                result.output = i18n("Added %1 to your ignore list.").tqarg(parameterList.join(", "));
-+                result.output = i18n("Added %1 to your ignore list.").arg(parameterList.join(", "));
-                 result.typeString = i18n("Ignore");
-                 result.type = Program;
- 
-@@ -1342,7 +1342,7 @@ namespace Konversation
- 
-         if(showUsage)
-         {
--            result = usage(i18n("Usage: %1IGNORE [ -ALL ] <user 1> <user 2> ... <user n>").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1IGNORE [ -ALL ] <user 1> <user 2> ... <user n>").arg(commandChar));
-         }
- 
-         return result;
-@@ -1354,7 +1354,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1UNIGNORE <user 1> <user 2> ... <user n>").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1UNIGNORE <user 1> <user 2> ... <user n>").arg(commandChar));
-         }
-         else
-         {
-@@ -1404,19 +1404,19 @@ namespace Konversation
-             // Print all successful unignores, in case there were any
-             if (succeeded.count()>=1)
-             {
--                m_server->appendMessageToFrontmost(i18n("Ignore"),i18n("Removed %1 from your ignore list.").tqarg(succeeded.join(", ")));
-+                m_server->appendMessageToFrontmost(i18n("Ignore"),i18n("Removed %1 from your ignore list.").arg(succeeded.join(", ")));
-             }
- 
-             // One failed unignore
-             if (failed.count()==1)
-             {
--                m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignore: %1").tqarg(failed.join(", ")));
-+                m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignore: %1").arg(failed.join(", ")));
-             }
- 
-             // Multiple failed unignores
-             if (failed.count()>1)
-             {
--                m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignores: %1").tqarg(failed.join(", ")));
-+                m_server->appendMessageToFrontmost(i18n("Error"),i18n("No such ignores: %1").arg(failed.join(", ")));
-             }
-         }
- 
-@@ -1429,7 +1429,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1TQUOTE command list").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar));
-         }
-         else
-         {
-@@ -1445,7 +1445,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1SAY text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1SAY text").arg(commandChar));
-         }
-         else
-         {
-@@ -1507,7 +1507,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1AME text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1AME text").arg(commandChar));
-         }
- 
-         emit multiServerCommand("me", parameter);
-@@ -1520,7 +1520,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1AMSG text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1AMSG text").arg(commandChar));
-         }
- 
-         emit multiServerCommand("msg", parameter);
-@@ -1562,7 +1562,7 @@ namespace Konversation
-         }
-         else
-         {
--            result = usage(i18n("Usage: %1OMSG text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1OMSG text").arg(commandChar));
-         }
- 
-         return result;
-@@ -1577,11 +1577,11 @@ namespace Konversation
-             result.toServer = "NOTICE @"+destination+" :"+parameter;
-             result.typeString = i18n("Notice");
-             result.type = Program;
--            result.output = i18n("Sending notice \"%1\" to %2.").tqarg(parameter, destination);
-+            result.output = i18n("Sending notice \"%1\" to %2.").arg(parameter, destination);
-         }
-         else
-         {
--            result = usage(i18n("Usage: %1ONOTICE text").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1ONOTICE text").arg(commandChar));
-         }
- 
-         return result;
-@@ -1594,7 +1594,7 @@ namespace Konversation
-         if (charset.isEmpty ())
-         {
-             result = info (i18n("Current encoding is: %1")
--                    .tqarg(m_server->getIdentity()->getCodec()->name()));
-+                    .arg(m_server->getIdentity()->getCodec()->name()));
-             return result;
-         }
- 
-@@ -1604,7 +1604,7 @@ namespace Konversation
-         {
-             m_server->getIdentity()->setCodecName(shortName);
-             emit encodingChanged();
--            result = info (i18n("Switched to %1 encoding.").tqarg(shortName));
-+            result = info (i18n("Switched to %1 encoding.").arg(shortName));
-         }
-         else
-         {
-@@ -1620,7 +1620,7 @@ namespace Konversation
-         TQStringList parms = TQStringList::split(" ", parameter);
- 
-         if (parms.count() == (0 >> parms.count() > 2))
--            return usage(i18n("Usage: %1setkey [<nick|channel>] <key> sets the encryption key for nick or channel. %2setkey <key> when in a channel or query tab to set the key for it.").tqarg(commandChar).tqarg(commandChar) );
-+            return usage(i18n("Usage: %1setkey [<nick|channel>] <key> sets the encryption key for nick or channel. %2setkey <key> when in a channel or query tab to set the key for it.").arg(commandChar).arg(commandChar) );
-         else if (parms.count() == 1)
-             parms.prepend(destination);
- 
-@@ -1631,7 +1631,7 @@ namespace Konversation
-         else if (m_server->getQueryByName(parms[0]))
-             m_server->getQueryByName(parms[0])->setEncryptedOutput(true);
- 
--        return info(i18n("The key for %1 has been set.").tqarg(parms[0]));
-+        return info(i18n("The key for %1 has been set.").arg(parms[0]));
-     }
- 
-     OutputFilterResult OutputFilter::parseDelKey(const TQString& prametr)
-@@ -1639,7 +1639,7 @@ namespace Konversation
-         TQString parameter(prametr.isEmpty()?destination:prametr);
- 
-         if(parameter.isEmpty() || parameter.contains(' '))
--            return usage(i18n("Usage: %1delkey <nick> or <channel> deletes the encryption key for nick or channel").tqarg(commandChar));
-+            return usage(i18n("Usage: %1delkey <nick> or <channel> deletes the encryption key for nick or channel").arg(commandChar));
- 
-         m_server->setKeyForRecipient(parameter, "");
- 
-@@ -1648,7 +1648,7 @@ namespace Konversation
-         else if (m_server->getQueryByName(parameter))
-             m_server->getQueryByName(parameter)->setEncryptedOutput(false);
- 
--        return info(i18n("The key for %1 has been deleted.").tqarg(parameter));
-+        return info(i18n("The key for %1 has been deleted.").arg(parameter));
-     }
- 
-     OutputFilterResult OutputFilter::parseShowKey(const TQString& prametr)
-@@ -1657,9 +1657,9 @@ namespace Konversation
-         TQString key(m_server->getKeyForRecipient(parameter));
-         TQWidget *mw=KonversationApplication::instance()->getMainWindow();
-         if (!key.isEmpty())
--            KMessageBox::information(mw, i18n("The key for %1 is \"%2\".").tqarg(parameter).tqarg(key), i18n("Blowfish"));
-+            KMessageBox::information(mw, i18n("The key for %1 is \"%2\".").arg(parameter).arg(key), i18n("Blowfish"));
-         else
--            KMessageBox::information(mw, i18n("No key has been set for %1.").tqarg(parameter));
-+            KMessageBox::information(mw, i18n("No key has been set for %1.").arg(parameter));
-         OutputFilterResult result;
-         return result;
-     }
-@@ -1679,7 +1679,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1DNS <nick>").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1DNS <nick>").arg(commandChar));
-         }
-         else
-         {
-@@ -1702,12 +1702,12 @@ namespace Konversation
-                 if (KNetwork::KReverseResolver::resolve(socketAddress,resolvedTarget,serv))
-                 {
-                     result.typeString = i18n("DNS");
--                    result.output = i18n("Resolved %1 to: %2").tqarg(target).tqarg(resolvedTarget);
-+                    result.output = i18n("Resolved %1 to: %2").arg(target).arg(resolvedTarget);
-                     result.type = Program;
-                 }
-                 else
-                 {
--                    result = error(i18n("Unable to resolve %1").tqarg(target));
-+                    result = error(i18n("Unable to resolve %1").arg(target));
-                 }
- #else
-                 result = error(i18n("Reverse-resolving requires KDE version 3.5.1 or higher."));
-@@ -1724,12 +1724,12 @@ namespace Konversation
-                 {
-                     TQString resolvedTarget = resolved.first().address().nodeName();
-                     result.typeString = i18n("DNS");
--                    result.output = i18n("Resolved %1 to: %2").tqarg(target).tqarg(resolvedTarget);
-+                    result.output = i18n("Resolved %1 to: %2").arg(target).arg(resolvedTarget);
-                     result.type = Program;
-                 }
-                 else
-                 {
--                    result = error(i18n("Unable to resolve %1").tqarg(target));
-+                    result = error(i18n("Unable to resolve %1").arg(target));
-                 }
-             }
-             // Parameter is either host nor IP, so request a lookup from server, which in
-@@ -1773,7 +1773,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1KILL <nick> [comment]").tqarg(commandChar));
-+            result = usage(i18n("Usage: %1KILL <nick> [comment]").arg(commandChar));
-         }
-         else
-         {
-diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
-index b04c703..685dc8f 100644
---- a/konversation/src/query.cpp
-+++ b/konversation/src/query.cpp
-@@ -385,7 +385,7 @@ void Query::popup(int id)
- 
-         case Konversation::IgnoreNick:
-         {
--            if (KMessageBox::warningContinueCancel(this, i18n("Do you want to ignore %1?").tqarg(name),
-+            if (KMessageBox::warningContinueCancel(this, i18n("Do you want to ignore %1?").arg(name),
-                 i18n("Ignore"), i18n("Ignore"), "IgnoreNick") == KMessageBox::Continue)
-             {
-                 sendQueryText(Preferences::commandChar()+"IGNORE -ALL "+name);
-@@ -405,7 +405,7 @@ void Query::popup(int id)
-         }
-         case Konversation::UnignoreNick:
-         {
--            TQString question = i18n("Do you want to stop ignoring %1?").tqarg(name);
-+            TQString question = i18n("Do you want to stop ignoring %1?").arg(name);
- 
-             if (KMessageBox::warningContinueCancel(this, question, i18n("Unignore"), i18n("Unignore"), "UnignoreNick") ==
-                 KMessageBox::Continue)
-@@ -590,14 +590,14 @@ TQString Query::getChannelEncoding()               // virtual
- 
- TQString Query::getChannelEncodingDefaultDesc()    // virtual
- {
--    return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName());
-+    return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName());
- }
- 
- bool Query::closeYourself(bool confirm)
- {
-     int result = KMessageBox::Continue;
-     if (confirm)
--        result=KMessageBox::warningContinueCancel(this, i18n("Do you want to close your query with %1?").tqarg(getName()), i18n("Close Query"), i18n("Close"), "QuitQueryTab");
-+        result=KMessageBox::warningContinueCancel(this, i18n("Do you want to close your query with %1?").arg(getName()), i18n("Close Query"), i18n("Close"), "QuitQueryTab");
- 
-     if (result == KMessageBox::Continue)
-     {
-@@ -659,14 +659,14 @@ void Query::quitNick(const TQString& reason)
- 
-     if (displayReason.isEmpty())
-     {
--        appendCommandMessage(i18n("Quit"),i18n("%1 has left this server.").tqarg(getName()),false);
-+        appendCommandMessage(i18n("Quit"),i18n("%1 has left this server.").arg(getName()),false);
-     }
-     else
-     {
-         if (displayReason.find(TQRegExp("[\\0000-\\0037]"))!=-1)
-             displayReason+="\017";
- 
--        appendCommandMessage(i18n("Quit"),i18n("%1 has left this server (%2).").tqarg(getName()).tqarg(displayReason),false);
-+        appendCommandMessage(i18n("Quit"),i18n("%1 has left this server (%2).").arg(getName()).arg(displayReason),false);
-     }
- }
- 
-diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
-index 6c84c9d..564e1ee 100644
---- a/konversation/src/quickbuttons_preferences.cpp
-+++ b/konversation/src/quickbuttons_preferences.cpp
-@@ -98,7 +98,7 @@ void QuickButtons_Config::saveSettings()
-     for(unsigned int index=0;index<newList.count();index++)
-     {
-       // write the current button's name and definition
--      config->writeEntry(TQString("Button%1").tqarg(index),newList[index]);
-+      config->writeEntry(TQString("Button%1").arg(index),newList[index]);
-     } // for
-   }
-   // if there were no buttons at all, write a dummy entry to prevent KConfigXT from "optimizing"
-diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
-index f6cf5ad..d65d24f 100644
---- a/konversation/src/server.cpp
-+++ b/konversation/src/server.cpp
-@@ -413,8 +413,8 @@ void Server::connectToIRCServer()
-         // set up the connection details
-         setPrefixes(m_serverNickPrefixModes, m_serverNickPrefixes);
-         getStatusView()->appendServerMessage(i18n("Info"),i18n("Looking for server %1:%2...")
--            .tqarg(getConnectionSettings().server().host())
--            .tqarg(getConnectionSettings().server().port()));
-+            .arg(getConnectionSettings().server().host())
-+            .arg(getConnectionSettings().server().port()));
-         // reset InputFilter (auto request info, /WHO request info)
-         m_inputFilter.reset();
-     }
-@@ -534,8 +534,8 @@ void Server::lookupFinished()
-     {
-         // inform user about the error
-         getStatusView()->appendServerMessage(i18n("Error"),i18n("Server %1 not found: %2")
--            .tqarg(getConnectionSettings().server().host())
--            .tqarg(m_socket->KSocketBase::errorString(m_socket->error())));
-+            .arg(getConnectionSettings().server().host())
-+            .arg(m_socket->KSocketBase::errorString(m_socket->error())));
- 
-         m_socket->resetStatus();
- 
-@@ -607,8 +607,8 @@ void Server::broken(int state)
-         static_cast<KonversationApplication*>(kapp)->notificationHandler()->connectionFailure(getStatusView(), getServerName());
- 
-         TQString error = i18n("Connection to Server %1 lost: %2.")
--            .tqarg(getConnectionSettings().server().host())
--            .tqarg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state));
-+            .arg(getConnectionSettings().server().host())
-+            .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state));
- 
-         getStatusView()->appendServerMessage(i18n("Error"), error);
- 
-@@ -619,9 +619,9 @@ void Server::broken(int state)
- void Server::sslError(const TQString& reason)
- {
-     TQString error = i18n("Could not connect to %1:%2 using SSL encryption.Maybe the server does not support SSL, or perhaps you have the wrong port? %3")
--        .tqarg(getConnectionSettings().server().host())
--        .tqarg(getConnectionSettings().server().port())
--        .tqarg(reason);
-+        .arg(getConnectionSettings().server().host())
-+        .arg(getConnectionSettings().server().port())
-+        .arg(reason);
-     getStatusView()->appendServerMessage(i18n("SSL Connection Error"),error);
- 
-     updateConnectionState(Konversation::SSDeliberatelyDisconnected);
-@@ -707,7 +707,7 @@ void Server::quitServer()
- 
-     m_socket->close();
- 
--    getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").tqarg(getConnectionSettings().server().host()));
-+    getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").arg(getConnectionSettings().server().host()));
- }
- 
- void Server::notifyAction(const TQString& nick)
-@@ -857,7 +857,7 @@ TQString Server::getNextNickname()
- 
-     if (newNick.isNull())
-     {
--        TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").tqarg(getIdentity()->getName()).tqarg(getDisplayName());
-+        TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").arg(getIdentity()->getName()).arg(getDisplayName());
-         newNick = KInputDialog::getText(i18n("Nickname error"), inputText,
-                                         TQString(), 0, getStatusView(), "NickChangeDialog");
-     }
-@@ -908,7 +908,7 @@ void Server::incoming()
-     {
-         getStatusView()->appendServerMessage(i18n("Error"),
-             i18n("There was an error reading the data from the server: %1").
--            tqarg(m_socket->KSocketBase::errorString()));
-+            arg(m_socket->KSocketBase::errorString()));
- 
-         broken(m_socket->error());
-         return;
-@@ -1633,7 +1633,7 @@ void Server::requestDccSend(const TQString &a_recipient)
-             ":lastDccDir",
-             TQString(),
-             getViewContainer()->getWindow(),
--            i18n("Select File(s) to Send to %1").tqarg(recipient)
-+            i18n("Select File(s) to Send to %1").arg(recipient)
-         );
-         KURL::List::iterator it;
-         for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it )
-@@ -1709,7 +1709,7 @@ void Server::addDccGet(const TQString &sourceNick, const TQStringList &dccArgume
- 
-         appendMessageToFrontmost( i18n( "DCC" ),
-                                   i18n( "%1 offers to send you \"%2\" (%3)..." )
--                                  .tqarg( newDcc->getPartnerNick(),
-+                                  .arg( newDcc->getPartnerNick(),
-                                         showfile,
-                                         ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) );
- 
-@@ -1725,7 +1725,7 @@ void Server::openDccChat(const TQString& nickname)
- 
- void Server::requestDccChat(const TQString& partnerNick, const TQString& numericalOwnIp, const TQString& ownPort)
- {
--    queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").tqarg(partnerNick).tqarg(numericalOwnIp).tqarg(ownPort));
-+    queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").arg(partnerNick).arg(numericalOwnIp).arg(ownPort));
- }
- 
- void Server::dccSendRequest(const TQString &partner, const TQString &fileName, const TQString &address, const TQString &port, unsigned long size)
-@@ -1740,7 +1740,7 @@ void Server::dccSendRequest(const TQString &partner, const TQString &fileName, c
- 
-     appendMessageToFrontmost( i18n( "DCC" ),
-                               i18n( "Asking %1 to accept upload of \"%2\" (%3)..." )
--                              .tqarg( partner,
-+                              .arg( partner,
-                                     showfile,
-                                     ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) );
- }
-@@ -1790,7 +1790,7 @@ void Server::startReverseDccSendTransfer(const TQString& sourceNick,const TQStri
-         appendMessageToFrontmost( i18n( "Error" ),
-                                   i18n( "%1 = file name, %2 = nickname",
-                                         "Received invalid passive DCC send acceptance message for \"%1\" from %2." )
--                                  .tqarg( showfile,
-+                                  .arg( showfile,
-                                         sourceNick ) );
- 
-     }
-@@ -1817,7 +1817,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList
-         appendMessageToFrontmost( i18n( "DCC" ),
-                                   i18n( "%1 = file name, %2 = nickname of sender, %3 = percentage of file size, %4 = file size",
-                                         "Resuming download of \"%1\" from %2 starting at %3% of %4..." )
--                                  .tqarg( showfile,
-+                                  .arg( showfile,
-                                         sourceNick,
-                                         TQString::number( dccTransfer->getProgress() ),
-                                         ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) );
-@@ -1827,7 +1827,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList
-         appendMessageToFrontmost( i18n( "Error" ),
-                                   i18n( "%1 = file name, %2 = nickname",
-                                         "Received invalid resume acceptance message for \"%1\" from %2." )
--                                  .tqarg( showfile,
-+                                  .arg( showfile,
-                                         sourceNick ) );
-     }
- }
-@@ -1852,7 +1852,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis
-         appendMessageToFrontmost( i18n( "DCC" ),
-                                   i18n( "%1 = file name, %2 = nickname of recipient, %3 = percentage of file size, %4 = file size",
-                                         "Resuming upload of \"%1\" to %2 starting at %3% of %4...")
--                                  .tqarg( showfile,
-+                                  .arg( showfile,
-                                         sourceNick,
-                                         TQString::number(dccTransfer->getProgress()),
-                                         ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) );
-@@ -1867,7 +1867,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis
-         appendMessageToFrontmost( i18n( "Error" ),
-                                   i18n( "%1 = file name, %2 = nickname",
-                                         "Received invalid resume request for \"%1\" from %2." )
--                                  .tqarg( showfile,
-+                                  .arg( showfile,
-                                         sourceNick ) );
-     }
- }
-@@ -1884,10 +1884,10 @@ void Server::dccGetDone(DccTransfer* item)
- 
-     if(item->getStatus()==DccTransfer::Done)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
--            "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick()));
-+            "Download of \"%1\" from %2 finished.").arg(showfile, item->getPartnerNick()));
-     else if(item->getStatus()==DccTransfer::Failed)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
--            "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile,
-+            "Download of \"%1\" from %2 failed. Reason: %3.").arg(showfile,
-             item->getPartnerNick(), item->getStatusDetail()));
- }
- 
-@@ -1903,10 +1903,10 @@ void Server::dccSendDone(DccTransfer* item)
- 
-     if(item->getStatus()==DccTransfer::Done)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
--            "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick()));
-+            "Upload of \"%1\" to %2 finished.").arg(showfile, item->getPartnerNick()));
-     else if(item->getStatus()==DccTransfer::Failed)
-         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
--            "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(),
-+            "Upload of \"%1\" to %2 failed. Reason: %3.").arg(showfile, item->getPartnerNick(),
-             item->getStatusDetail()));
- }
- 
-@@ -1925,7 +1925,7 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
-         // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message
-         if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() )
-             appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient",
--                "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) );
-+                "Sending \"%1\" to %2...").arg( showfile, item->getPartnerNick() ) );
-     }
-     else  // type == Receive
-     {
-@@ -1933,7 +1933,7 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
-         {
-             appendMessageToFrontmost( i18n( "DCC" ),
-                                         i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...")
--                                        .tqarg( showfile,
-+                                        .arg( showfile,
-                                             ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( item->getFileSize() ),
-                                             item->getPartnerNick() ) );
-         }
-@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN
-         if (plus)
-         {
-             TQDateTime when;
--            addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t()));
-+            addBan(channelName, TQString("%1 %2 %3").arg(parameter).arg(updater).arg(TQDateTime::currentDateTime().toTime_t()));
-         } else {
-             removeBan(channelName, parameter);
-         }
-@@ -2299,7 +2299,7 @@ NickInfoPtr Server::setWatchedNickOnline(const TQString& nickname)
-     if (!addressee.isEmpty()) Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid());
- 
-     appendMessageToFrontmost(i18n("Notify"),"<a href=\"#"+nickname+"\">"+
--        i18n("%1 is online (%2).").tqarg(nickname).tqarg(getServerName())+"</a>", getStatusView());
-+        i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"</a>", getStatusView());
- 
-     static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname);
- 
-@@ -2316,7 +2316,7 @@ void Server::setWatchedNickOffline(const TQString& nickname, const NickInfoPtr n
- 
-     emit watchedNickChanged(this, nickname, false);
- 
--    appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").tqarg(nickname).tqarg(getServerName()), getStatusView());
-+    appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()), getStatusView());
- 
-     static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname);
- 
-@@ -2727,7 +2727,7 @@ void Server::appendCommandMessageToChannel(const TQString& channel,const TQStrin
-     }
-     else
-     {
--        appendStatusMessage(command, TQString("%1 %2").tqarg(channel).tqarg(message));
-+        appendStatusMessage(command, TQString("%1 %2").arg(channel).arg(message));
-     }
- }
- 
-@@ -2895,7 +2895,7 @@ void Server::invitation(const TQString& nick,const TQString& channel)
- {
-     if(KMessageBox::questionYesNo(getViewContainer()->getWindow(),
-         i18n("You were invited by %1 to join channel %2. "
--        "Do you accept the invitation?").tqarg(nick).tqarg(channel),
-+        "Do you accept the invitation?").arg(nick).arg(channel),
-         i18n("Invitation"),
-         i18n("Join"),
-         i18n("Ignore"),
-@@ -2907,12 +2907,12 @@ void Server::invitation(const TQString& nick,const TQString& channel)
- 
- void Server::scriptNotFound(const TQString& name)
- {
--    appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").tqarg(name));
-+    appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").arg(name));
- }
- 
- void Server::scriptExecutionError(const TQString& name)
- {
--    appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").tqarg(name));
-+    appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").arg(name));
- }
- 
- bool Server::isAChannel(const TQString &channel) const
-diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
-index e8b739b..38ad8f4 100644
---- a/konversation/src/serverlistdialog.cpp
-+++ b/konversation/src/serverlistdialog.cpp
-@@ -287,12 +287,12 @@ namespace Konversation
- 
-                 if (parent && parent->childCount() == 1)
-                 {
--                    KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").tqarg(item->name()).tqarg(parent->name()));
-+                    KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").arg(item->name()).arg(parent->name()));
-                     return;
-                 }
-                 else if (parent && parent->childCount() == parent->selectedChildrenCount())
-                 {
--                    KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").tqarg(parent->name()));
-+                    KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").arg(parent->name()));
-                     return;
-                 }
-             }
-@@ -309,7 +309,7 @@ namespace Konversation
-         if (selectedItems.count()>1)
-             question = i18n("Do you really want to delete the selected entries?");
-         else
--            question = i18n("Do you really want to delete %1?").tqarg(item->name());
-+            question = i18n("Do you really want to delete %1?").arg(item->name());
- 
-         if (KMessageBox::warningContinueCancel(this,question) == KMessageBox::Cancel)
-         {
-@@ -483,7 +483,7 @@ namespace Konversation
-         }
- 
-         m_serverList->setUpdatesEnabled(true);
--        m_serverList->tqrepaint();
-+        m_serverList->repaint();
-     }
- 
-     TQListViewItem* ServerListDialog::insertServerGroup(ServerGroupSettingsPtr serverGroup)
-diff --git a/konversation/src/sslsocket.cpp b/konversation/src/sslsocket.cpp
-index de6c4c4..1f0e4b3 100644
---- a/konversation/src/sslsocket.cpp
-+++ b/konversation/src/sslsocket.cpp
-@@ -91,7 +91,7 @@ const TQString SSLSocket::details()
- {
-     int strength = d->kssl->connectionInfo().getCipherUsedBits();
- 
--    TQString details = i18n("Connection is secured with %1 bit SSL.").tqarg(strength);
-+    TQString details = i18n("Connection is secured with %1 bit SSL.").arg(strength);
- 
-     return details;
- }
-@@ -228,7 +228,7 @@ int SSLSocket::verifyCertificate()
-                     "does not match the one the "
-                     "certificate was issued to.");
-                 result = KMessageBox::warningYesNoCancel( m_serverParent,
--                    msg.tqarg(hostname),
-+                    msg.arg(hostname),
-                     i18n("Server Authentication"),
-                     KGuiItem(i18n("Details")),
-                     KGuiItem(i18n("Continue")),
-@@ -265,7 +265,7 @@ int SSLSocket::verifyCertificate()
-                             "does not match the one the "
-                             "certificate was issued to.");
-                         result = KMessageBox::warningYesNoCancel( m_serverParent,
--                            msg.tqarg(hostname),
-+                            msg.arg(hostname),
-                             i18n("Server Authentication"),
-                             KGuiItem(i18n("Details")),
-                             KGuiItem(i18n("Continue")),
-@@ -277,7 +277,7 @@ int SSLSocket::verifyCertificate()
-                         TQString msg = i18n("The server (%1) certificate failed the "
-                             "authenticity test.");
-                         result = KMessageBox::warningYesNoCancel( m_serverParent,
--                            msg.tqarg(hostname),
-+                            msg.arg(hostname),
-                             i18n("Server Authentication"),
-                             KGuiItem(i18n("Details")),
-                             KGuiItem(i18n("Continue")),
-diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp
-index e2ff9f1..9915731 100644
---- a/konversation/src/statuspanel.cpp
-+++ b/konversation/src/statuspanel.cpp
-@@ -270,14 +270,14 @@ bool StatusPanel::closeYourself(bool confirm)
-     // that due to string freeze at the moment.
-     if (confirm && !m_server->isConnected())
-     {
--        result = KMessageBox::warningContinueCancel(this, i18n("Do you really want to close '%1'?\n\n All associated tabs will be closed as well.").tqarg(getName()),
-+        result = KMessageBox::warningContinueCancel(this, i18n("Do you really want to close '%1'?\n\n All associated tabs will be closed as well.").arg(getName()),
-             i18n("Close Tab"), i18n("Close"), "QuitServerTab");
-     }
-     else
-     {
-         result = KMessageBox::warningContinueCancel(
-             this,
--            i18n("Do you want to disconnect from '%1'?\n\n All associated tabs will be closed as well.").tqarg(m_server->getServerName()),
-+            i18n("Do you want to disconnect from '%1'?\n\n All associated tabs will be closed as well.").arg(m_server->getServerName()),
-             i18n("Disconnect From Server"),
-             i18n("Disconnect"),
-             "QuitServerTab");
-@@ -347,7 +347,7 @@ TQString StatusPanel::getChannelEncoding()         // virtual
-                                                   // virtual
- TQString StatusPanel::getChannelEncodingDefaultDesc()
- {
--    return i18n("Identity Default ( %1 )").tqarg(getServer()->getIdentity()->getCodecName());
-+    return i18n("Identity Default ( %1 )").arg(getServer()->getIdentity()->getCodecName());
- }
- 
- //Used to disable functions when not connected
-diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
-index ba5c246..1b052fd 100644
---- a/konversation/src/theme_preferences.cpp
-+++ b/konversation/src/theme_preferences.cpp
-@@ -245,7 +245,7 @@ void Theme_Config::removeTheme()
-     dir = m_dirs[iconThemeIndex->currentItem()];
- 
-     int remove = KMessageBox::warningContinueCancel(0L,
--        i18n("Do you want to remove %1 ?").tqarg(themeName),
-+        i18n("Do you want to remove %1 ?").arg(themeName),
-         i18n("Remove Theme"),
-         KStdGuiItem::del(),
-         "warningRemoveTheme"
-diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
-index 44c01e8..90c3a2b 100644
---- a/konversation/src/theme_preferencesui.ui
-+++ b/konversation/src/theme_preferencesui.ui
-@@ -103,7 +103,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -117,7 +117,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -131,7 +131,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -145,7 +145,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -159,7 +159,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -173,7 +173,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-@@ -187,7 +187,7 @@
-                     <property name="text">
-                         <string></string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignCenter</set>
-                     </property>
-                     <property name="toolTip" stdset="0">
-diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
-index 0fdbe18..c618026 100644
---- a/konversation/src/topiclabel.cpp
-+++ b/konversation/src/topiclabel.cpp
-@@ -114,8 +114,8 @@ namespace Konversation
-             removeSelection();
-             KURL ux = KURL::fromPathOrURL(urlToDrag);
-             //FIXME consistent IRC URL serialization
--            if (urlToDrag.startsWith("##")) ux=TQString("irc://%1:%2/%3").tqarg(m_server->getServerName()).
--                    tqarg(m_server->getPort()).tqarg(urlToDrag.mid(2));
-+            if (urlToDrag.startsWith("##")) ux=TQString("irc://%1:%2/%3").arg(m_server->getServerName()).
-+                    arg(m_server->getPort()).arg(urlToDrag.mid(2));
-             KURLDrag* u=new KURLDrag(ux,viewport());
-             u->drag();
-         }
-@@ -377,7 +377,7 @@ namespace Konversation
- 
-             m_channelPopup->changeTitle(m_channelPopupId,prettyId);
-             m_isOnChannel = true;
--            emit setStatusBarTempText(i18n("Join the channel %1").tqarg(m_currentChannel));
-+            emit setStatusBarTempText(i18n("Join the channel %1").arg(m_currentChannel));
-         }
-     }
- }
-diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
-index 04d6635..7b92a86 100644
---- a/konversation/src/viewcontainer.cpp
-+++ b/konversation/src/viewcontainer.cpp
-@@ -542,7 +542,7 @@ void ViewContainer::updateViewActions(int index)
-                     name = name.replace('&', "&&");
-                     channelListAction->setEnabled(true);
-                     channelListAction->setChecked(m_frontServer->getChannelListPanel());
--                    channelListAction->setText(i18n("Channel &List for %1").tqarg(name));
-+                    channelListAction->setText(i18n("Channel &List for %1").arg(name));
-                 }
-                 else
-                 {
-@@ -562,7 +562,7 @@ void ViewContainer::updateViewActions(int index)
-                 {
-                     TQString name = view->getName();
-                     name = name.replace('&', "&&");
--                    action->setText(i18n("&Open Logfile for %1").tqarg(name));
-+                    action->setText(i18n("&Open Logfile for %1").arg(name));
-                 }
-             }
- 
-@@ -573,7 +573,7 @@ void ViewContainer::updateViewActions(int index)
-             if (action && view->getType() == ChatWindow::Channel)
-             {
-                 action->setEnabled(true);
--                action->setText(i18n("&Channel Settings for %1...").tqarg(view->getName()));
-+                action->setText(i18n("&Channel Settings for %1...").arg(view->getName()));
-             }
-             else if (action)
-             {
-@@ -1631,7 +1631,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view)
- 
-                 if(m_frontServer)
-                 {
--                    codecAction->changeItem(0, i18n("Default encoding", "Default ( %1 )").tqarg(m_frontServer->getIdentity()->getCodecName()));
-+                    codecAction->changeItem(0, i18n("Default encoding", "Default ( %1 )").arg(m_frontServer->getIdentity()->getCodecName()));
-                 }
- 
-                 if(encoding.isEmpty())
-@@ -1969,7 +1969,7 @@ void ViewContainer::openLogFile(const TQString& caption, const TQString& file)
-     if (!file.isEmpty())
-     {
-         LogfileReader* logReader = new LogfileReader(m_tabWidget, file);
--        addView(logReader, i18n("Logfile of %1").tqarg(caption));
-+        addView(logReader, i18n("Logfile of %1").arg(caption));
-         logReader->setServer(0);
-     }
- }
-diff --git a/konversation/src/viewtreeitem.cpp b/konversation/src/viewtreeitem.cpp
-index f831fbb..2839366 100644
---- a/konversation/src/viewtreeitem.cpp
-+++ b/konversation/src/viewtreeitem.cpp
-@@ -173,7 +173,7 @@ void ViewTreeItem::setColor(TQColor color)
-     {
-         m_color = color;
-         m_customColorSet = true;
--        tqrepaint();
-+        repaint();
-     }
- }
- 
-@@ -201,7 +201,7 @@ void ViewTreeItem::setHighlighted(bool highlight)
-     if (m_isHighlighted != highlight)
-     {
-         m_isHighlighted = highlight;
--        tqrepaint();
-+        repaint();
-     }
- }
- 
diff --git a/redhat/applications/konversation/bp002-c64099e5.diff b/redhat/applications/konversation/bp002-c64099e5.diff
deleted file mode 100644
index 3cdd7d267..000000000
--- a/redhat/applications/konversation/bp002-c64099e5.diff
+++ /dev/null
@@ -1,697 +0,0 @@
-commit c64099e59a4e9ba6bdb8eebecd88e3363aee479b
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497946 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
-index 3783955..10d926a 100644
---- a/konversation/src/alias_preferencesui.ui
-+++ b/konversation/src/alias_preferencesui.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="1" column="0">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-@@ -114,7 +114,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
-             <property name="name">
--                <cstring>tqlayout8</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
-index 769ba9b..494427f 100644
---- a/konversation/src/autoreplace_preferencesui.ui
-+++ b/konversation/src/autoreplace_preferencesui.ui
-@@ -22,7 +22,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -137,7 +137,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="1" column="0">
-             <property name="name">
--                <cstring>tqlayout16</cstring>
-+                <cstring>layout16</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
-index 33bb6ff..529207d 100644
---- a/konversation/src/channeloptionsui.ui
-+++ b/konversation/src/channeloptionsui.ui
-@@ -215,7 +215,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     </widget>
-                     <widget class="TQLayoutWidget">
-                         <property name="name">
--                            <cstring>tqlayout11</cstring>
-+                            <cstring>layout11</cstring>
-                         </property>
-                         <grid>
-                             <property name="name">
-@@ -289,7 +289,7 @@ the Free Software Foundation; either version 2 of the License, or
-                     </widget>
-                     <widget class="TQLayoutWidget">
-                         <property name="name">
--                            <cstring>tqlayout2</cstring>
-+                            <cstring>layout2</cstring>
-                         </property>
-                         <hbox>
-                             <property name="name">
-diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui
-index 909e5b3..b0e9c1e 100644
---- a/konversation/src/colorsappearance_preferences.ui
-+++ b/konversation/src/colorsappearance_preferences.ui
-@@ -726,7 +726,7 @@ the Free Software Foundation; either version 2 of the License, or
-                 </widget>
-                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="12">
-                     <property name="name">
--                        <cstring>tqlayout18</cstring>
-+                        <cstring>layout18</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp
-index 6be72d2..bb5d334 100644
---- a/konversation/src/dccrecipientdialog.cpp
-+++ b/konversation/src/dccrecipientdialog.cpp
-@@ -30,7 +30,7 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis
-     // Create the top level widget
-     TQWidget* page=new TQWidget(this);
-     setMainWidget(page);
--    // Add the tqlayout to the widget
-+    // Add the layout to the widget
-     TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
-     dialogLayout->setSpacing(spacingHint());
-     // Add the nickname list widget
-diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
-index 967b1ae..ea04cf8 100644
---- a/konversation/src/dcctransferdetailedinfopanelui.ui
-+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
-@@ -26,7 +26,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-@@ -115,7 +115,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="6" column="1">
-                     <property name="name">
--                        <cstring>tqlayout6</cstring>
-+                        <cstring>layout6</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -162,7 +162,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout26</cstring>
-+                <cstring>layout26</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -170,7 +170,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout24</cstring>
-+                        <cstring>layout24</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -344,7 +344,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout25</cstring>
-+                        <cstring>layout25</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-diff --git a/konversation/src/editnotifydialog.cpp b/konversation/src/editnotifydialog.cpp
-index 312d69c..8874463 100644
---- a/konversation/src/editnotifydialog.cpp
-+++ b/konversation/src/editnotifydialog.cpp
-@@ -37,8 +37,8 @@ KDialogBase::Ok,true)
-     TQWidget* page=new TQWidget(this);
-     setMainWidget(page);
- 
--    TQHBoxLayout* tqlayout = new TQHBoxLayout(page);
--    tqlayout->setSpacing(spacingHint());
-+    TQHBoxLayout* layout = new TQHBoxLayout(page);
-+    layout->setSpacing(spacingHint());
- 
-     TQLabel* networkNameLabel=new TQLabel(i18n("&Network name:"),page);
-     TQString networkNameWT = i18n(
-@@ -80,10 +80,10 @@ KDialogBase::Ok,true)
-         if(*it == network) m_networkNameCombo->setCurrentItem(m_networkNameCombo->count()-1);
-     }
- 
--    tqlayout->addWidget(networkNameLabel);
--    tqlayout->addWidget(m_networkNameCombo);
--    tqlayout->addWidget(nicknameLabel);
--    tqlayout->addWidget(m_nicknameInput);
-+    layout->addWidget(networkNameLabel);
-+    layout->addWidget(m_networkNameCombo);
-+    layout->addWidget(nicknameLabel);
-+    layout->addWidget(m_nicknameInput);
- 
-     setButtonOK(KGuiItem(i18n("&OK"),"button_ok",i18n("Change notify information")));
-     setButtonCancel(KGuiItem(i18n("&Cancel"),"button_cancel",i18n("Discards all changes made")));
-diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
-index 3b42a4d..df28e7e 100644
---- a/konversation/src/highlight_preferencesui.ui
-+++ b/konversation/src/highlight_preferencesui.ui
-@@ -93,7 +93,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="4" rowspan="5" colspan="1">
-                     <property name="name">
--                        <cstring>tqlayout13</cstring>
-+                        <cstring>layout13</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp
-index 0f9e672..cfa592a 100644
---- a/konversation/src/identitydialog.cpp
-+++ b/konversation/src/identitydialog.cpp
-@@ -90,7 +90,7 @@ namespace Konversation
- 
-         TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget);
-         nicknameGBox->setMargin(marginHint());
--        TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->tqlayout(), 1, 2, spacingHint());
-+        TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->layout(), 1, 2, spacingHint());
- 
-         m_nicknameLBox = new TQListBox(nicknameGBox);
-         TQWhatsThis::add(m_nicknameLBox, i18n("This is your list of nicknames. A nickname is the name that other users will know you by. You may use any name you desire. The first character must be a letter.\n\nSince nicknames must be unique across an entire IRC network, your desired name may be rejected by the server because someone else is already using that nickname. Enter alternate nicknames for yourself. If your first choice is rejected by the server, Konversation will try the alternate nicknames."));
-@@ -126,7 +126,7 @@ namespace Konversation
- 
-         TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Auto Identify"), generalWidget);
-         autoIdentifyGBox->setMargin(marginHint());
--        TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->tqlayout(), 1, 2, spacingHint());
-+        TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->layout(), 1, 2, spacingHint());
- 
-         TQLabel* botLabel=new TQLabel(i18n("Ser&vice:"), autoIdentifyGBox);
-         TQWhatsThis::add(botLabel,i18n("Service name can be <b><i>nickserv</i></b> or a network dependant name like  <b><i>nickserv@services.dal.net</i></b>"));
-@@ -167,7 +167,7 @@ namespace Konversation
-         m_automaticAwayGBox->setCheckable(true);
-         m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal);
-         m_automaticAwayGBox->setMargin(marginHint());
--        TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->tqlayout(), 1, 2, spacingHint());
-+        TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint());
- 
-         TQWhatsThis::add(m_automaticAwayGBox, i18n("If you check this box, Konversation will automatically set all connections using this Identity away when the screensaver starts or after a period of user inactivity configured below."));
- 
-@@ -198,7 +198,7 @@ namespace Konversation
-         m_awayMessageGBox->setCheckable(true);
-         m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal);
-         m_awayMessageGBox->setMargin(marginHint());
--        TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->tqlayout(), 1, 2, spacingHint());
-+        TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint());
- 
-         TQWhatsThis::add(m_awayMessageGBox, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. <b>%s</b> is replaced with <b>msg</b>. Whenever you perform an <b>/away</b> command, the Return message will be displayed in all channels joined with this Identity."));
- 
-diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
-index 88aa423..501fa89 100644
---- a/konversation/src/ignore_preferencesui.ui
-+++ b/konversation/src/ignore_preferencesui.ui
-@@ -145,7 +145,7 @@ the Free Software Foundation; either version 2 of the License, or
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="2" rowspan="3" colspan="1">
-             <property name="name">
--                <cstring>tqlayout20</cstring>
-+                <cstring>layout20</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp
-index 0849cfc..692820c 100644
---- a/konversation/src/irccharsets.cpp
-+++ b/konversation/src/irccharsets.cpp
-@@ -130,7 +130,7 @@ namespace Konversation
- 
-         // setup m_shortNameAliases
-         // use only [a-z0-9] for keys!
--        m_shortNameAliases["tqunicode"] = "utf8";
-+        m_shortNameAliases["unicode"] = "utf8";
-         m_shortNameAliases["latin1"] = "iso-8859-1";
- 
-         // setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
-diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
-index e76b032..7766351 100644
---- a/konversation/src/ircinput.cpp
-+++ b/konversation/src/ircinput.cpp
-@@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection)
- 
- void IRCInput::paste()
- {
--    TQClipboard *cb = KApplication::kApplication()->tqclipboard();
-+    TQClipboard *cb = KApplication::kApplication()->clipboard();
-     setFocus();
- 
-     // Copy text from the clipboard (paste)
-diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
-index 94a10b5..b2711ff 100644
---- a/konversation/src/ircview.cpp
-+++ b/konversation/src/ircview.cpp
-@@ -645,7 +645,7 @@ TQString IRCView::createNickLine(const TQString& nick, bool encapsulateNick, boo
- 
-             for (uint index = 0; index < nick.length(); index++)
-             {
--                nickvalue += nick[index].tqunicode();
-+                nickvalue += nick[index].unicode();
-             }
- 
-             nickColor = Preferences::nickColor((nickvalue % 8)).name();
-@@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce)
-                 break;
-             case CopyUrl:
-             {
--                TQClipboard *cb = KApplication::kApplication()->tqclipboard();
-+                TQClipboard *cb = KApplication::kApplication()->clipboard();
-                 cb->setText(m_urlToCopy,TQClipboard::Selection);
-                 cb->setText(m_urlToCopy,TQClipboard::Clipboard);
-                 break;
-@@ -1621,8 +1621,8 @@ TQPopupMenu* IRCView::getPopup() const
- }
- 
- // for more information about these RTFM
--//    http://www.tqunicode.org/reports/tr9/
--//    http://www.w3.org/TR/tqunicode-xml/
-+//    http://www.unicode.org/reports/tr9/
-+//    http://www.w3.org/TR/unicode-xml/
- TQChar IRCView::LRM = (ushort)0x200e; // Right-to-Left Mark
- TQChar IRCView::RLM = (ushort)0x200f; // Left-to-Right Mark
- TQChar IRCView::LRE = (ushort)0x202a; // Left-to-Right Embedding
-diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h
-index 4795659..8651b19 100644
---- a/konversation/src/konversationapplication.h
-+++ b/konversation/src/konversationapplication.h
-@@ -89,7 +89,7 @@ class KonversationApplication : public KUniqueApplication
-         static KonversationApplication* instance();
- 
-         /** For dcop and addressbook, a user can be specified as user@irc.server.net
--         *  or user\@servergroup or using the tqunicode separator symbol 0xE120 instead
-+         *  or user\@servergroup or using the unicode separator symbol 0xE120 instead
-          *  of the "@".  This function takes a string like the above examples, and
-          *  modifies ircnick and serverOrGroup to contain the split up string.  If
-          *  the string doesn't have an @ or 0xE120, ircnick is set to the
-diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
-index 48f6973..935dcd0 100644
---- a/konversation/src/linkaddressbook/addressbook_base.cpp
-+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
-@@ -194,7 +194,7 @@ namespace Konversation
-             lnick_servergroup = lnick + TQChar(0xE120) + servergroup.lower();
- 
-         //We should now have lnick = ircnick, and versions with servername and servergroup -
--        // like johnflux, johnflux@freenode, or johnflux@irc.kde.org    except with the tqunicode
-+        // like johnflux, johnflux@freenode, or johnflux@irc.kde.org    except with the unicode
-         // separator char 0xe120 instead of the @
- 
-         kdDebug() << "nick" << ircnick<< endl;
-diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-index e67d306..1fa3c3e 100644
---- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
-@@ -125,7 +125,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/konversation/src/multilineedit.cpp b/konversation/src/multilineedit.cpp
-index 3999bbc..b4af548 100644
---- a/konversation/src/multilineedit.cpp
-+++ b/konversation/src/multilineedit.cpp
-@@ -28,7 +28,7 @@ KGuiItem(i18n("Add &Quotation Indicators")))
-     // Create the top level widget
-     TQWidget* page=new TQWidget(this);
-     setMainWidget(page);
--    // Add the tqlayout to the widget
-+    // Add the layout to the widget
-     TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
-     dialogLayout->setSpacing(spacingHint());
-     // add the text editor
-diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
-index 640003a..2f44e4d 100644
---- a/konversation/src/nick.cpp
-+++ b/konversation/src/nick.cpp
-@@ -238,7 +238,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid
- 
-     if(nickInfo->isAway())
-     {
--        cg2.setColor(TQColorGroup::Text, kapp->tqpalette(listView()).disabled().text());
-+        cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text());
-     }
- 
-     KListViewItem::paintCell(p,cg2,column,width,align);
-diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
-index 17765ca..efc218e 100644
---- a/konversation/src/nickinfo.cpp
-+++ b/konversation/src/nickinfo.cpp
-@@ -85,7 +85,7 @@ uint NickInfo::getNickColor()
- 
-         for (uint index = 0; index < m_nickname.length(); index++)
-         {
--            nickvalue += m_nickname[index].tqunicode();
-+            nickvalue += m_nickname[index].unicode();
-         }
- 
-         m_nickColor = (nickvalue % 8) + 1;
-diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui
-index 6bb1c7a..2a974e0 100644
---- a/konversation/src/queuetunerbase.ui
-+++ b/konversation/src/queuetunerbase.ui
-@@ -32,7 +32,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout92</cstring>
-+                <cstring>layout92</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -132,7 +132,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-                     <property name="name">
--                        <cstring>tqlayout164</cstring>
-+                        <cstring>layout164</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -185,7 +185,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout242</cstring>
-+                        <cstring>layout242</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -239,7 +239,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1">
-                     <property name="name">
--                        <cstring>tqlayout236_2_2</cstring>
-+                        <cstring>layout236_2_2</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -314,7 +314,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-                     <property name="name">
--                        <cstring>tqlayout163</cstring>
-+                        <cstring>layout163</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -367,7 +367,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1">
-                     <property name="name">
--                        <cstring>tqlayout236_2</cstring>
-+                        <cstring>layout236_2</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -415,7 +415,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout240</cstring>
-+                        <cstring>layout240</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -496,7 +496,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-                     <property name="name">
--                        <cstring>tqlayout161</cstring>
-+                        <cstring>layout161</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -552,7 +552,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout237</cstring>
-+                        <cstring>layout237</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -606,7 +606,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1">
-                     <property name="name">
--                        <cstring>tqlayout236</cstring>
-+                        <cstring>layout236</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -681,7 +681,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout88</cstring>
-+                        <cstring>layout88</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
-index 4e22b30..c0fd88f 100644
---- a/konversation/src/quickbuttons_preferencesui.ui
-+++ b/konversation/src/quickbuttons_preferencesui.ui
-@@ -63,7 +63,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="1" column="0">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <grid>
-                 <property name="name">
-@@ -161,7 +161,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/konversation/src/quickconnectdialog.cpp b/konversation/src/quickconnectdialog.cpp
-index 671b17a..0d86fcc 100644
---- a/konversation/src/quickconnectdialog.cpp
-+++ b/konversation/src/quickconnectdialog.cpp
-@@ -31,9 +31,9 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
-     TQWidget* page = new TQWidget(this);
-     setMainWidget(page);
- 
--    TQGridLayout* tqlayout = new TQGridLayout(page, 2, 4);
--    tqlayout->setSpacing(spacingHint());
--    tqlayout->setColStretch(1, 10);
-+    TQGridLayout* layout = new TQGridLayout(page, 2, 4);
-+    layout->setSpacing(spacingHint());
-+    layout->setColStretch(1, 10);
- 
-     TQLabel* hostNameLabel = new TQLabel(i18n("&Server host:"), page);
-     TQString hostNameWT = i18n("Enter the host of the network here.");
-@@ -66,17 +66,17 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
-     sslCheckBox = new TQCheckBox(page, "sslCheckBox");
-     sslCheckBox->setText(i18n("&Use SSL"));
- 
--    tqlayout->addWidget(hostNameLabel, 0, 0);
--    tqlayout->addWidget(hostNameInput, 0, 1);
--    tqlayout->addWidget(portLabel, 0, 2);
--    tqlayout->addWidget(portInput, 0, 3);
-+    layout->addWidget(hostNameLabel, 0, 0);
-+    layout->addWidget(hostNameInput, 0, 1);
-+    layout->addWidget(portLabel, 0, 2);
-+    layout->addWidget(portInput, 0, 3);
- 
--    tqlayout->addWidget(nickLabel, 1, 0);
--    tqlayout->addWidget(nickInput, 1, 1);
--    tqlayout->addWidget(passwordLabel, 1, 2);
--    tqlayout->addWidget(passwordInput, 1, 3);
-+    layout->addWidget(nickLabel, 1, 0);
-+    layout->addWidget(nickInput, 1, 1);
-+    layout->addWidget(passwordLabel, 1, 2);
-+    layout->addWidget(passwordInput, 1, 3);
- 
--    tqlayout->addWidget(sslCheckBox, 2, 0);
-+    layout->addWidget(sslCheckBox, 2, 0);
- 
-     hostNameInput->setFocus();
- 
-diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
-index 38ad8f4..cd37cd1 100644
---- a/konversation/src/serverlistdialog.cpp
-+++ b/konversation/src/serverlistdialog.cpp
-@@ -133,14 +133,14 @@ namespace Konversation
-         showAtStartup->setChecked(Preferences::showServerList());
-         connect(showAtStartup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowAtStartup(bool)));
- 
--        TQGridLayout* tqlayout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
--
--        tqlayout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
--        tqlayout->addWidget(m_addButton, 0, 1);
--        tqlayout->addWidget(m_editButton, 1, 1);
--        tqlayout->addWidget(m_delButton, 2, 1);
--        tqlayout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
--        tqlayout->setRowStretch(3, 10);
-+        TQGridLayout* layout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
-+
-+        layout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
-+        layout->addWidget(m_addButton, 0, 1);
-+        layout->addWidget(m_editButton, 1, 1);
-+        layout->addWidget(m_delButton, 2, 1);
-+        layout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
-+        layout->setRowStretch(3, 10);
- 
-         m_serverList->setFocus();
- 
-diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui
-index 73b914c..a039acb 100644
---- a/konversation/src/tabs_preferencesui.ui
-+++ b/konversation/src/tabs_preferencesui.ui
-@@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout2</cstring>
-+                        <cstring>layout2</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
-index 90c3a2b..f804677 100644
---- a/konversation/src/theme_preferencesui.ui
-+++ b/konversation/src/theme_preferencesui.ui
-@@ -29,7 +29,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
-             <property name="name">
--                <cstring>tqlayout17</cstring>
-+                <cstring>layout17</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
-index c618026..5b03382 100644
---- a/konversation/src/topiclabel.cpp
-+++ b/konversation/src/topiclabel.cpp
-@@ -199,7 +199,7 @@ namespace Konversation
-                     break;
-                 case CopyUrl:
-                 {
--                    TQClipboard *cb = KApplication::kApplication()->tqclipboard();
-+                    TQClipboard *cb = KApplication::kApplication()->clipboard();
-                     cb->setText(m_urlToCopy,TQClipboard::Selection);
-                     cb->setText(m_urlToCopy,TQClipboard::Clipboard);
-                     break;
-diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
-index 76ff9e5..0fe0732 100644
---- a/konversation/src/urlcatcher.cpp
-+++ b/konversation/src/urlcatcher.cpp
-@@ -40,7 +40,7 @@
- 
- UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
- {
--    tqlayout()->setAutoAdd(false);
-+    layout()->setAutoAdd(false);
-     setName(i18n("URL Catcher"));
-     setType(ChatWindow::UrlCatcher);
- 
-@@ -96,9 +96,9 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
-     saveListButton->setEnabled(false);
-     clearListButton->setEnabled(false);
- 
--    tqlayout()->add(searchWidget);
--    tqlayout()->add(urlListView);
--    tqlayout()->add(buttonBox);
-+    layout()->add(searchWidget);
-+    layout()->add(urlListView);
-+    layout()->add(buttonBox);
- 
-     urlSelected();
- }
-@@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked()
-     TQListViewItem* item=urlListView->selectedItem();
-     if(item)
-     {
--        TQClipboard *cb=KApplication::kApplication()->tqclipboard();
-+        TQClipboard *cb=KApplication::kApplication()->clipboard();
-         cb->setText(item->text(1),TQClipboard::Selection);
-         cb->setText(item->text(1),TQClipboard::Clipboard);
-     }
-diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
-index 7b92a86..cbb0ba6 100644
---- a/konversation/src/viewcontainer.cpp
-+++ b/konversation/src/viewcontainer.cpp
-@@ -1058,12 +1058,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-             Channel *channel = static_cast<Channel*>(view);
- 
-             if (!channel->joined())
--                textColor = KonversationApplication::instance()->tqpalette(m_viewTree).disabled().text();
-+                textColor = KonversationApplication::instance()->palette(m_viewTree).disabled().text();
-         }
-         else if (view->getType() == ChatWindow::Query)
-         {
-             if (!view->getServer()->isConnected())
--                textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
-+                textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
-         }
- 
-         m_viewTree->setViewColor(view, textColor);
-@@ -1100,12 +1100,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
-             Channel *channel = static_cast<Channel*>(view);
- 
-             if (!channel->joined())
--                textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
-+                textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
-         }
-         else if (view->getType() == ChatWindow::Query)
-         {
-             if (!view->getServer()->isConnected())
--                textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
-+                textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
-         }
- 
-         m_tabWidget->setTabColor(view, textColor);
-diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
-index 6f9860b..9df9782 100644
---- a/konversation/src/watchednicknames_preferencesui.ui
-+++ b/konversation/src/watchednicknames_preferencesui.ui
-@@ -273,7 +273,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="4" rowspan="2" colspan="1">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
diff --git a/redhat/applications/konversation/bp003-440010aa.diff b/redhat/applications/konversation/bp003-440010aa.diff
deleted file mode 100644
index 5d797ddf1..000000000
--- a/redhat/applications/konversation/bp003-440010aa.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 440010aa593e209ce5993a73b1b7cb0a843a2716
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327529820 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/konversation/src/blowfish/b64stuff.cpp b/konversation/src/blowfish/b64stuff.cpp
-index 79d5e64..72f0776 100644
---- a/konversation/src/blowfish/b64stuff.cpp
-+++ b/konversation/src/blowfish/b64stuff.cpp
-@@ -36,10 +36,10 @@
- //---------------------------------------------------------------------------
- 
- //---------------------------------------------------------------------------
--//static char b64table[64] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
-+//static char b64table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- //                           "abcdefghijklmnopqrstuvwxyz"
- //                           "0123456789+/";
--static char b64table[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- 
- /* Accepts a binary buffer with an associated size.
-  * Returns a base64-encoded, NULL-terminated string.
-diff --git a/konversation/src/blowfish/oldblowfish.cpp b/konversation/src/blowfish/oldblowfish.cpp
-index 3eab870..1f274db 100644
---- a/konversation/src/blowfish/oldblowfish.cpp
-+++ b/konversation/src/blowfish/oldblowfish.cpp
-@@ -271,7 +271,7 @@ void oldCBlowFish::Decode (BYTE * pInput, BYTE * pOutput, DWORD lSize)
- #define SALT2  0x23f6b095
- 
- // Convert 64-bit encrypted passphrase to text for userfile
--char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
-+char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- 
- int base64dec(char c)
- {
diff --git a/redhat/applications/konversation/bp004-ca3d6cef.diff b/redhat/applications/konversation/bp004-ca3d6cef.diff
deleted file mode 100644
index f1d200565..000000000
--- a/redhat/applications/konversation/bp004-ca3d6cef.diff
+++ /dev/null
@@ -1,200 +0,0 @@
-commit ca3d6cef5d40d2c9faf1f0279f40b135a444d206
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334302097 -0500
-
-    Fix inadvertent "TQ" changes.
-
-diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
-index c28c844..5534ac8 100644
---- a/konversation/src/config/preferences.cpp
-+++ b/konversation/src/config/preferences.cpp
-@@ -105,7 +105,7 @@ const TQStringList Preferences::defaultQuickButtonList()
-                          << "Kick,/KICK %u%n"
-                          << "Ban,/BAN %u%n"
-                          << "Part,/PART %c Leaving...%n"
--                         << "Quit,/TQUIT Leaving...%n";
-+                         << "Quit,/QUIT Leaving...%n";
- }
- 
- const TQStringList Preferences::quickButtonList()
-diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
-index af7bc97..f4b03a9 100644
---- a/konversation/src/dcctransfer.h
-+++ b/konversation/src/dcctransfer.h
-@@ -92,9 +92,9 @@ class DccTransfer : public TQObject
- 
-         // common settings for DccTransferRecv / DccTransferSend
- 
--        // RETQUIRED
-+        // REQUIRED
-         void setConnectionId( int connectionId );
--        // RETQUIRED
-+        // REQUIRED
-         void setPartnerNick( const TQString& nick );
- 
-     signals:
-diff --git a/konversation/src/dcctransferrecv.h b/konversation/src/dcctransferrecv.h
-index aed4624..92f4201 100644
---- a/konversation/src/dcctransferrecv.h
-+++ b/konversation/src/dcctransferrecv.h
-@@ -50,11 +50,11 @@ class DccTransferRecv : public DccTransfer
-         DccTransferRecv(TQObject* parent);
-         virtual ~DccTransferRecv();
- 
--        // RETQUIRED
-+        // REQUIRED
-         void setPartnerIp( const TQString& ip );
--        // RETQUIRED
-+        // REQUIRED
-         void setPartnerPort( const TQString& port );
--        // RETQUIRED
-+        // REQUIRED
-         void setFileSize( unsigned long fileSize );
-         // OPTIONAL, if not specified, "unnamed_file"
-         // TODO: "$sendername-$receiveddate" is better
-diff --git a/konversation/src/dcctransfersend.h b/konversation/src/dcctransfersend.h
-index 1a3e4ea..e4f50f0 100644
---- a/konversation/src/dcctransfersend.h
-+++ b/konversation/src/dcctransfersend.h
-@@ -39,11 +39,11 @@ class DccTransferSend : public DccTransfer
-         DccTransferSend(TQObject* parent);
-         virtual ~DccTransferSend();
- 
--        // RETQUIRED
-+        // REQUIRED
-         void setFileURL( const KURL& url );
-         // OPTIONAL
-         void setFileName( const TQString& fileName );
--        // RETQUIED
-+        // REQUIRED
-         // FIXME: this setting should be an optional one or be removed: make DccTransferSend itself read the configuration
-         void setOwnIp( const TQString& ownIp );
-         // OPTIONAL
-diff --git a/konversation/src/ircqueue.h b/konversation/src/ircqueue.h
-index b1473d6..ec5d7d2 100644
---- a/konversation/src/ircqueue.h
-+++ b/konversation/src/ircqueue.h
-@@ -10,8 +10,8 @@
- */
- 
- 
--#ifndef IRCTQUEUE_H
--#define IRCTQUEUE_H
-+#ifndef IRCQUEUE_H
-+#define IRCQUEUE_H
- 
- class Server;
- 
-diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
-index 9ec34f6..f691a6d 100644
---- a/konversation/src/outputfilter.cpp
-+++ b/konversation/src/outputfilter.cpp
-@@ -1429,7 +1429,7 @@ namespace Konversation
- 
-         if(parameter.isEmpty())
-         {
--            result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar));
-+            result = usage(i18n("Usage: %1QUOTE command list").arg(commandChar));
-         }
-         else
-         {
-diff --git a/konversation/src/query.h b/konversation/src/query.h
-index 513377e..c390ca7 100644
---- a/konversation/src/query.h
-+++ b/konversation/src/query.h
-@@ -10,8 +10,8 @@
-   Copyright (C) 2005-2008 Eike Hein <hein@kde.org>
- */
- 
--#ifndef TQUERY_H
--#define TQUERY_H
-+#ifndef QUERY_H
-+#define QUERY_H
- 
- #include "chatwindow.h"
- #include "nickinfo.h"
-diff --git a/konversation/src/queuetuner.h b/konversation/src/queuetuner.h
-index c918171..be8fc55 100644
---- a/konversation/src/queuetuner.h
-+++ b/konversation/src/queuetuner.h
-@@ -10,8 +10,8 @@
- */
- 
- 
--#ifndef TQUEUETUNER_H
--#define TQUEUETUNER_H
-+#ifndef QUEUETUNER_H
-+#define QUEUETUNER_H
- 
- #include "queuetunerbase.h"
- 
-diff --git a/konversation/src/quickbutton.h b/konversation/src/quickbutton.h
-index 7bf9cf5..bb850ad 100644
---- a/konversation/src/quickbutton.h
-+++ b/konversation/src/quickbutton.h
-@@ -11,8 +11,8 @@
-   email:     eisfuchs@tigress.com
- */
- 
--#ifndef TQUICKBUTTON_H
--#define TQUICKBUTTON_H
-+#ifndef QUICKBUTTON_H
-+#define QUICKBUTTON_H
- 
- #include <tqpushbutton.h>
- 
-diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
-index ab04a55..8e2293c 100644
---- a/konversation/src/quickbuttons_preferences.h
-+++ b/konversation/src/quickbuttons_preferences.h
-@@ -10,8 +10,8 @@
-   Copyright (C) 2006 John Tapsell <johnflux@gmail.com>
- */
- 
--#ifndef TQUICKBUTTONSCONFIG_H
--#define TQUICKBUTTONSCONFIG_H
-+#ifndef QUICKBUTTONSCONFIG_H
-+#define QUICKBUTTONSCONFIG_H
- 
- #include <tqlistview.h>
- 
-diff --git a/konversation/src/quickconnectdialog.h b/konversation/src/quickconnectdialog.h
-index b41922d..3ba2ba8 100644
---- a/konversation/src/quickconnectdialog.h
-+++ b/konversation/src/quickconnectdialog.h
-@@ -12,8 +12,8 @@
-   email:     mail@tuxipuxi.de
- */
- 
--#ifndef TQUICKCONNECTDIALOG_H
--#define TQUICKCONNECTDIALOG_H
-+#ifndef QUICKCONNECTDIALOG_H
-+#define QUICKCONNECTDIALOG_H
- 
- #include "common.h"
- 
-diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
-index f04e75f..4c1cc6f 100644
---- a/konversation/src/server.cpp
-+++ b/konversation/src/server.cpp
-@@ -692,9 +692,9 @@ void Server::gotOwnResolvedHostByWelcome(KResolverResults res)
- 
- void Server::quitServer()
- {
--    // Make clear this is deliberate even if the TQUIT never actually goes through the queue
-+    // Make clear this is deliberate even if the QUIT never actually goes through the queue
-     // (i.e. this is not redundant with _send_internal()'s updateConnectionState() call for
--    // a TQUIT).
-+    // a QUIT).
-     updateConnectionState(Konversation::SSDeliberatelyDisconnected);
- 
-     TQString command(Preferences::commandChar()+"QUIT");
-@@ -1050,7 +1050,7 @@ int Server::getPreLength(const TQString& command, const TQString& dest)
- }
- 
- //Commands greater than 1 have localizeable text:         0   1    2       3      4    5    6
--static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO TQUIT PRIVMSG NOTICE KICK PART TOPIC");
-+static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO QUIT PRIVMSG NOTICE KICK PART TOPIC");
- 
- int Server::_send_internal(TQString outputLine)
- {
diff --git a/redhat/applications/konversation/konversation-3.5.13.1.spec b/redhat/applications/konversation/konversation-3.5.13.1.spec
deleted file mode 100644
index c6c77edf3..000000000
--- a/redhat/applications/konversation/konversation-3.5.13.1.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-# Default version for this component
-%define kdecomp konversation
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
-Version:	1.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	libxslt-devel
-%if 0%{?suse_version}
-BuildRequires:	docbook-xsl-stylesheets
-%else
-BuildRequires:	docbook-style-xsl
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%else
-BuildRequires:	libXi-devel
-%endif
-
-%description
-Konversation is a client for the Internet Relay Chat (IRC) protocol.
-It is easy to use and well-suited for novice IRC users, but novice
-and experienced users alike will appreciate its many features:
-
- * Standard IRC features
- * Easy to use graphical interface
- * Multiple server and channel tabs in a single window
- * IRC color support
- * Pattern-based message highlighting and OnScreen Display
- * Multiple identities for different servers
- * Multi-language scripting support (with DCOP)
- * Customizable command aliases
- * NickServ-aware log-on (for registered nicknames)
- * Smart logging
- * Traditional or enhanced-shell-style nick completion
- * DCC file transfer with resume support
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/konversation
-%{tde_tdeappdir}/konversation.desktop
-%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl
-%{tde_datadir}/apps/kconf_update/konversation.upd
-%{tde_datadir}/apps/konversation/
-%{tde_datadir}/config.kcfg/konversation.kcfg
-%{tde_datadir}/services/konvirc.protocol
-%{tde_datadir}/services/konvirc6.protocol
-%{tde_tdedocdir}/HTML/*/konversation/
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/char.png
-%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
-%{tde_datadir}/icons/hicolor/*/apps/konversation.png
-%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-3
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
-- Remove additional unneeded tq method conversions [Commit #efdae4e7]
-- Rename obsolete tq methods to standard names [Commit #c64099e5]
-- Fix linear alphabet string errors [Commit #440010aa]
-- Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
-
-* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec
deleted file mode 100644
index 98f1f0472..000000000
--- a/redhat/applications/konversation/konversation-3.5.13.2.spec
+++ /dev/null
@@ -1,174 +0,0 @@
-# Default version for this component
-%define tde_pkg konversation
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
-Version:		1.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	libxslt-devel
-%if 0%{?suse_version}
-BuildRequires:	docbook-xsl-stylesheets
-%else
-BuildRequires:	docbook-style-xsl
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%endif
-%if 0%{?rhel} >= 5|| 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-
-%description
-Konversation is a client for the Internet Relay Chat (IRC) protocol.
-It is easy to use and well-suited for novice IRC users, but novice
-and experienced users alike will appreciate its many features:
-
- * Standard IRC features
- * Easy to use graphical interface
- * Multiple server and channel tabs in a single window
- * IRC color support
- * Pattern-based message highlighting and OnScreen Display
- * Multiple identities for different servers
- * Multi-language scripting support (with DCOP)
- * Customizable command aliases
- * NickServ-aware log-on (for registered nicknames)
- * Smart logging
- * Traditional or enhanced-shell-style nick completion
- * DCC file transfer with resume support
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/konversation
-%{tde_tdeappdir}/konversation.desktop
-%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl
-%{tde_datadir}/apps/kconf_update/konversation.upd
-%{tde_datadir}/apps/konversation/
-%{tde_datadir}/config.kcfg/konversation.kcfg
-%{tde_datadir}/services/konvirc.protocol
-%{tde_datadir}/services/konvirc6.protocol
-%{tde_tdedocdir}/HTML/*/konversation/
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/char.png
-%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
-%{tde_datadir}/icons/hicolor/*/apps/konversation.png
-%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
-
-
-%changelog
diff --git a/redhat/applications/konversation/konversation-3.5.13.spec b/redhat/applications/konversation/konversation-3.5.13.spec
deleted file mode 100644
index 730ed8433..000000000
--- a/redhat/applications/konversation/konversation-3.5.13.spec
+++ /dev/null
@@ -1,196 +0,0 @@
-# Default version for this component
-%define kdecomp konversation
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	user friendly Internet Relay Chat (IRC) client for KDE [Trinity]
-Version:	1.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [konversation] Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
-Patch0:		bp000-01f5ea83.diff
-# [konversation] Remove additional unneeded tq method conversions [Commit #efdae4e7]
-Patch1:		bp001-efdae4e7.diff
-# [konversation] Rename obsolete tq methods to standard names [Commit #c64099e5]
-Patch2:		bp002-c64099e5.diff
-# [konversation] Fix linear alphabet string errors [Commit #440010aa]
-Patch3:		bp003-440010aa.diff
-# [konversation] Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
-Patch4:		96f2a488.diff
-Patch5:		bp004-ca3d6cef.diff
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-BuildRequires: libxslt-devel
-BuildRequires: docbook-style-xsl
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%else
-BuildRequires: libXi-devel
-%endif
-
-%description
-Konversation is a client for the Internet Relay Chat (IRC) protocol.
-It is easy to use and well-suited for novice IRC users, but novice
-and experienced users alike will appreciate its many features:
-
- * Standard IRC features
- * Easy to use graphical interface
- * Multiple server and channel tabs in a single window
- * IRC color support
- * Pattern-based message highlighting and OnScreen Display
- * Multiple identities for different servers
- * Multi-language scripting support (with DCOP)
- * Customizable command aliases
- * NickServ-aware log-on (for registered nicknames)
- * Smart logging
- * Traditional or enhanced-shell-style nick completion
- * DCC file transfer with resume support
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/konversation
-%{tde_tdeappdir}/konversation.desktop
-%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl
-%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl
-%{tde_datadir}/apps/kconf_update/konversation.upd
-%{tde_datadir}/apps/konversation/
-%{tde_datadir}/config.kcfg/konversation.kcfg
-%{tde_datadir}/services/konvirc.protocol
-%{tde_datadir}/services/konvirc6.protocol
-%{tde_tdedocdir}/HTML/*/konversation/
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/char.png
-%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
-%{tde_datadir}/icons/hicolor/*/apps/konversation.png
-%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
-
-
-%Changelog
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
-- Remove additional unneeded tq method conversions [Commit #efdae4e7]
-- Rename obsolete tq methods to standard names [Commit #c64099e5]
-- Fix linear alphabet string errors [Commit #440010aa]
-- Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
-
-* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec
deleted file mode 100644
index 0f1b12ffc..000000000
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%define kdecomp kopete-otr
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Off-The-Record encryption for Kopete [Trinity]
-Version:	0.7
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-# Kopete is provided by kdenetwork
-BuildRequires:	trinity-tdenetwork-devel
-Requires:		trinity-tdenetwork
-BuildRequires:	libotr-devel
-
-%description
-This plugin enables Off-The-Record encryption for the KDE instant
-messenger Kopete. Using this plugin you can encrypt chatsessions to other
-users with IM-Cients supporting the OTR encryption method.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
-
-%find_lang kopete_otr
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-
-%files -f kopete_otr.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_libdir}/libkotr.la
-%{tde_libdir}/libkotr.so.0
-%{tde_libdir}/libkotr.so.0.0.0
-%{tde_tdelibdir}/kcm_kopete_otr.la
-%{tde_tdelibdir}/kcm_kopete_otr.so
-%{tde_tdelibdir}/kopete_otr.la
-%{tde_tdelibdir}/kopete_otr.so
-%{tde_datadir}/apps/kopete_otr
-%{tde_datadir}/config.kcfg/kopete_otr.kcfg
-%{tde_tdedocdir}/HTML/en/kopete_otr/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
-%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
-%{tde_datadir}/services/kopete_otr.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
deleted file mode 100644
index 6b1eee75b..000000000
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-# openSUSE 12.3: do NOT install libotr-devel, use libotr2-devel instead !
-
-# Default version for this component
-%define tde_pkg kopete-otr
-%define tde_version 3.5.13.2
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# Under Mageia 3, we require "libotr3" package
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Off-The-Record encryption for Kopete [Trinity]
-Version:		0.7
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
-
-# Kopete is provided by kdenetwork
-Requires:		trinity-kopete >= %{tde_version}
-%if 0%{?suse_version} >= 1230
-BuildRequires:	libotr2-devel
-%else
-BuildRequires:	libotr-devel
-%endif
-
-%description
-This plugin enables Off-The-Record encryption for the TDE instant
-messenger Kopete. Using this plugin you can encrypt chatsessions to other
-users with IM-Cients supporting the OTR encryption method.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=/usr/include/tqt
-
-%__make %{_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
-
-%find_lang kopete_otr
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-
-%files -f kopete_otr.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_libdir}/libkotr.la
-%{tde_libdir}/libkotr.so.0
-%{tde_libdir}/libkotr.so.0.0.0
-%{tde_tdelibdir}/kcm_kopete_otr.la
-%{tde_tdelibdir}/kcm_kopete_otr.so
-%{tde_tdelibdir}/kopete_otr.la
-%{tde_tdelibdir}/kopete_otr.so
-%{tde_datadir}/apps/kopete_otr
-%{tde_datadir}/config.kcfg/kopete_otr.kcfg
-%{tde_tdedocdir}/HTML/en/kopete_otr/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
-%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
-%{tde_datadir}/services/kopete_otr.desktop
-
-
-%changelog
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec
deleted file mode 100644
index 6ad567900..000000000
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp kopete-otr
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Off-The-Record encryption for Kopete [Trinity]
-Version:	0.7
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-# Kopete is provided by kdenetwork
-BuildRequires:	trinity-tdenetwork-devel
-Requires:		trinity-tdenetwork
-BuildRequires:	libotr-devel
-
-%description
-This plugin enables Off-The-Record encryption for the KDE instant
-messenger Kopete. Using this plugin you can encrypt chatsessions to other
-users with IM-Cients supporting the OTR encryption method.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
-
-%find_lang kopete_otr
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-
-%files -f kopete_otr.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_libdir}/libkotr.la
-%{tde_libdir}/libkotr.so.0
-%{tde_libdir}/libkotr.so.0.0.0
-%{tde_tdelibdir}/kcm_kopete_otr.la
-%{tde_tdelibdir}/kcm_kopete_otr.so
-%{tde_tdelibdir}/kopete_otr.la
-%{tde_tdelibdir}/kopete_otr.so
-%{tde_datadir}/apps/kopete_otr
-%{tde_datadir}/config.kcfg/kopete_otr.kcfg
-%{tde_tdedocdir}/HTML/en/kopete_otr/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
-%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
-%{tde_datadir}/services/kopete_otr.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index fa2f57859..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpicosim/src/cassembler.cpp.ORI	2012-08-05 23:39:09.061007283 +0200
-+++ kpicosim/src/cassembler.cpp	2012-08-05 23:42:53.639017712 +0200
-@@ -575,7 +575,7 @@
- 					for( j = 31 ; j >= 0 ; j-- )
- 		 				fprintf( outfile, "%02X", INITP[ j ][ line ] ) ;
- 			} else if ( strcmp( "name", varname ) == 0 ) {
--				fprintf( outfile, entityName.c_str() ) ;				
-+				fprintf( outfile, "%s", entityName.c_str() ) ;				
- 			} else if ( strcmp( "begin template", varname ) == 0 ) {
- 				copy = true ;
- 			}
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
deleted file mode 100644
index 06140eb27..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	0.6a
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kpicosim is a development environment for the Xilinx 
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec
deleted file mode 100644
index 284de9ad5..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define tde_pkg kpicosim
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:		0.6a
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-kpicosim is a development environment for the Xilinx 
-PicoBlaze-3 soft-core processor for the TDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%changelog
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.spec
deleted file mode 100644
index 3d7b5f8c3..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.spec
+++ /dev/null
@@ -1,131 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	0.6a
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kpicosim] Fix "not a string literal" error
-Patch1:		kpicosim-3.5.13-fix_not_a_string_literal_error.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kpicosim is a development environment for the Xilinx 
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch b/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch
deleted file mode 100644
index 00070dbc7..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpilot/kpilot/pilotDaemon.cc.ORI	2011-11-30 21:55:04.912837969 +0100
-+++ kpilot/kpilot/pilotDaemon.cc	2011-11-30 21:55:11.819786099 +0100
-@@ -313,7 +313,7 @@
- #ifdef DEBUG
- 	DEBUGKPILOT << fname
- 		<< ": The daemon is ready with status "
--		<< statusString() << " (" << (int) fDaemonStatus << ")" << endl;
-+		<< statusString() << " (" << (int) fDaemontqStatus << ")" << endl;
- #endif
- }
- 
diff --git a/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch b/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
deleted file mode 100644
index c655bbeb4..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpilot/lib/Makefile.am.ORI	2012-08-05 23:51:32.492490057 +0200
-+++ kpilot/lib/Makefile.am	2012-08-05 23:51:42.771261684 +0200
-@@ -29,7 +29,7 @@
- 	pilotTodoEntry.cc
- 
- libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
--libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal
-+libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) -lkcal $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KIO)
- 
- kpilotincludedir = $(includedir)/kpilot
- kpilotinclude_HEADERS = \
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.1.spec b/redhat/applications/kpilot/kpilot-3.5.13.1.spec
deleted file mode 100644
index 8a0a7ef69..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.1.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-# Default version for this component
-%define kdecomp kpilot
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	TDE Palm Pilot hot-sync tool
-Version:	0.7
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	pilot-link-devel
-BuildRequires:	trinity-kdepim-devel
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
deleted file mode 100644
index 4bfb1a46e..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define tde_pkg kpilot
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE Palm Pilot hot-sync tool
-Version:		0.7
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	flex-devel
-BuildRequires:	gettext
-BuildRequires:	pilot-link-devel >= 0.12
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their TDE counterparts.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%changelog
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.spec b/redhat/applications/kpilot/kpilot-3.5.13.spec
deleted file mode 100644
index b03a819d3..000000000
--- a/redhat/applications/kpilot/kpilot-3.5.13.spec
+++ /dev/null
@@ -1,185 +0,0 @@
-# Default version for this component
-%define kdecomp kpilot
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	TDE Palm Pilot hot-sync tool
-Version:	0.7
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# Fix FTBFS
-Patch0:		kpilot-3.5.13-ftbfs.patch
-
-# [kpilot] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch1:		kpilot-3.5.13-missing_ldflags.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	pilot-link-devel
-BuildRequires:	trinity-kdepim-devel
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their KDE counterparts.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1 -b .ldflags
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-
-%find_lang %{kdecomp}
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor crystalsvg; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui
-%{tde_datadir}/apps/kconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/kconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
-- Rebuild for Fedora 17
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
deleted file mode 100644
index 7ee0dff8d..000000000
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define kdecomp kpowersave
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Version:	0.7.3
-Release:	3%{?dist}%{?_variant}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec
deleted file mode 100644
index 9abc1468c..000000000
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-# Default version for this component
-%define tde_pkg kpowersave
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Version:		0.7.3
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-Summary:		HAL based power management applet for Trinityfiles or directories.
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	hal-devel
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%changelog
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.spec
deleted file mode 100644
index 61c9fe930..000000000
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp kpowersave
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Version:	0.7.3
-Release:	2%{?dist}%{?_variant}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-	
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-	..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libkdeinit_kpowersave.la
-%{tde_libdir}/libkdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%Changelog
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
-- Add missing /sbin/ldconfig
-- Add missing doc file
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krename/krename-3.5.12.spec b/redhat/applications/krename/krename-3.5.12.spec
deleted file mode 100644
index dce4f5655..000000000
--- a/redhat/applications/krename/krename-3.5.12.spec
+++ /dev/null
@@ -1,105 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-%define version 3.0.14
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A KDE batch file renaming utility. 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-KRename is a powerful batch renamer for KDE 3.x. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_tdedocdir}/HTML/en/*/
-%{tde_datadir}/icons/*/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krename/krename-3.5.13.1.spec b/redhat/applications/krename/krename-3.5.13.1.spec
deleted file mode 100644
index 2a5d281c1..000000000
--- a/redhat/applications/krename/krename-3.5.13.1.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A TDE batch file renaming utility. 
-Version:	3.0.14
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	imlib-devel
-%endif
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-5
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec
deleted file mode 100644
index f5267c587..000000000
--- a/redhat/applications/krename/krename-3.5.13.2.spec
+++ /dev/null
@@ -1,127 +0,0 @@
-# Default version for this component
-%define tde_pkg krename
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		A TDE batch file renaming utility. 
-Version:		3.0.14
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-
-
-%changelog
diff --git a/redhat/applications/krename/krename-3.5.13.spec b/redhat/applications/krename/krename-3.5.13.spec
deleted file mode 100644
index 21d91105f..000000000
--- a/redhat/applications/krename/krename-3.5.13.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp krename
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A TDE batch file renaming utility. 
-Version:	3.0.14
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index cc1e71ff0..000000000
--- a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335632256 -0500
-
-    GCC 4.7 fixes.
-
-diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
-index 94ece59..9356e5c 100644
---- a/krusader/UserAction/tstring.h
-+++ b/krusader/UserAction/tstring.h
-@@ -14,6 +14,9 @@
- #include <tqvaluelist.h>
- #include <utility>
- #include <cassert>
-+
-+using namespace std;
-+
- template <class T>
- class TagString_t
- {
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index 754544dc3..000000000
--- a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- krusader/krusader/main.cpp.ORI	2012-08-06 00:19:36.475622376 +0200
-+++ krusader/krusader/main.cpp	2012-08-06 00:19:48.867387323 +0200
-@@ -199,7 +199,7 @@
-        exit( 0 );
-     TQCString regName = client->registerAs( KApplication::kApplication() ->name(), !singleInstanceMode );
-     if( singleInstanceMode && regName != KApplication::kApplication()->name() ) {
--      fprintf( stderr, i18n( "Application already running!\n" ).ascii() );
-+      fprintf( stderr, "%s", i18n( "Application already running!\n" ).ascii() );
- 
-       DCOPClient::mainClient()->send( KApplication::kApplication() ->name(), "Krusader-Interface",
-                                     "moveToTop()", TQByteArray() );
diff --git a/redhat/applications/krusader/krusader-3.5.13.1.spec b/redhat/applications/krusader/krusader-3.5.13.1.spec
deleted file mode 100644
index 07a376302..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.1.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp krusader
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	twin-panel (commander-style) file manager for KDE (and other desktops)
-Version:	1.90.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebindings-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/kio_krarc.la
-%{tde_tdelibdir}/kio_krarc.so
-%{tde_tdelibdir}/kio_virt.la
-%{tde_tdelibdir}/kio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
-- Rebuild for Fedora 17
-- GCC 4.7 fixes. [Commit #fdf6d340]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
deleted file mode 100644
index eb1f41ffd..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp
-index 25f3a15..ee68521 100644
---- a/krusader/VFS/temp_vfs.cpp
-+++ b/krusader/VFS/temp_vfs.cpp
-@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ):
- }
- 
- temp_vfs::~temp_vfs(){
--	if( vfs_type == "-iso" ){
-+	if( tmpvfs_type == ISO ){
- 		// unmount the ISO image
-     KShellProcess umount;
- 		umount << "umount -f" << tmpDir;
-@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){
- }
- 
- void temp_vfs::handleAceArj(TQString origin, TQString type){
-+    if (type == "-ace") {
-+	tmpvfs_type = ACE;
-+    }
-+    else if (type == "-arj") {
-+	tmpvfs_type = ARJ;
-+    }
-+
- 	// for ace and arj we just unpack to the tmpDir
- 	if( !KRarcHandler::arcHandled(type) ){
-   	if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported");
-@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){
- 	rpm.clearArguments();
- 	rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt";
- 	rpm.start(KProcess::Block);
-+	tmpvfs_type = RPM;
- }
- 
- void temp_vfs::handleIso(TQString origin){
-@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){
- 	KShellProcess mount;
- 	mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir;
- 	mount.start(KProcess::Block);
-+	tmpvfs_type = ISO;
- }
-diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h
-index 3b94248..d35169b 100644
---- a/krusader/VFS/temp_vfs.h
-+++ b/krusader/VFS/temp_vfs.h
-@@ -37,6 +37,8 @@
- 
- class temp_vfs : public normal_vfs  {
- public: 
-+	enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO};
-+
- 	temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable);
- 	~temp_vfs();
- 	TQString vfs_workingDir();
-@@ -50,6 +52,7 @@ protected:
- 	void handleAceArj(TQString origin, TQString type);
- 	void handleRpm(TQString origin);
- 	void handleIso(TQString origin);
-+	TMPVFS_TYPE tmpvfs_type;     //< the tmp vfs type.
-   TQString tmpDir;
- 
- };
diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
deleted file mode 100644
index 615b95ea4..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# Default version for this component
-%define tde_pkg krusader
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		twin-panel (commander-style) file manager for TDE (and other desktops)
-Version:		1.90.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch0:			krusader-3.5.13.2-tmpvfs-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-tdebindings-devel >= %{tde_version}
-
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/kio_krarc.la
-%{tde_tdelibdir}/kio_krarc.so
-%{tde_tdelibdir}/kio_virt.la
-%{tde_tdelibdir}/kio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-
-
-%changelog
diff --git a/redhat/applications/krusader/krusader-3.5.13.spec b/redhat/applications/krusader/krusader-3.5.13.spec
deleted file mode 100644
index db8e3bd3a..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.spec
+++ /dev/null
@@ -1,163 +0,0 @@
-# Default version for this component
-%define kdecomp krusader
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	twin-panel (commander-style) file manager for KDE (and other desktops)
-Version:	1.90.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
-Patch1:		krusader-3.5.13-fix_gcc47_compilation.patch
-# [krusader] Fix "not a string literal" error
-Patch2:		krusader-3.5.13-fix_not_a_string_literal_error.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	trinity-tdebindings-devel
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/kio_krarc.la
-%{tde_tdelibdir}/kio_krarc.so
-%{tde_tdelibdir}/kio_virt.la
-%{tde_tdelibdir}/kio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_tdedocdir}/HTML/en/krusader/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
-- Rebuild for Fedora 17
-- GCC 4.7 fixes. [Commit #fdf6d340]
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec
deleted file mode 100644
index e1874db69..000000000
--- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define tde_pkg ksensors
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:			trinity-ksensors
-Version:		0.7.3
-Release:		%{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist}
-
-Summary:        Trinity Frontend to lm_sensors
-Group:          Applications/System
-License:        GPLv2+
-URL:            http://ksensors.sourceforge.net/
-
-Source0:		%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%else
-BuildRequires:	lm_sensors-devel
-%endif
-
-# Keep archs in sync with lm_sensors
-ExcludeArch:    s390 s390x
-
-%description
-KSensors is a nice lm-sensors frontend for the K Desktop Environment.
-Install the hddtemp package if you wish to monitor hard disk
-temperatures with KSensors.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{tde_pkg}-%{version}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-# Creates autostart shortcut
-%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
-%__ln_s ../applnk/Utilities/ksensors.desktop \
-    $RPM_BUILD_ROOT%{tde_datadir}/autostart
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-for f in locolor hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
-done
-
-%postun
-for f in locolor hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README TODO
-%lang(es) %doc LEEME
-%lang(de) %doc LIESMICH
-%lang(fr) %doc LISEZMOI
-%{tde_bindir}/ksensors
-%{tde_datadir}/applnk/System/ksensors.desktop
-%{tde_datadir}/apps/ksensors/
-%{tde_datadir}/autostart/ksensors.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
-%{tde_datadir}/icons/locolor/*/apps/ksensors.png
-%{tde_datadir}/sounds/ksensors_alert.wav
-%{tde_tdedocdir}/HTML/en/ksensors/
-
-
-%changelog
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec
deleted file mode 100644
index 97dc989ad..000000000
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp ksplash-engine-moodin
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	fading splash screen engine for Trinity
-Version:	0.4.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Heavily customizable engine for various types of themes.
-
-Features:
-* scale cache
-* fading images
-* use current icon set or custom images
-* unlimited Custom text labels
-* set fading delay and length
-* custom image arrangement
-* resolution independent themes
-
-This TDE splash screen engine is based upon Linspire's
-engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
-
-Homepage: http://moodwrod.com
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/ksplashmoodin.la
-%{tde_tdelibdir}/ksplashmoodin.so
-%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
-%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
-%{tde_datadir}/services/ksplashmoodin.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
-- Rebuild for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec
deleted file mode 100644
index a27f7d851..000000000
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define tde_pkg ksplash-engine-moodin
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		fading splash screen engine for Trinity
-Version:		0.4.2
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-Heavily customizable engine for various types of themes.
-
-Features:
-* scale cache
-* fading images
-* use current icon set or custom images
-* unlimited Custom text labels
-* set fading delay and length
-* custom image arrangement
-* resolution independent themes
-
-This TDE splash screen engine is based upon Linspire's
-engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
-
-Homepage: http://moodwrod.com
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/ksplashmoodin.la
-%{tde_tdelibdir}/ksplashmoodin.so
-%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
-%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
-%{tde_datadir}/services/ksplashmoodin.desktop
-
-
-%changelog
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec
deleted file mode 100644
index 0b70d5036..000000000
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp ksplash-engine-moodin
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	fading splash screen engine for Trinity
-Version:	0.4.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Heavily customizable engine for various types of themes.
-
-Features:
-* scale cache
-* fading images
-* use current icon set or custom images
-* unlimited Custom text labels
-* set fading delay and length
-* custom image arrangement
-* resolution independent themes
-
-This TDE splash screen engine is based upon Linspire's
-engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
-
-Homepage: http://moodwrod.com
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/ksplashmoodin.la
-%{tde_tdelibdir}/ksplashmoodin.so
-%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
-%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
-%{tde_datadir}/services/ksplashmoodin.desktop
-
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
-- Rebuild for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec
deleted file mode 100644
index 7a27d58d9..000000000
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# Default version for this component
-%define kdecomp ksquirrel
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Powerful Trinity image viewer
-Version:	0.8.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	trinity-libkipi-devel
-BuildRequires:	trinity-libksquirrel-devel
-#BuildRequires:	libkexif-devel
-
-%description
-KSquirrel is an image viewer for TDE with disk navigator, file tree,
-multiple directory view, thumbnails, extended thumbnails, dynamic
-format support, DCOP interface, KEXIF and KIPI plugins support.
-
-KSquirrel is a fast and convenient image viewer for KDE featuring
-OpenGL and dynamic format support.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{tde_bindir}/ksquirrel
-%{tde_bindir}/ksquirrel-libs-configurator
-%{tde_bindir}/ksquirrel-libs-configurator-real
-%{tde_tdelibdir}/libksquirrelpart.la
-%{tde_tdelibdir}/libksquirrelpart.so
-%{tde_tdeappdir}/ksquirrel.desktop
-%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{tde_datadir}/apps/ksquirrel/
-%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
-%{tde_tdedocdir}/HTML/*/ksquirrel
-%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{tde_datadir}/mimelnk/image/*.desktop
-%{tde_datadir}/services/ksquirrelpart.desktop
-%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{tde_mandir}/man1/ksquirrel.1
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-3
-- Initial release for TDE 3.5.13.1
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
deleted file mode 100644
index d9b8d3d35..000000000
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define tde_pkg ksquirrel
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Powerful Trinity image viewer
-Version:		0.8.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Amusements/Games
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libkipi-devel
-BuildRequires:	trinity-libksquirrel-devel
-#BuildRequires:	libkexif-devel
-
-%description
-KSquirrel is an image viewer for TDE with disk navigator, file tree,
-multiple directory view, thumbnails, extended thumbnails, dynamic
-format support, DCOP interface, KEXIF and KIPI plugins support.
-
-KSquirrel is a fast and convenient image viewer for TDE featuring
-OpenGL and dynamic format support.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{tde_bindir}/ksquirrel
-%{tde_bindir}/ksquirrel-libs-configurator
-%{tde_bindir}/ksquirrel-libs-configurator-real
-%{tde_tdelibdir}/libksquirrelpart.la
-%{tde_tdelibdir}/libksquirrelpart.so
-%{tde_tdeappdir}/ksquirrel.desktop
-%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{tde_datadir}/apps/ksquirrel/
-%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
-%{tde_tdedocdir}/HTML/*/ksquirrel
-%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{tde_datadir}/mimelnk/image/*.desktop
-%{tde_datadir}/services/ksquirrelpart.desktop
-%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{tde_mandir}/man1/ksquirrel.1
-
-%changelog
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec
deleted file mode 100644
index 60d1484dd..000000000
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-# Default version for this component
-%define kdecomp ksquirrel
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Powerful Trinity image viewer
-Version:	0.8.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Amusements/Games
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	trinity-libkipi-devel
-BuildRequires:	trinity-libksquirrel-devel
-#BuildRequires:	libkexif-devel
-
-%description
-KSquirrel is an image viewer for TDE with disk navigator, file tree,
-multiple directory view, thumbnails, extended thumbnails, dynamic
-format support, DCOP interface, KEXIF and KIPI plugins support.
-
-KSquirrel is a fast and convenient image viewer for KDE featuring
-OpenGL and dynamic format support.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{tde_bindir}/ksquirrel
-%{tde_bindir}/ksquirrel-libs-configurator
-%{tde_bindir}/ksquirrel-libs-configurator-real
-%{tde_tdelibdir}/libksquirrelpart.la
-%{tde_tdelibdir}/libksquirrelpart.so
-%{tde_tdeappdir}/ksquirrel.desktop
-%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{tde_datadir}/apps/ksquirrel/
-%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{tde_datadir}/config/magic/x-ras.magic
-%{tde_datadir}/config/magic/x-sun.magic
-%{tde_datadir}/config/magic/x-utah.magic
-%{tde_tdedocdir}/HTML/*/ksquirrel
-%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{tde_datadir}/mimelnk/image/*.desktop
-%{tde_datadir}/services/ksquirrelpart.desktop
-%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{tde_mandir}/man1/ksquirrel.1
-
-%Changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 988dd77ac..4ab420ac3 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -110,8 +110,8 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
 export QTDIR=/usr
-python ./scons.py configure prefix="%{_prefix}"
-python ./scons.py %{?_smp_mflags}
+python2 /usr/bin/scons configure prefix="%{_prefix}"
+python2 /usr/bin/scons %{?_smp_mflags}
 
 
 %install
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch
deleted file mode 100644
index c0bf88288..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- kstreamripper/doc/SConscript.ORI	2012-08-06 10:50:27.856547193 +0200
-+++ kstreamripper/doc/SConscript	2012-08-06 10:50:34.599402333 +0200
-@@ -79,5 +79,5 @@
- 	myenv.KDEinstall( 'KDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' )
- 
- ## Use processfolder for each documentation directory
--processfolder('en/', 'en')
-+processfolder('en/', 'en', 'kstreamripper')
- 
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
deleted file mode 100644
index 5663b1a81..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kstreamripper/src/addnewstreamimpl.h.ORI	2011-11-02 20:40:17.450317896 +0100
-+++ kstreamripper/src/addnewstreamimpl.h	2011-11-02 20:40:25.777317020 +0100
-@@ -22,6 +22,7 @@
- #define ADDNEWSTREAMIMPL_H
- 
- #include "addnewstream.h"
-+#include <tqt.h>
- 
- class AddNewStreamImpl : public AddNewStream
- {
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch
deleted file mode 100644
index dbdaae544..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kstreamripper/src/SConscript.ORI	2012-08-06 10:46:01.509252125 +0200
-+++ kstreamripper/src/SConscript	2012-08-06 10:46:10.021070424 +0200
-@@ -43,7 +43,7 @@
- myenv.KDEaddpaths_includes( ['./', '../'] )
- 
- ## Necessary libraries to link against
--myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui'] )
-+myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui', 'qt-mt'] )
- if env['KDEm2']>3: myenv.KDEaddlibs( ['kdnssd'])
- #############################
- ## Data to install
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec
deleted file mode 100644
index e76091312..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec
+++ /dev/null
@@ -1,129 +0,0 @@
-# Default version for this component
-%define kdecomp kstreamripper
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	TDE frontend for streamripper
-
-Version:	0.3.4
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-Patch0:		kstreamripper-3.5.13-missing_include_tqt.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	scons
-
-
-%description
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-%__sed -i kde.py \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|include/kde|include/tde|g"
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-scons -Q -j4 \
-  qtlibs=${QTLIB:-${QTDIR}/%{_lib}}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kstreamripper
-%{tde_datadir}/applnk/Utilities/kstreamripper.desktop
-%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc
-%{tde_tdedocdir}/HTML/en/kstreamripper/
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.4-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
deleted file mode 100644
index 215f398d3..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
+++ /dev/null
@@ -1,95 +0,0 @@
-# Default version for this component
-%define tde_pkg kstreamripper
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE frontend for streamripper
-
-Version:		0.3.4
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	scons
-
-
-%description
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__sed -i kde.py \
-  -e "s|include/kde|include/tde|g"
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-scons -Q -j4 \
-  qtlibs=${QTLIB:-${QTDIR}/%{_lib}}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kstreamripper
-%{tde_datadir}/applnk/Utilities/kstreamripper.desktop
-%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc
-%{tde_tdedocdir}/HTML/en/kstreamripper/
-
-
-
-%changelog
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec
deleted file mode 100644
index 792fa0495..000000000
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default version for this component
-%define kdecomp kstreamripper
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	TDE frontend for streamripper
-
-Version:	0.3.4
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-Patch0:		kstreamripper-3.5.13-missing_include_tqt.patch
-
-# [kstreamripper] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch1:		kstreamripper-3.5.13-missing_ldflags.patch
-
-# [kstreamripper] Fix directory of HTML documentation
-Patch2:		kstreamripper-3.5.13-fix_doc_directory.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: scons
-
-
-%description
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1 -b .ldflags
-%patch2 -p1 -b .doc
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export CXXFLAGS="-I%{tde_includedir}/tqt"
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kstreamripper
-%{tde_datadir}/applnk/Utilities/kstreamripper.desktop
-%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc
-%{tde_tdedocdir}/HTML/en/kstreamripper/
-
-
-
-%Changelog
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec
deleted file mode 100644
index f2b6ace79..000000000
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp ksystemlog
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	system log viewer tool for Trinity
-Version:	0.3.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://ksystemlog.forum-software.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-ksystemlog is a system log viewer tool for Trinity.
-
-This program is developed for being used by beginner users, which don't know
-how to find information about their Linux system, and how the log files are in
-their computer. But it is also designed for advanced users, who want to
-quickly see problems occuring on their server.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/ksystemlog
-%{tde_datadir}/applnk/Utilities/ksystemlog.desktop
-%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc
-%{tde_datadir}/config.kcfg/ksystemlog.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec
deleted file mode 100644
index 8251cdf6d..000000000
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec
+++ /dev/null
@@ -1,122 +0,0 @@
-# Default version for this component
-%define tde_pkg ksystemlog
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		system log viewer tool for Trinity
-Version:		0.3.2
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/System
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://ksystemlog.forum-software.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-ksystemlog is a system log viewer tool for Trinity.
-
-This program is developed for being used by beginner users, which don't know
-how to find information about their Linux system, and how the log files are in
-their computer. But it is also designed for advanced users, who want to
-quickly see problems occuring on their server.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/ksystemlog
-%{tde_datadir}/applnk/Utilities/ksystemlog.desktop
-%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc
-%{tde_datadir}/config.kcfg/ksystemlog.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
-
-
-%changelog
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec
deleted file mode 100644
index 6b8f7aaeb..000000000
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp ksystemlog
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	system log viewer tool for Trinity
-Version:	0.3.2
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://ksystemlog.forum-software.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-ksystemlog is a system log viewer tool for Trinity.
-
-This program is developed for being used by beginner users, which don't know
-how to find information about their Linux system, and how the log files are in
-their computer. But it is also designed for advanced users, who want to
-quickly see problems occuring on their server.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/ksystemlog
-%{tde_datadir}/applnk/Utilities/ksystemlog.desktop
-%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc
-%{tde_datadir}/config.kcfg/ksystemlog.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
deleted file mode 100644
index c989e6666..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ktechlab/icons/pics/Makefile.am.ORI	2011-11-25 23:54:18.306754485 +0100
-+++ ktechlab/icons/pics/Makefile.am	2011-11-25 23:54:32.547754077 +0100
-@@ -7,8 +7,8 @@
- 		spdt.png spst.png keypad.png opamp.png xnor.png circuit.png flowcode.png \
- 		delay.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
- 		repeat.png while.png for.png assignment.png branch.png delay.png embed.png end.png \
--		for.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
--		repeat.png start.png sub.png subcall.png unary.png while.png item.png ic1.png \
-+		interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
-+		repeat.png start.png sub.png subcall.png unary.png item.png ic1.png \
- 		ic2.png ic3.png voltagesignal.png currentsignal.png clockinput.png cccs.png \
- 		ccvs.png vcvs.png vccs.png mechanics.png buffer.png external_connection.png \
- 		logicprobe.png potentiometer.png resistordip.png bidirled.png project_library.png \
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 5c9ee7e8a..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ktechlab/src/Makefile.am.ORI	2012-08-06 11:04:54.798218350 +0200
-+++ ktechlab/src/Makefile.am	2012-08-06 11:05:01.909069510 +0200
-@@ -19,7 +19,7 @@
- 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
- 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
- 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
--	$(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT)
-+	$(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT)
- 
- # which sources should be compiled for ktechlab
- ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch b/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch
deleted file mode 100644
index fd49dd7bc..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ktechlab-3.5.13.1/src/Makefile.am.ORI	2012-10-04 22:06:34.854692286 +0200
-+++ ktechlab-3.5.13.1/src/Makefile.am	2012-10-04 22:06:44.350472919 +0200
-@@ -19,7 +19,7 @@
- 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
- 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
- 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
--	$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) -lgpsimgui
-+	$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) $(LIB_GPSIM)
- 
- # which sources should be compiled for ktechlab
- ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
deleted file mode 100644
index 91af2d22a..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define kdecomp ktechlab
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	circuit simulator for microcontrollers and electronics [Trinity]
-Version:	0.3
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [ktechlab] Removes harcoded gpsim linking
-Patch1:		ktechlab-3.5.13.1-remove_gpsim_link.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KTechlab is a circuit simulator with a nice, clickable and discoverable
-interface. It supports many discrete components, logic circuits as well
-as PIC programming in its own Basic dialect and some form of assembler. 
-
-Homepage: http://ktechlab.org/
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1 -b .gpsim
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktechlab
-%{tde_bindir}/microbe
-%{tde_datadir}/applnk/Development/ktechlab.desktop
-%{tde_datadir}/apps/katepart/syntax/microbe.xml
-%{tde_datadir}/apps/ktechlab
-%{tde_datadir}/config.kcfg/ktechlab.kcfg
-%{tde_tdedocdir}/HTML/en/ktechlab/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-circuit.desktop
-%{tde_datadir}/mimelnk/application/x-flowcode.desktop
-%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
-%{tde_datadir}/mimelnk/application/x-microbe.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch b/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch
deleted file mode 100644
index cee50ee8f..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-ktechlab-3.5.13.2/microbe/pic14.cpp.ORI	2013-08-17 17:57:55.624307580 +0200
-+++ trinity-ktechlab-3.5.13.2/microbe/pic14.cpp	2013-08-17 17:58:11.174961943 +0200
-@@ -277,7 +277,7 @@
- 
- bool PIC14::isValidInterrupt( const TQString & interruptName ) const
- {
--	if(m_type == "P16F84" || m_type =="P16C84")
-+	if(m_type == P16F84 || m_type == P16C84)
- 	{
- 		return ( interruptName == "change" ||
- 				 interruptName == "timer" ||
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec
deleted file mode 100644
index 9d0799c7f..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# Default version for this component
-%define tde_pkg ktechlab
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		circuit simulator for microcontrollers and electronics [Trinity]
-Version:		0.3
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch0:			ktechlab-3.5.13.2-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-KTechlab is a circuit simulator with a nice, clickable and discoverable
-interface. It supports many discrete components, logic circuits as well
-as PIC programming in its own Basic dialect and some form of assembler. 
-
-Homepage: http://ktechlab.org/
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktechlab
-%{tde_bindir}/microbe
-%{tde_datadir}/applnk/Development/ktechlab.desktop
-%{tde_datadir}/apps/katepart/syntax/microbe.xml
-%{tde_datadir}/apps/ktechlab
-%{tde_datadir}/config.kcfg/ktechlab.kcfg
-%{tde_tdedocdir}/HTML/en/ktechlab/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-circuit.desktop
-%{tde_datadir}/mimelnk/application/x-flowcode.desktop
-%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
-%{tde_datadir}/mimelnk/application/x-microbe.desktop
-
-
-%changelog
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.spec
deleted file mode 100644
index 3f582d2f9..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define kdecomp ktechlab
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	circuit simulator for microcontrollers and electronics [Trinity]
-Version:	0.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [ktechlab] Fix list of icons to install [Bug #990]
-Patch0:		ktechlab-3.5.13-duplicate_icons.patch
-# [ktechlab] Missing LDFLAGS cause FTBFS
-Patch1:		ktechlab-3.5.13-missing_ldflags.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KTechlab is a circuit simulator with a nice, clickable and discoverable
-interface. It supports many discrete components, logic circuits as well
-as PIC programming in its own Basic dialect and some form of assembler. 
-
-Homepage: http://ktechlab.org/
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktechlab
-%{tde_bindir}/microbe
-%{tde_datadir}/applnk/Development/ktechlab.desktop
-%{tde_datadir}/apps/katepart/syntax/microbe.xml
-%{tde_datadir}/apps/ktechlab
-%{tde_datadir}/config.kcfg/ktechlab.kcfg
-%{tde_tdedocdir}/HTML/en/ktechlab/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-circuit.desktop
-%{tde_datadir}/mimelnk/application/x-flowcode.desktop
-%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
-%{tde_datadir}/mimelnk/application/x-microbe.desktop
-
-
-%Changelog
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktorrent/bp000-a90eb215.diff b/redhat/applications/ktorrent/bp000-a90eb215.diff
deleted file mode 100644
index fc8a13236..000000000
--- a/redhat/applications/ktorrent/bp000-a90eb215.diff
+++ /dev/null
@@ -1,3901 +0,0 @@
-commit a90eb215f53c95d81f95b32255098066d90556d9
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253621 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui
-index 3ae532a..6aee5e0 100644
---- a/apps/ktorrent/addpeerwidgetbase.ui
-+++ b/apps/ktorrent/addpeerwidgetbase.ui
-@@ -77,7 +77,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>16</height>
-diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui
-index a144aa6..0b8f00a 100644
---- a/apps/ktorrent/advancedpref.ui
-+++ b/apps/ktorrent/advancedpref.ui
-@@ -108,7 +108,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>148</width>
-                                     <height>20</height>
-@@ -223,7 +223,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>111</width>
-                                     <height>20</height>
-@@ -283,7 +283,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>111</width>
-                                     <height>20</height>
-@@ -405,7 +405,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -459,7 +459,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>41</width>
-                                     <height>20</height>
-@@ -553,7 +553,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>383</width>
-                                     <height>20</height>
-@@ -601,7 +601,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>81</width>
-                                     <height>20</height>
-@@ -622,7 +622,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>30</height>
-diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui
-index 6315cba..47f1f4c 100644
---- a/apps/ktorrent/downloadpref.ui
-+++ b/apps/ktorrent/downloadpref.ui
-@@ -69,7 +69,7 @@
-                                             <property name="sizeType">
-                                                 <enum>Expanding</enum>
-                                             </property>
--                                            <property name="tqsizeHint">
-+                                            <property name="sizeHint">
-                                                 <size>
-                                                     <width>40</width>
-                                                     <height>20</height>
-@@ -246,7 +246,7 @@
-                                             <property name="sizeType">
-                                                 <enum>Expanding</enum>
-                                             </property>
--                                            <property name="tqsizeHint">
-+                                            <property name="sizeHint">
-                                                 <size>
-                                                     <width>10</width>
-                                                     <height>20</height>
-@@ -273,7 +273,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>191</width>
-                                             <height>20</height>
-@@ -290,7 +290,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>207</width>
-                                             <height>20</height>
-@@ -380,7 +380,7 @@
-                                     <property name="sizeType">
-                                         <enum>Expanding</enum>
-                                     </property>
--                                    <property name="tqsizeHint">
-+                                    <property name="sizeHint">
-                                         <size>
-                                             <width>40</width>
-                                             <height>20</height>
-@@ -594,7 +594,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>208</width>
-                                     <height>20</height>
-@@ -611,7 +611,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>208</width>
-                                     <height>20</height>
-@@ -628,7 +628,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>208</width>
-                                     <height>20</height>
-@@ -697,7 +697,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>20</height>
-diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
-index 5f0e33d..98d927a 100644
---- a/apps/ktorrent/fileselectdlg.cpp
-+++ b/apps/ktorrent/fileselectdlg.cpp
-@@ -217,9 +217,9 @@ void FileSelectDlg::updateSizeLabels()
- 	lblRequired->setText(kt::BytesToString(bytes_to_download));
- 
- 	if (bytes_to_download > bytes_free)
--		lbltqStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!"));
-+		lblStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!"));
- 	else
--		lbltqStatus->setText(kt::BytesToString(bytes_free - bytes_to_download));
-+		lblStatus->setText(kt::BytesToString(bytes_free - bytes_to_download));
- }
- 
- void FileSelectDlg::treeItemChanged()
-diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
-index 152c057..f289025 100644
---- a/apps/ktorrent/fileselectdlgbase.ui
-+++ b/apps/ktorrent/fileselectdlgbase.ui
-@@ -207,7 +207,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>135</height>
-@@ -237,7 +237,7 @@
-                     <property name="sizeType">
-                         <enum>Preferred</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -298,7 +298,7 @@
-                         </widget>
-                         <widget class="TQLabel">
-                             <property name="name">
--                                <cstring>lbltqStatus</cstring>
-+                                <cstring>lblStatus</cstring>
-                             </property>
-                         </widget>
-                     </vbox>
-@@ -315,7 +315,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>220</width>
-                     <height>20</height>
-diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui
-index 33eb8f3..a1ba5e9 100644
---- a/apps/ktorrent/generalpref.ui
-+++ b/apps/ktorrent/generalpref.ui
-@@ -29,7 +29,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>50</height>
-@@ -142,7 +142,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
-index c02218d..dea4bc2 100644
---- a/apps/ktorrent/ipfilterwidgetbase.ui
-+++ b/apps/ktorrent/ipfilterwidgetbase.ui
-@@ -73,7 +73,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -144,7 +144,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -192,7 +192,7 @@
-                             <property name="sizeType">
-                                 <enum>Fixed</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>16</height>
-@@ -234,7 +234,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>30</height>
-diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
-index 1156b88..048692b 100644
---- a/apps/ktorrent/ktorrentviewitem.cpp
-+++ b/apps/ktorrent/ktorrentviewitem.cpp
-@@ -30,7 +30,7 @@
- using namespace bt;
- using namespace kt;
- /*
--static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s)
-+static TQString StatusToString(TorrentInterface* tc,TorrentStatus s)
- {
- 	switch (s)
- 	{
-@@ -55,7 +55,7 @@ static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s)
- }
- */
- 
--static TQColor StatusToColor(TorrenttqStatus s,const TQColorGroup & cg)
-+static TQColor StatusToColor(TorrentStatus s,const TQColorGroup & cg)
- {
- 	TQColor green(40,205,40);
- 	TQColor yellow(255,174,0);
-diff --git a/apps/ktorrent/leaktrace.cpp b/apps/ktorrent/leaktrace.cpp
-index ae41d3f..f3bdb5f 100644
---- a/apps/ktorrent/leaktrace.cpp
-+++ b/apps/ktorrent/leaktrace.cpp
-@@ -91,7 +91,7 @@ static void WriteLeakReport()
- 	fclose(report);
- }
- 
--static void PrinttqStatus()
-+static void PrintStatus()
- {
- 	if (mtree.count == 0)
- 	{
-@@ -124,7 +124,7 @@ static void RegisterAlloc(void* ptr,Uint32 size)
- 		for (Uint32 b = 0;b < SOME_PRIME;b++)
- 			mtree.buckets[b] = 0;
- 		mtree.num_buckets = SOME_PRIME;
--		atexit(PrinttqStatus);
-+		atexit(PrintStatus);
- 	}
- 	
- 	// hash the address
-diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
-index cbbfbed..33bdf7f 100644
---- a/apps/ktorrent/newui/button.cpp
-+++ b/apps/ktorrent/newui/button.cpp
-@@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
-     setToggleButton(true);
-     setFocusPolicy(TQ_NoFocus);
-     setDescription(m_description);
--    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
--    resize(tqsizeHint());
-+    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-+    resize(sizeHint());
-     fixDimensions(Ideal::Bottom);
- 
-     TQToolTip::add(this, m_realText);
-@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
-     pm.fill(eraseColor());
-     TQPainter p2(&pm);
- 
--    tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
-+    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
- 
--    tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
-+    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
-                         TQRect(0,0,pm.width(),pm.height()),
--                        tqcolorGroup(), flags, TQStyleOption());
-+                        colorGroup(), flags, TQStyleOption());
- 
-     switch (m_place)
-     {
-@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
-             if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
-             {
-                 setFixedWidth(height());
--                setMinimumHeight(tqsizeHint().width());
-+                setMinimumHeight(sizeHint().width());
-                 setMaximumHeight(32767);
-             }
-             break;
-@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
-             if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
-             {
-                 setFixedHeight(width());
--                setMinimumWidth(tqsizeHint().height());
-+                setMinimumWidth(sizeHint().height());
-                 setMaximumWidth(32767);
-             }
-             break;
-     }
- }
- 
--TQSize Button::tqsizeHint() const
-+TQSize Button::sizeHint() const
- {
--    return tqsizeHint(text());
-+    return sizeHint(text());
- }
- 
--TQSize Button::tqsizeHint(const TQString &text) const
-+TQSize Button::sizeHint(const TQString &text) const
- {
-     constPolish();
-     int w = 0, h = 0;
-@@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
-         h = TQMAX( h, ih );
-     }
-     if ( isMenuButton() )
--        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-     if ( pixmap() ) {
-         TQPixmap *pm = (TQPixmap *)pixmap();
-         w += pm->width();
-@@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
-         TQString s( text );
-         bool empty = s.isEmpty();
-         if ( empty )
--            s = TQString::tqfromLatin1("XXXX");
-+            s = TQString::fromLatin1("XXXX");
-         TQFontMetrics fm = fontMetrics();
-         TQSize sz = fm.size( ShowPrefix, s );
-         if(!empty || !w)
-@@ -239,12 +239,12 @@ void Button::updateSize()
-     {
-         case Ideal::Left:
-         case Ideal::Right:
--             setMinimumHeight(tqsizeHint().width());
--             resize(tqsizeHint().height(), tqsizeHint().width());
-+             setMinimumHeight(sizeHint().width());
-+             resize(sizeHint().height(), sizeHint().width());
-             break;
-         case Ideal::Top:
-         case Ideal::Bottom:
--            resize(tqsizeHint().width(), tqsizeHint().height());
-+            resize(sizeHint().width(), sizeHint().height());
-             break;
-     }
- }
-diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h
-index fae0b56..18aecd4 100644
---- a/apps/ktorrent/newui/button.h
-+++ b/apps/ktorrent/newui/button.h
-@@ -54,8 +54,8 @@ public:
-     /**Sets the mode of a button.*/
-     void setMode(Ideal::ButtonMode mode);
- 
--    TQSize tqsizeHint() const;
--    TQSize tqsizeHint(const TQString &text) const;
-+    TQSize sizeHint() const;
-+    TQSize sizeHint(const TQString &text) const;
- 
-     /**Updates size of a widget. Used after squeezing button's text.*/
-     void updateSize();
-diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp
-index 47227a8..56673b4 100644
---- a/apps/ktorrent/newui/buttonbar.cpp
-+++ b/apps/ktorrent/newui/buttonbar.cpp
-@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
- {
- }
- 
--TQSize ButtonLayout::tqminimumSize() const
-+TQSize ButtonLayout::minimumSize() const
- {
--    TQSize size = TQBoxLayout::tqminimumSize();
-+    TQSize size = TQBoxLayout::minimumSize();
- 
-     if (!m_buttonBar->autoResize())
-         return size;
-@@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const
-         case Ideal::Bottom:
-             return TQSize(0,size.height());
-     }
--    return TQBoxLayout::tqminimumSize();
-+    return TQBoxLayout::minimumSize();
- }
- 
- 
-@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
-     {
-         case Ideal::Left:
-         case Ideal::Right:
--            setFixedWidth(tqsizeHint().width());
--            setMinimumHeight(tqsizeHint().height());
-+            setFixedWidth(sizeHint().width());
-+            setMinimumHeight(sizeHint().height());
-             setMaximumHeight(32767);
-             break;
-         case Ideal::Top:
-         case Ideal::Bottom:
--            setFixedHeight(tqsizeHint().height());
--            setMinimumWidth(tqsizeHint().width());
-+            setFixedHeight(sizeHint().height());
-+            setMinimumWidth(sizeHint().width());
-             setMaximumWidth(32767);
-             break;
-     }
-@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
-     {
-         case Ideal::Left:
-         case Ideal::Right:
--            preferredDimension = l->TQBoxLayout::tqminimumSize().height();
-+            preferredDimension = l->TQBoxLayout::minimumSize().height();
-             actualDimension = size().height();
-             oldDimension = ev->oldSize().height();
-             break;
-         case Ideal::Top:
-         case Ideal::Bottom:
--            preferredDimension = l->TQBoxLayout::tqminimumSize().width();
-+            preferredDimension = l->TQBoxLayout::minimumSize().width();
-             actualDimension = size().width();
-             oldDimension = ev->oldSize().width();
-             break;
-@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
-     int size = 0;
-     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
-     {
--        size += (*it)->tqsizeHint((*it)->realText()).width();
-+        size += (*it)->sizeHint((*it)->realText()).width();
-     }
-     return size;
- }
-diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h
-index a2e8ecc..d517cd7 100644
---- a/apps/ktorrent/newui/buttonbar.h
-+++ b/apps/ktorrent/newui/buttonbar.h
-@@ -34,12 +34,12 @@ class ButtonBar;
- 
- /**@short A tqlayout for a ButtonBar class.
- 
--Overrides tqminimumSize method to allow shrinking button bar buttons.*/
-+Overrides minimumSize method to allow shrinking button bar buttons.*/
- class ButtonLayout: public TQBoxLayout{
- public:
-     ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
- 
--    virtual TQSize tqminimumSize() const;
-+    virtual TQSize minimumSize() const;
- 
- private:
-     ButtonBar *m_buttonBar;
-diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
-index f008e56..3b67ff3 100644
---- a/apps/ktorrent/newui/ddockwindow.cpp
-+++ b/apps/ktorrent/newui/ddockwindow.cpp
-@@ -119,9 +119,9 @@ void DDockWindow::setVisible(bool v)
-     if (!m_visible)
-     {
-         if (m_position == DDockWindow::Bottom)
--            setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
-+            setFixedExtentHeight(m_internalLayout->sizeHint().height());
-         else
--            setFixedExtentWidth(m_internalLayout->tqsizeHint().width());
-+            setFixedExtentWidth(m_internalLayout->sizeHint().width());
-         emit hidden();
-     }
-     else
-@@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
-         int size = 0;
-         if (m_position == DDockWindow::Bottom)
-         {
--            size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().height());
-+            size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().height());
-             setFixedExtentHeight(size);
-         }
-         else
-         {
--            size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().width());
-+            size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().width());
-             setFixedExtentWidth(size);
-         }
-     }
-@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
- {
-     if (m_toggledButton)
-     {
--        TQWidget *w = tqApp->tqfocusWidget();
-+        TQWidget *w = tqApp->focusWidget();
-         if (!w)
-             return false;
-         TQWidget *toolWidget = m_widgets[m_toggledButton];
-diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
-index 26186d0..a21fa5c 100644
---- a/apps/ktorrent/newui/dmainwindow.cpp
-+++ b/apps/ktorrent/newui/dmainwindow.cpp
-@@ -189,7 +189,7 @@ DTabWidget *DMainWindow::splitVertical()
- 
- void DMainWindow::invalidateActiveTabWidget()
- {
--/*    TQWidget *focused = m_central->tqfocusWidget();
-+/*    TQWidget *focused = m_central->focusWidget();
-     kdDebug(9000) << "tqinvalidate: " << focused << endl;
-     if (focused == 0)
-         return;
-diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp
-index 4931ad0..6da580f 100644
---- a/apps/ktorrent/newui/docksplitter.cpp
-+++ b/apps/ktorrent/newui/docksplitter.cpp
-@@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
-         w->hide();
-     }
- 
--    m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
-+    m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
- 
-     if (isRowEmpty(row))
-     {
-diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui
-index 6762dfe..700d12d 100644
---- a/apps/ktorrent/pastedlgbase.ui
-+++ b/apps/ktorrent/pastedlgbase.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>0</width>
-             <height>0</height>
-@@ -64,7 +64,7 @@
-                             <verstretch>0</verstretch>
-                         </sizepolicy>
-                     </property>
--                    <property name="tqminimumSize">
-+                    <property name="minimumSize">
-                         <size>
-                             <width>400</width>
-                             <height>0</height>
-@@ -91,7 +91,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>297</width>
-                             <height>20</height>
-diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
-index 508789b..80c6440 100644
---- a/apps/ktorrent/queuedialog.cpp
-+++ b/apps/ktorrent/queuedialog.cpp
-@@ -123,7 +123,7 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam
- 	for( ; it != qman->end(); ++it)
- 	{
- 		TorrentInterface* tc = *it;
--		TorrenttqStatus ts = tc->getStats().status;
-+		TorrentStatus ts = tc->getStats().status;
- 		
- 		if(ts == kt::SEEDING || ts == kt::DOWNLOAD_COMPLETE || 
- 			ts == kt::SEEDING_COMPLETE || tc->getStats().completed)
-@@ -288,7 +288,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
- {
- 	if(!item)
- 	{
--		dltqStatus->clear();
-+		dlStatus->clear();
- 		dlTracker->clear();
- 		dlRatio->clear();
- 		dlDHT->clear();
-@@ -298,7 +298,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
- 	const TorrentInterface* tc = ((QueueItem*)item)->getTC();
- 	TorrentStats s = tc->getStats();
- 	
--	dltqStatus->setText(tc->statusToString());
-+	dlStatus->setText(tc->statusToString());
- 	dlTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
- 	dlRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
- 	dlBytes->setText(BytesToString(s.bytes_left_to_download));
-@@ -309,7 +309,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
- {
- 	if(!item)
- 	{
--		ultqStatus->clear();
-+		ulStatus->clear();
- 		ulTracker->clear();
- 		ulRatio->clear();
- 		ulDHT->clear();
-@@ -319,7 +319,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
- 	const TorrentInterface* tc = ((QueueItem*)item)->getTC();
- 	TorrentStats s = tc->getStats();
- 	
--	ultqStatus->setText(tc->statusToString());
-+	ulStatus->setText(tc->statusToString());
- 	ulTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
- 	ulRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
- 	ulBytes->setText(BytesToString(s.bytes_uploaded));
-diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui
-index 8517b57..7e4769f 100644
---- a/apps/ktorrent/queuedlg.ui
-+++ b/apps/ktorrent/queuedlg.ui
-@@ -129,7 +129,7 @@
-                                     </property>
-                                     <widget class="TQLabel">
-                                         <property name="name">
--                                            <cstring>dltqStatus</cstring>
-+                                            <cstring>dlStatus</cstring>
-                                         </property>
-                                         <property name="text">
-                                             <string></string>
-@@ -345,7 +345,7 @@
-                                     </property>
-                                     <widget class="TQLabel">
-                                         <property name="name">
--                                            <cstring>ultqStatus</cstring>
-+                                            <cstring>ulStatus</cstring>
-                                         </property>
-                                         <property name="text">
-                                             <string></string>
-@@ -416,7 +416,7 @@
-                             <property name="sizeType">
-                                 <enum>Preferred</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-@@ -452,7 +452,7 @@
-                             <property name="sizeType">
-                                 <enum>Preferred</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-@@ -471,7 +471,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>30</height>
-@@ -504,7 +504,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -540,7 +540,7 @@
-                     <property name="sizeType">
-                         <enum>Preferred</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -573,7 +573,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui
-index 89ffb9f..2538680 100644
---- a/apps/ktorrent/scandlgbase.ui
-+++ b/apps/ktorrent/scandlgbase.ui
-@@ -84,7 +84,7 @@
-                             <property name="name">
-                                 <cstring>m_chunks_found</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -104,7 +104,7 @@
-                             <property name="name">
-                                 <cstring>m_chunks_failed</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -164,7 +164,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>181</width>
-                             <height>20</height>
-diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui
-index f4313e2..17dc49c 100644
---- a/apps/ktorrent/speedlimitsdlgbase.ui
-+++ b/apps/ktorrent/speedlimitsdlgbase.ui
-@@ -141,7 +141,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>121</width>
-                             <height>20</height>
-diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
-index fa02179..3db0c49 100644
---- a/apps/ktorrent/torrentcreatordlgbase.ui
-+++ b/apps/ktorrent/torrentcreatordlgbase.ui
-@@ -148,7 +148,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>21</width>
-                                     <height>20</height>
-@@ -233,7 +233,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-@@ -372,7 +372,7 @@
-                     <property name="sizeType">
-                         <enum>Maximum</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -422,7 +422,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>40</height>
-diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp
-index 7df590f..5cce261 100644
---- a/apps/ktorrent/trayhoverpopup.cpp
-+++ b/apps/ktorrent/trayhoverpopup.cpp
-@@ -114,7 +114,7 @@ void TrayHoverPopup::create()
- 		hb->setSpacing(KDialog::spacingHint());
- 		TQLabel* pix_lbl = new TQLabel(hb,"title_icon");
- 		pix_lbl->setPixmap(pix);
--		pix_lbl->tqsetAlignment(AlignLeft);
-+		pix_lbl->setAlignment(AlignLeft);
- 	}
- 	 
- 	
-@@ -122,13 +122,13 @@ void TrayHoverPopup::create()
- 	TQFont fnt = title->font();
- 	fnt.setBold( true );
- 	title->setFont( fnt );
--	title->tqsetAlignment( TQt::AlignHCenter );
-+	title->setAlignment( TQt::AlignHCenter );
- 	if ( hb )
- 		hb->setStretchFactor(title, 10 ); // enforce centering
- 
- 	// text will be filled later
- 	text = new TQLabel( "Dummy", vb, "msg_label" );
--				text->tqsetAlignment( AlignLeft );
-+				text->setAlignment( AlignLeft );
- 	setView(vb);
- }
- 	
-diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui
-index 0aacede..e46bbd1 100644
---- a/apps/ktupnptest/mainwidget.ui
-+++ b/apps/ktupnptest/mainwidget.ui
-@@ -39,7 +39,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>61</width>
-                             <height>20</height>
-diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff
-index e030443..57dc703 100644
---- a/estimation-scripts/enable-logging.diff
-+++ b/estimation-scripts/enable-logging.diff
-@@ -45,7 +45,7 @@ Index: estimation-scripts/enable-logging.diff
- -+ 		{
- -+ 			if(!started)
- -+ 			{
---+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl;
-+-+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl;
- -+ 				tmpLog = false;
- -+ 				started = true;
- -+ 				toLog = true;
-@@ -56,7 +56,7 @@ Index: estimation-scripts/enable-logging.diff
- -+ 		{
- -+ 			if(started)
- -+ 			{
---+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl;
-+-+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl;
- -+ 				tmpLog = false;
- -+ 				started = false;
- -+ 			}
-@@ -71,7 +71,7 @@ Index: estimation-scripts/enable-logging.diff
- - 	if (tc->getBytesLeft() == 0)
- - 	{
- -+ 		if(toLog && tmpLog) 
---+ 			Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl;
-+-+ 			Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl;
- -+ 		toLog = false;
- -+
- - 		setText(7,i18n("finished"));
-@@ -83,13 +83,13 @@ Index: estimation-scripts/enable-logging.diff
- - 			if (tc->getDownloadRate() == 0)
- -+			{
- -+ 				if(toLog && tmpLog) 
---+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
-+-+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
- - 				setText(7,i18n("infinity"));
- -+			}
- - 			else
- - 			{
- -+				if(toLog && tmpLog) 
---+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
-+-+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
- -+
- - 				Uint32 secs = (int)floor( (float)tc->getBytesLeft() / (float)tc->getDownloadRate() );
- - 				QTime t;
-@@ -155,7 +155,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
- +  		{
- +  			if(!started)
- +  			{
--+  				Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl;
-++  				Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl;
- +  				tmpLog = false;
- +  				started = true;
- +  				toLog = true;
-@@ -166,7 +166,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
- +  		{
- +  			if(started)
- +  			{
--+  				Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl;
-++  				Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl;
- +  				tmpLog = false;
- +  				started = false;
- +  			}
-@@ -182,7 +182,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
-  	if (s.bytes_left == 0)
-  	{
- +  		if(toLog && tmpLog) 
--+  			Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl;
-++  			Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl;
- +  		toLog = false;
- + 
- +
-@@ -195,14 +195,14 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
-  			if (s.download_rate == 0)
- +			{
- +  				if(toLog && tmpLog) 
--+  					Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
-++  					Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
- +
-  				setText(7,i18n("infinity"));
- +			}
-  			else
-  			{
- + 				if(toLog && tmpLog) 
--+  					Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
-++  					Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
- +
-  				Uint32 secs = (int)floor( (float)s.bytes_left / (float)s.download_rate);
-  				setText(7,DurationToString(secs));
-diff --git a/libktorrent/interfaces/torrentinterface.h b/libktorrent/interfaces/torrentinterface.h
-index 14ad532..4ab3c74 100644
---- a/libktorrent/interfaces/torrentinterface.h
-+++ b/libktorrent/interfaces/torrentinterface.h
-@@ -44,7 +44,7 @@ namespace kt
- 	class TorrentFileInterface;
- 	class PeerSource;
- 	
--	enum TorrenttqStatus
-+	enum TorrentStatus
- 	{
- 		NOT_STARTED,
- 		SEEDING_COMPLETE,
-@@ -118,8 +118,8 @@ namespace kt
- 		Uint32 leechers_total;
- 		/// Num leechers connected to
- 		Uint32 leechers_connected_to;
--		/// tqStatus of the download
--		TorrenttqStatus status;
-+		/// Status of the download
-+		TorrentStatus status;
- 		/// The status of the tracker
- 		TQString trackerstatus;
- 		/// The number of bytes downloaded in this session
-diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
-index b46de3a..3823516 100644
---- a/libktorrent/labelview.cpp
-+++ b/libktorrent/labelview.cpp
-@@ -184,11 +184,11 @@ namespace kt
- 				selected = 0;
- 			
- 			// update odd status of each item
--			updateOddtqStatus();	
-+			updateOddStatus();	
- 		}
- 	}
- 	
--	void LabelView::updateOddtqStatus()
-+	void LabelView::updateOddStatus()
- 	{
- 		bool odd = true;
- 		LabelViewItr i = items.begin();
-@@ -250,7 +250,7 @@ namespace kt
- 	{
- 		items.sort(LabelViewItemCmp());
- 		item_box->sorted(items);
--		updateOddtqStatus();
-+		updateOddStatus();
- 	}
- 
- }
-diff --git a/libktorrent/labelview.h b/libktorrent/labelview.h
-index 550e2d5..eba2036 100644
---- a/libktorrent/labelview.h
-+++ b/libktorrent/labelview.h
-@@ -110,7 +110,7 @@ namespace kt
- 		void onItemClicked(LabelViewItem* it);
- 		
- 	private:
--		void updateOddtqStatus();
-+		void updateOddStatus();
- 		
- 	signals:
- 		/// The current item has changed
-diff --git a/libktorrent/labelviewitembase.ui b/libktorrent/labelviewitembase.ui
-index cb6821c..861f703 100644
---- a/libktorrent/labelviewitembase.ui
-+++ b/libktorrent/labelviewitembase.ui
-@@ -23,7 +23,7 @@
-             <property name="name">
-                 <cstring>icon_lbl</cstring>
-             </property>
--            <property name="tqminimumSize">
-+            <property name="minimumSize">
-                 <size>
-                     <width>64</width>
-                     <height>64</height>
-diff --git a/libktorrent/pluginmanagerwidget.ui b/libktorrent/pluginmanagerwidget.ui
-index aae2416..a43575b 100644
---- a/libktorrent/pluginmanagerwidget.ui
-+++ b/libktorrent/pluginmanagerwidget.ui
-@@ -82,7 +82,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>31</height>
-diff --git a/libktorrent/torrent/chunk.cpp b/libktorrent/torrent/chunk.cpp
-index aaee35e..6873713 100644
---- a/libktorrent/torrent/chunk.cpp
-+++ b/libktorrent/torrent/chunk.cpp
-@@ -37,7 +37,7 @@ namespace bt
- 		clear();
- 	}
- 
--	void Chunk::setData(Uint8* d,tqStatus nstatus)
-+	void Chunk::setData(Uint8* d,Status nstatus)
- 	{
- 		clear();
- 		status = nstatus;
-diff --git a/libktorrent/torrent/chunk.h b/libktorrent/torrent/chunk.h
-index 08d63c3..0896e96 100644
---- a/libktorrent/torrent/chunk.h
-+++ b/libktorrent/torrent/chunk.h
-@@ -45,7 +45,7 @@ namespace bt
- 		Chunk(unsigned int index,Uint32 size);
- 		~Chunk();
- 
--		enum tqStatus
-+		enum Status
- 		{
- 			MMAPPED,
- 			BUFFERED,
-@@ -54,13 +54,13 @@ namespace bt
- 		};
- 
- 		/// Get the chunks status.
--		tqStatus gettqStatus() const;
-+		Status getStatus() const;
- 
- 		/**
- 		 * Set the chunks status
- 		 * @param s 
- 		 */
--		void settqStatus(tqStatus s);
-+		void setStatus(Status s);
- 
- 		/// Get the data
- 		const Uint8* getData() const;
-@@ -69,7 +69,7 @@ namespace bt
- 		Uint8* getData();
- 
- 		/// Set the data and the new status
--		void setData(Uint8* d,tqStatus nstatus);
-+		void setData(Uint8* d,Status nstatus);
- 
- 		/// Clear the chunk (delete data depending on the mode)
- 		void clear();
-@@ -118,7 +118,7 @@ namespace bt
- 		virtual void unmapped();
- 		
- 	private:
--		tqStatus status;
-+		Status status;
- 		Uint32 index;
- 		Uint8* data;
- 		Uint32 size;
-@@ -126,12 +126,12 @@ namespace bt
- 		Priority priority;
- 	};
- 
--	inline Chunk::tqStatus Chunk::gettqStatus() const
-+	inline Chunk::Status Chunk::getStatus() const
- 	{
- 		return status;
- 	}
- 
--	inline void Chunk::settqStatus(Chunk::tqStatus s)
-+	inline void Chunk::setStatus(Chunk::Status s)
- 	{
- 		status = s;
- 	}
-diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
-index 04eb87f..3475441 100644
---- a/libktorrent/torrent/chunkdownload.cpp
-+++ b/libktorrent/torrent/chunkdownload.cpp
-@@ -35,17 +35,17 @@
- namespace bt
- {	
- 
--	class DownloadtqStatus : public std::set<Uint32>
-+	class DownloadStatus : public std::set<Uint32>
- 	{
- 	public:
- 	//	typedef std::set<Uint32>::iterator iterator;
- 		
--		DownloadtqStatus()
-+		DownloadStatus()
- 		{
- 	
- 		}
- 
--		~DownloadtqStatus()
-+		~DownloadStatus()
- 		{
- 		}
- 
-@@ -111,7 +111,7 @@ namespace bt
- 			return false;
- 
- 	
--		DownloadtqStatus* ds = dstatus.find(p.getPeer());
-+		DownloadStatus* ds = dstatus.find(p.getPeer());
- 		if (ds)
- 			ds->remove(pp);
- 		
-@@ -169,7 +169,7 @@ namespace bt
- 			
- 		pd->grab();
- 		pdown.append(pd);
--		dstatus.insert(pd->getPeer()->getID(),new DownloadtqStatus());
-+		dstatus.insert(pd->getPeer()->getID(),new DownloadStatus());
- 		sendRequests(pd);
- 		connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& )));
- 		connect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& )));
-@@ -179,7 +179,7 @@ namespace bt
- 	void ChunkDownload::notDownloaded(const Request & r,bool reject)
- 	{
- 		// find the peer 
--		DownloadtqStatus* ds = dstatus.find(r.getPeer());
-+		DownloadStatus* ds = dstatus.find(r.getPeer());
- 		if (ds)
- 		{
- 			//	Out() << "ds != 0"  << endl;
-@@ -216,7 +216,7 @@ namespace bt
- 	void ChunkDownload::sendRequests(PeerDownloader* pd)
- 	{
- 		timer.update();
--		DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
-+		DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
- 		if (!ds)
- 			return;
- 			
-@@ -262,11 +262,11 @@ namespace bt
- 	
- 	void ChunkDownload::sendCancels(PeerDownloader* pd)
- 	{
--		DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
-+		DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
- 		if (!ds)
- 			return;
- 		
--		DownloadtqStatus::iterator itr = ds->begin();
-+		DownloadStatus::iterator itr = ds->begin();
- 		while (itr != ds->end())
- 		{
- 			Uint32 i = *itr;
-@@ -287,7 +287,7 @@ namespace bt
- 		while (i != pdown.end())
- 		{
- 			PeerDownloader* pd = *i;
--			DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
-+			DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
- 			Uint32 pp = p.getOffset() / MAX_PIECE_LEN;
- 			if (ds && ds->contains(pp))
- 			{
-@@ -360,7 +360,7 @@ namespace bt
- 		ChunkDownloadHeader hdr;
- 		hdr.index = chunk->getIndex();
- 		hdr.num_bits = pieces.getNumBits();
--		hdr.buffered = chunk->gettqStatus() == Chunk::BUFFERED ? 1 : 0;
-+		hdr.buffered = chunk->getStatus() == Chunk::BUFFERED ? 1 : 0;
- 		// save the chunk header
- 		file.write(&hdr,sizeof(ChunkDownloadHeader));
- 		// save the bitset
-@@ -370,7 +370,7 @@ namespace bt
- 			// if it's a buffered chunk, save the contents to
- 			file.write(chunk->getData(),chunk->getSize());
- 			chunk->clear();
--			chunk->settqStatus(Chunk::ON_DISK);
-+			chunk->setStatus(Chunk::ON_DISK);
- 		}
- 	}
- 		
-diff --git a/libktorrent/torrent/chunkdownload.h b/libktorrent/torrent/chunkdownload.h
-index c8bd2ae..83fd3e3 100644
---- a/libktorrent/torrent/chunkdownload.h
-+++ b/libktorrent/torrent/chunkdownload.h
-@@ -41,7 +41,7 @@ namespace bt
- 	class Peer;
- 	class Request;
- 	class PeerDownloader;
--	class DownloadtqStatus;
-+	class DownloadStatus;
- 	
- 	struct ChunkDownloadHeader
- 	{
-@@ -193,7 +193,7 @@ namespace bt
- 		Uint32 last_size;
- 		Timer timer;
- 		TQPtrList<PeerDownloader> pdown;
--		PtrMap<Uint32,DownloadtqStatus> dstatus;
-+		PtrMap<Uint32,DownloadStatus> dstatus;
- 		std::set<Uint32> piece_providers;
- 		
- 
-diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
-index ac45be5..a0849a4 100644
---- a/libktorrent/torrent/chunkmanager.cpp
-+++ b/libktorrent/torrent/chunkmanager.cpp
-@@ -189,7 +189,7 @@ namespace bt
- 				Chunk* c = getChunk(hdr.index);
- 				if (c)
- 				{
--					c->settqStatus(Chunk::ON_DISK);
-+					c->setStatus(Chunk::ON_DISK);
- 					bitset.set(hdr.index,true);
- 					todo.set(hdr.index,false);
- 					recalc_chunks_left = true;
-@@ -209,7 +209,7 @@ namespace bt
- 		for (unsigned int i = 0;i < tor.getNumChunks();i++)
- 		{
- 			Chunk* c = getChunk(i);
--			if (c->gettqStatus() != Chunk::NOT_DOWNLOADED)
-+			if (c->getStatus() != Chunk::NOT_DOWNLOADED)
- 			{
- 				NewChunkHeader hdr;
- 				hdr.index = i;
-@@ -267,16 +267,16 @@ namespace bt
- 		for (Uint32 i = 0;i < bitset.getNumBits();i++)
- 		{
- 			Chunk* c = chunks[i];
--			if (c->gettqStatus() == Chunk::MMAPPED)
-+			if (c->getStatus() == Chunk::MMAPPED)
- 			{
- 				cache->save(c);
- 				c->clear();
--				c->settqStatus(Chunk::ON_DISK);
-+				c->setStatus(Chunk::ON_DISK);
- 			}
--			else if (c->gettqStatus() == Chunk::BUFFERED)
-+			else if (c->getStatus() == Chunk::BUFFERED)
- 			{
- 				c->clear();
--				c->settqStatus(Chunk::ON_DISK);
-+				c->setStatus(Chunk::ON_DISK);
- 			}
- 		}
- 		cache->close();
-@@ -288,11 +288,11 @@ namespace bt
- 			return 0;
- 		
- 		Chunk* c = chunks[i];
--		if (c->gettqStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded())
-+		if (c->getStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded())
- 		{
- 			return 0;
- 		}
--		else if (c->gettqStatus() == Chunk::ON_DISK)
-+		else if (c->getStatus() == Chunk::ON_DISK)
- 		{
- 			// load the chunk if it is on disk
- 			cache->load(c);
-@@ -338,10 +338,10 @@ namespace bt
- 		Chunk* c = chunks[i];
- 		if (!c->taken())
- 		{
--			if (c->gettqStatus() == Chunk::MMAPPED)
-+			if (c->getStatus() == Chunk::MMAPPED)
- 				cache->save(c);
- 			c->clear();
--			c->settqStatus(Chunk::ON_DISK);
-+			c->setStatus(Chunk::ON_DISK);
- 			loaded.remove(i);
- 		}
- 	}
-@@ -352,10 +352,10 @@ namespace bt
- 			return;
- 		
- 		Chunk* c = chunks[i];
--		if (c->gettqStatus() == Chunk::MMAPPED)
-+		if (c->getStatus() == Chunk::MMAPPED)
- 			cache->save(c);
- 		c->clear();
--		c->settqStatus(Chunk::NOT_DOWNLOADED);
-+		c->setStatus(Chunk::NOT_DOWNLOADED);
- 		bitset.set(i,false);
- 		todo.set(i,!excluded_chunks.get(i) && !only_seed_chunks.get(i));
- 		loaded.remove(i);
-@@ -372,10 +372,10 @@ namespace bt
- 			// get rid of chunk if nobody asked for it in the last 5 seconds
- 			if (!c->taken() && bt::GetCurrentTime() - i.data() > 5000)
- 			{
--				if (c->gettqStatus() == Chunk::MMAPPED)
-+				if (c->getStatus() == Chunk::MMAPPED)
- 					cache->save(c);
- 				c->clear();
--				c->settqStatus(Chunk::ON_DISK);
-+				c->setStatus(Chunk::ON_DISK);
- 				TQMap<Uint32,TimeStamp>::iterator j = i;
- 				i++;
- 				loaded.erase(j);
-@@ -413,7 +413,7 @@ namespace bt
- 		else
- 		{
- 			c->clear();
--			c->settqStatus(Chunk::NOT_DOWNLOADED);
-+			c->setStatus(Chunk::NOT_DOWNLOADED);
- 			Out(SYS_DIO|LOG_IMPORTANT) << "Warning: attempted to save a chunk which was excluded" << endl;
- 		}
- 	}
-@@ -1016,7 +1016,7 @@ namespace bt
- 	
- 	bool ChunkManager::prepareChunk(Chunk* c,bool allways)
- 	{
--		if (!allways && c->gettqStatus() != Chunk::NOT_DOWNLOADED)
-+		if (!allways && c->getStatus() != Chunk::NOT_DOWNLOADED)
- 			return false;
- 		
- 		return cache->prep(c);
-@@ -1044,7 +1044,7 @@ namespace bt
- 				bitset.set(i,true);
- 				todo.set(i,false);
- 				// the chunk must be on disk
--				c->settqStatus(Chunk::ON_DISK);
-+				c->setStatus(Chunk::ON_DISK);
- 				tor.updateFilePercentage(i,bitset); 
- 			}
- 			else if (!ok_chunks.get(i) && bitset.get(i))
-@@ -1053,12 +1053,12 @@ namespace bt
- 				// We think we have a chunk, but we don't
- 				bitset.set(i,false);
- 				todo.set(i,!only_seed_chunks.get(i) && !excluded_chunks.get(i));
--				if (c->gettqStatus() == Chunk::ON_DISK)
-+				if (c->getStatus() == Chunk::ON_DISK)
- 				{
--					c->settqStatus(Chunk::NOT_DOWNLOADED);
-+					c->setStatus(Chunk::NOT_DOWNLOADED);
- 					tor.updateFilePercentage(i,bitset);
- 				}
--				else if (c->gettqStatus() == Chunk::MMAPPED || c->gettqStatus() == Chunk::BUFFERED)
-+				else if (c->getStatus() == Chunk::MMAPPED || c->getStatus() == Chunk::BUFFERED)
- 				{
- 					resetChunk(i);
- 				}
-diff --git a/libktorrent/torrent/chunkselector.cpp b/libktorrent/torrent/chunkselector.cpp
-index 9c05629..b1c42fa 100644
---- a/libktorrent/torrent/chunkselector.cpp
-+++ b/libktorrent/torrent/chunkselector.cpp
-@@ -165,7 +165,7 @@ namespace bt
- 		for (Uint32 i = from;i <= to;i++)
- 		{
- 			bool in_chunks = std::find(chunks.begin(),chunks.end(),i) != chunks.end();
--			if (!in_chunks && cman.getChunk(i)->gettqStatus() != Chunk::ON_DISK)
-+			if (!in_chunks && cman.getChunk(i)->getStatus() != Chunk::ON_DISK)
- 			{
- 			//	Out(SYS_DIO|LOG_DEBUG) << "ChunkSelector::reIncluded " << i << endl;
- 				chunks.push_back(i);
-diff --git a/libktorrent/torrent/downloader.cpp b/libktorrent/torrent/downloader.cpp
-index a63163e..582fa7e 100644
---- a/libktorrent/torrent/downloader.cpp
-+++ b/libktorrent/torrent/downloader.cpp
-@@ -87,7 +87,7 @@ namespace bt
- 		}
- 		
- 		// if the chunk is not in memory, reload it
--		if (cd->getChunk()->gettqStatus() == Chunk::ON_DISK)
-+		if (cd->getChunk()->getStatus() == Chunk::ON_DISK)
- 		{
- 			cman.prepareChunk(cd->getChunk(),true);
- 		}
-@@ -119,7 +119,7 @@ namespace bt
- 				downloaded += p.getLength();
- 			
- 			// save to disk again, if it is idle
--			if (cd->isIdle() && cd->getChunk()->gettqStatus() == Chunk::MMAPPED)
-+			if (cd->isIdle() && cd->getChunk()->getStatus() == Chunk::MMAPPED)
- 			{
- 				cman.saveChunk(cd->getChunk()->getIndex(),false);
- 			}
-@@ -160,7 +160,7 @@ namespace bt
- 			if (cd->isIdle()) // idle chunks do not need to be in memory
- 			{
- 				Chunk* c = cd->getChunk();
--				if (c->gettqStatus() == Chunk::MMAPPED)
-+				if (c->getStatus() == Chunk::MMAPPED)
- 				{
- 					cman.saveChunk(cd->getChunk()->getIndex(),false);
- 				}
-@@ -169,7 +169,7 @@ namespace bt
- 			{
- 				cd->releaseAllPDs();
- 				Chunk* c = cd->getChunk();
--				if (c->gettqStatus() == Chunk::MMAPPED)
-+				if (c->getStatus() == Chunk::MMAPPED)
- 				{
- 					cman.saveChunk(cd->getChunk()->getIndex(),false);
- 				}
-@@ -277,7 +277,7 @@ namespace bt
- 		if (sel)
- 		{
- 			// if it is on disk, reload it
--			if (sel->getChunk()->gettqStatus() == Chunk::ON_DISK)
-+			if (sel->getChunk()->getStatus() == Chunk::ON_DISK)
- 				cman.prepareChunk(sel->getChunk(),true);
- 			
- 			sel->assignPeer(pd);
-@@ -341,7 +341,7 @@ namespace bt
- 			if (cdmin) 
- 			{
- 				// if it is on disk, reload it
--				if (cdmin->getChunk()->gettqStatus() == Chunk::ON_DISK)
-+				if (cdmin->getChunk()->getStatus() == Chunk::ON_DISK)
- 				{
- 					cman.prepareChunk(cdmin->getChunk(),true);
- 				}
-@@ -438,10 +438,10 @@ namespace bt
- 		{
- 			Uint32 ch = i->first;
- 			Chunk* c = i->second->getChunk();
--			if (c->gettqStatus() == Chunk::MMAPPED)
-+			if (c->getStatus() == Chunk::MMAPPED)
- 				cman.saveChunk(ch,false);
- 			
--			c->settqStatus(Chunk::NOT_DOWNLOADED);
-+			c->setStatus(Chunk::NOT_DOWNLOADED);
- 		}
- 		current_chunks.clear();
- 	}
-diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
-index b7dae26..e842560 100644
---- a/libktorrent/torrent/multifilecache.cpp
-+++ b/libktorrent/torrent/multifilecache.cpp
-@@ -425,7 +425,7 @@ namespace bt
- 			{
- 				// if mmap fails or is not possible use buffered mode
- 				c->allocate();
--				c->settqStatus(Chunk::BUFFERED);
-+				c->setStatus(Chunk::BUFFERED);
- 			}
- 			else
- 			{
-@@ -436,7 +436,7 @@ namespace bt
- 		{
- 			// just allocate it
- 			c->allocate();
--			c->settqStatus(Chunk::BUFFERED);
-+			c->setStatus(Chunk::BUFFERED);
- 		}
- 		return true;
- 	}
-@@ -446,7 +446,7 @@ namespace bt
- 		TQValueList<Uint32> tflist;
- 		tor.calcChunkPos(c->getIndex(),tflist);
- 		
--		if (c->gettqStatus() == Chunk::MMAPPED)
-+		if (c->getStatus() == Chunk::MMAPPED)
- 		{
- 			// mapped chunks are easy
- 			CacheFile* fd = files.find(tflist[0]);
-@@ -455,7 +455,7 @@ namespace bt
- 			
- 			fd->unmap(c->getData(),c->getSize());
- 			c->clear();
--			c->settqStatus(Chunk::ON_DISK);
-+			c->setStatus(Chunk::ON_DISK);
- 			return;
- 		}
- 	
-@@ -506,7 +506,7 @@ namespace bt
- 		
- 		// set the chunk to on disk and clear it
- 		c->clear();
--		c->settqStatus(Chunk::ON_DISK);
-+		c->setStatus(Chunk::ON_DISK);
- 	}
- 	
- 	void MultiFileCache::downloadStatusChanged(TorrentFile* tf, bool download)
-diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp
-index 44303c4..136d9e5 100644
---- a/libktorrent/torrent/peersourcemanager.cpp
-+++ b/libktorrent/torrent/peersourcemanager.cpp
-@@ -386,7 +386,7 @@ namespace bt
- 				// 30 minutes
- 				curr->setInterval(FINAL_WAIT_TIME);
- 				timer.start(FINAL_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 			else if (curr->failureCount() > 2)
- 			{
-@@ -394,14 +394,14 @@ namespace bt
- 				// a minute or 5, no need for hammering every 30 seconds
- 				curr->setInterval(LONGER_WAIT_TIME);
- 				timer.start(LONGER_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 			else
- 			{
- 				// lets not hammer and wait 30 seconds
- 				curr->setInterval(INITIAL_WAIT_TIME);
- 				timer.start(INITIAL_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 		}
- 		else
-@@ -418,7 +418,7 @@ namespace bt
- 			{
- 				curr->setInterval(FINAL_WAIT_TIME);
- 				timer.start(FINAL_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 			else if (trk->failureCount() > 2)
- 			{
-@@ -426,14 +426,14 @@ namespace bt
- 				// wait 5 minutes and try again
- 				curr->setInterval(LONGER_WAIT_TIME);
- 				timer.start(LONGER_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 			else
- 			{
- 				// wait 30 seconds and try again
- 				curr->setInterval(INITIAL_WAIT_TIME);
- 				timer.start(INITIAL_WAIT_TIME * 1000,true);
--				request_time = TQDateTime::tqcurrentDateTime();
-+				request_time = TQDateTime::currentDateTime();
- 			}
- 		}
- 	}
-@@ -449,7 +449,7 @@ namespace bt
- 		pending = false;
- 		if (started)
- 			statusChanged(i18n("OK"));
--		request_time = TQDateTime::tqcurrentDateTime();
-+		request_time = TQDateTime::currentDateTime();
- 	}
- 		
- 	void PeerSourceManager::onTrackerRequestPending()
-@@ -504,7 +504,7 @@ namespace bt
- 		if (pending || !started || !curr)
- 			return 0;
- 		
--		return curr->getInterval() - request_time.secsTo(TQDateTime::tqcurrentDateTime());
-+		return curr->getInterval() - request_time.secsTo(TQDateTime::currentDateTime());
- 	}
- 	
- 	Uint32 PeerSourceManager::getNumSeeders() const
-diff --git a/libktorrent/torrent/peersourcemanager.h b/libktorrent/torrent/peersourcemanager.h
-index c46bbb8..d256397 100644
---- a/libktorrent/torrent/peersourcemanager.h
-+++ b/libktorrent/torrent/peersourcemanager.h
-@@ -165,7 +165,7 @@ namespace bt
- 		
- 	signals:
- 		/**
--		 * tqStatus has changed of the tracker.
-+		 * Status has changed of the tracker.
- 		 * @param ns The new status
- 		 */
- 		void statusChanged(const TQString & ns);
-diff --git a/libktorrent/torrent/singlefilecache.cpp b/libktorrent/torrent/singlefilecache.cpp
-index 4843c1f..8986f98 100644
---- a/libktorrent/torrent/singlefilecache.cpp
-+++ b/libktorrent/torrent/singlefilecache.cpp
-@@ -76,7 +76,7 @@ namespace bt
- 		{
- 			// mmap continuously fails, so stop using it
- 			c->allocate();
--			c->settqStatus(Chunk::BUFFERED);
-+			c->setStatus(Chunk::BUFFERED);
- 		}
- 		else
- 		{
-@@ -88,7 +88,7 @@ namespace bt
- 				// buffer it if mmapping fails
- 				Out(SYS_GEN|LOG_IMPORTANT) << "Warning : mmap failure, falling back to buffered mode" << endl;
- 				c->allocate();
--				c->settqStatus(Chunk::BUFFERED);
-+				c->setStatus(Chunk::BUFFERED);
- 			}
- 			else
- 			{
-@@ -105,7 +105,7 @@ namespace bt
- 		if (mmap_failures >= 3 || !(buf = (Uint8*)fd->map(c,off,c->getSize(),CacheFile::READ)))
- 		{
- 			c->allocate();
--			c->settqStatus(Chunk::BUFFERED);
-+			c->setStatus(Chunk::BUFFERED);
- 			fd->read(c->getData(),c->getSize(),off);
- 			if (mmap_failures < 3)
- 				mmap_failures++;
-@@ -119,18 +119,18 @@ namespace bt
- 	void SingleFileCache::save(Chunk* c)
- 	{
- 		// unmap the chunk if it is mapped
--		if (c->gettqStatus() == Chunk::MMAPPED)
-+		if (c->getStatus() == Chunk::MMAPPED)
- 		{
- 			fd->unmap(c->getData(),c->getSize());
- 			c->clear();
--			c->settqStatus(Chunk::ON_DISK);
-+			c->setStatus(Chunk::ON_DISK);
- 		}
--		else if (c->gettqStatus() == Chunk::BUFFERED)
-+		else if (c->getStatus() == Chunk::BUFFERED)
- 		{
- 			Uint64 off = c->getIndex() * tor.getChunkSize();
- 			fd->write(c->getData(),c->getSize(),off);
- 			c->clear();
--			c->settqStatus(Chunk::ON_DISK);
-+			c->setStatus(Chunk::ON_DISK);
- 		}
- 	}
- 
-diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
-index a586356..590a517 100644
---- a/libktorrent/torrent/torrentcontrol.cpp
-+++ b/libktorrent/torrent/torrentcontrol.cpp
-@@ -200,7 +200,7 @@ namespace bt
- 			if (stats.completed && !comp)
- 			{
- 				pman->killSeeders();
--				TQDateTime now = TQDateTime::tqcurrentDateTime();
-+				TQDateTime now = TQDateTime::currentDateTime();
- 				istats.running_time_dl += istats.time_started_dl.secsTo(now);
- 				updateStatusMsg();
- 				updateStats();
-@@ -228,7 +228,7 @@ namespace bt
- 				else
- 					psman->manualUpdate();
- 				istats.last_announce = bt::GetCurrentTime();
--				istats.time_started_dl = TQDateTime::tqcurrentDateTime();
-+				istats.time_started_dl = TQDateTime::currentDateTime();
- 			}
- 			updateStatusMsg();
- 			
-@@ -351,7 +351,7 @@ namespace bt
- 			throw;
- 		}
- 		
--		istats.time_started_ul = istats.time_started_dl = TQDateTime::tqcurrentDateTime();
-+		istats.time_started_ul = istats.time_started_dl = TQDateTime::currentDateTime();
- 		resetTrackerStats();
- 		
- 		if (prealloc)
-@@ -408,7 +408,7 @@ namespace bt
- 
- 	void TorrentControl::stop(bool user,WaitJob* wjob)
- 	{
--		TQDateTime now = TQDateTime::tqcurrentDateTime();
-+		TQDateTime now = TQDateTime::currentDateTime();
- 		if(!stats.completed)
- 			istats.running_time_dl += istats.time_started_dl.secsTo(now);
- 		istats.running_time_ul += istats.time_started_ul.secsTo(now);
-@@ -992,7 +992,7 @@ namespace bt
- 		
- 		if (stats.running)
- 		{
--			TQDateTime now = TQDateTime::tqcurrentDateTime();
-+			TQDateTime now = TQDateTime::currentDateTime();
- 			st.write("RUNNING_TIME_DL",TQString("%1").tqarg(istats.running_time_dl + istats.time_started_dl.secsTo(now)));
- 			st.write("RUNNING_TIME_UL",TQString("%1").tqarg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
- 		}
-@@ -1222,7 +1222,7 @@ namespace bt
- 		if (!stats.running || stats.completed)
- 			return istats.running_time_dl;
- 		else
--			return istats.running_time_dl + istats.time_started_dl.secsTo(TQDateTime::tqcurrentDateTime());
-+			return istats.running_time_dl + istats.time_started_dl.secsTo(TQDateTime::currentDateTime());
- 	}
- 
- 	Uint32 TorrentControl::getRunningTimeUL() const
-@@ -1230,7 +1230,7 @@ namespace bt
- 		if (!stats.running)
- 			return istats.running_time_ul;
- 		else
--			return istats.running_time_ul + istats.time_started_ul.secsTo(TQDateTime::tqcurrentDateTime());
-+			return istats.running_time_ul + istats.time_started_ul.secsTo(TQDateTime::currentDateTime());
- 	}
- 
- 	Uint32 TorrentControl::getNumFiles() const
-diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
-index 6030e99..2cb53da 100644
---- a/libktorrent/util/log.cpp
-+++ b/libktorrent/util/log.cpp
-@@ -116,7 +116,7 @@ namespace bt
- 			// this could result in the loss of some messages
- 			if (!rotate_job) 
- 			{
--				*out << TQDateTime::tqcurrentDateTime().toString() << ": " << tmp << ::endl;
-+				*out << TQDateTime::currentDateTime().toString() << ": " << tmp << ::endl;
- 				fptr.flush();
- 				if (to_cout)
- 					std::cout << TQString(tmp.local8Bit()) << std::endl;
-diff --git a/plugins/infowidget/chunkbar.cpp b/plugins/infowidget/chunkbar.cpp
-index ad6dfd6..06fed4a 100644
---- a/plugins/infowidget/chunkbar.cpp
-+++ b/plugins/infowidget/chunkbar.cpp
-@@ -71,15 +71,15 @@ namespace kt
- 		TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory();
- 		
- 		TQImage excluded(16, 16, 32);
--		FillAndFrameBlack(&excluded, TQColor(bar->tqcolorGroup().color(TQColorGroup::Mid)).pixel(), 16);
-+		FillAndFrameBlack(&excluded, TQColor(bar->colorGroup().color(TQColorGroup::Mid)).pixel(), 16);
- 		factory->setImage("excluded_color", excluded);
- 		
- 		TQImage available(16, 16, 32);
--		FillAndFrameBlack(&available, bar->tqcolorGroup().highlight().pixel(), 16);
-+		FillAndFrameBlack(&available, bar->colorGroup().highlight().pixel(), 16);
- 		factory->setImage("available_color", available);
- 		
- 		TQImage unavailable(16, 16, 32);
--		FillAndFrameBlack(&unavailable, bar->tqcolorGroup().base().pixel(), 16);
-+		FillAndFrameBlack(&unavailable, bar->colorGroup().base().pixel(), 16);
- 		factory->setImage("unavailable_color", unavailable);
- 	}
- 	
-@@ -121,7 +121,7 @@ namespace kt
- 		//	PROFILE("ChunkBar::updateBar");
- 		//	Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
- 			pixmap.resize(s);
--			pixmap.fill(tqcolorGroup().color(TQColorGroup::Base));
-+			pixmap.fill(colorGroup().color(TQColorGroup::Base));
- 			TQPainter painter(&pixmap);
- 			drawBarContents(&painter);
- 			update();
-@@ -132,9 +132,9 @@ namespace kt
- 	{
- 		// first draw background
- 		if (isEnabled())
--			p->setBrush(tqcolorGroup().base());
-+			p->setBrush(colorGroup().base());
- 		else
--			p->setBrush(tqcolorGroup().background());
-+			p->setBrush(colorGroup().background());
- 	
- 		p->setPen(TQt::NoPen);
- 		p->drawRect(contentsRect());
-@@ -148,7 +148,7 @@ namespace kt
- 		TQSize s = contentsRect().size();
- 		//Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
- 		pixmap.resize(s);
--		pixmap.fill(tqcolorGroup().color(TQColorGroup::Base));
-+		pixmap.fill(colorGroup().color(TQColorGroup::Base));
- 		TQPainter painter(&pixmap);
- 		drawBarContents(&painter);
- 		update();
-@@ -164,15 +164,15 @@ namespace kt
- 			const BitSet & bs = getBitSet();
- 			curr = bs;
- 			if (bs.allOn())
--				drawAllOn(p,tqcolorGroup().highlight());
-+				drawAllOn(p,colorGroup().highlight());
- 			else if (s.total_chunks > w)
--				drawMoreChunksThenPixels(p,bs,tqcolorGroup().highlight());
-+				drawMoreChunksThenPixels(p,bs,colorGroup().highlight());
- 			else
--				drawEqual(p,bs,tqcolorGroup().highlight());
-+				drawEqual(p,bs,colorGroup().highlight());
- 	
- 			if (show_excluded && s.num_chunks_excluded > 0)
- 			{
--				TQColor c = tqcolorGroup().color(TQColorGroup::Mid);
-+				TQColor c = colorGroup().color(TQColorGroup::Mid);
- 				if (curr_ebs.allOn())
- 					drawAllOn(p,c);
- 				else if (s.total_chunks > w)
-@@ -186,7 +186,7 @@ namespace kt
- 	
- 	void ChunkBar::drawEqual(TQPainter *p,const BitSet & bs,const TQColor & color)
- 	{
--		//p->setPen(TQPen(tqcolorGroup().highlight(),1,TQt::SolidLine));
-+		//p->setPen(TQPen(colorGroup().highlight(),1,TQt::SolidLine));
- 		TQColor c = color;
- 	
- 		Uint32 w = contentsRect().width();
-diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/plugins/infowidget/chunkdownloadviewbase.ui
-index 82db212..01386e0 100644
---- a/plugins/infowidget/chunkdownloadviewbase.ui
-+++ b/plugins/infowidget/chunkdownloadviewbase.ui
-@@ -47,7 +47,7 @@
-                             <property name="name">
-                                 <cstring>m_total_chunks</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>50</width>
-                                     <height>0</height>
-@@ -85,7 +85,7 @@
-                             <property name="name">
-                                 <cstring>m_chunks_downloading</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>50</width>
-                                     <height>0</height>
-@@ -123,7 +123,7 @@
-                             <property name="name">
-                                 <cstring>m_chunks_downloaded</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>50</width>
-                                     <height>0</height>
-@@ -161,7 +161,7 @@
-                             <property name="name">
-                                 <cstring>m_excluded_chunks</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>50</width>
-                                     <height>0</height>
-@@ -199,7 +199,7 @@
-                             <property name="name">
-                                 <cstring>m_chunks_left</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>50</width>
-                                     <height>0</height>
-@@ -237,7 +237,7 @@
-                             <property name="name">
-                                 <cstring>m_size_chunks</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>80</width>
-                                     <height>0</height>
-@@ -265,7 +265,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp
-index 35f5c42..883c7a0 100644
---- a/plugins/infowidget/floatspinbox.cpp
-+++ b/plugins/infowidget/floatspinbox.cpp
-@@ -43,7 +43,7 @@ kt::FloatSpinBox::FloatSpinBox(
- 	setStep( 0.25f );
- 	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
- 	setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) ));
--	editor()->tqsetAlignment(TQt::AlignRight);
-+	editor()->setAlignment(TQt::AlignRight);
- }
- 
- kt::FloatSpinBox::FloatSpinBox(
-diff --git a/plugins/infowidget/iwpref.ui b/plugins/infowidget/iwpref.ui
-index ed4a9e1..a26160b 100644
---- a/plugins/infowidget/iwpref.ui
-+++ b/plugins/infowidget/iwpref.ui
-@@ -45,7 +45,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>21</height>
-diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp
-index 7317437..dee05fc 100644
---- a/plugins/infowidget/statustab.cpp
-+++ b/plugins/infowidget/statustab.cpp
-@@ -37,7 +37,7 @@ namespace kt
- 	StatusTab::StatusTab(TQWidget* parent, const char* name, WFlags fl)
- 			: StatusTabBase(parent,name,fl),curr_tc(0)
- 	{
--		TQColorGroup cg = tqcolorGroup();
-+		TQColorGroup cg = colorGroup();
- 		// do not use hardcoded colors
- 		m_info_caption->setPaletteBackgroundColor(cg.mid());
- 		m_chunks_caption->setPaletteBackgroundColor(cg.mid());
-diff --git a/plugins/infowidget/statustabbase.ui b/plugins/infowidget/statustabbase.ui
-index 0a73993..f50e503 100644
---- a/plugins/infowidget/statustabbase.ui
-+++ b/plugins/infowidget/statustabbase.ui
-@@ -75,7 +75,7 @@
-                             <property name="name">
-                                 <cstring>m_seeders</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -95,7 +95,7 @@
-                             <property name="name">
-                                 <cstring>m_leechers</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -133,7 +133,7 @@
-                             <property name="name">
-                                 <cstring>m_avg_down</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -153,7 +153,7 @@
-                             <property name="name">
-                                 <cstring>m_avg_up</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -207,7 +207,7 @@
-                             <property name="name">
-                                 <cstring>m_tracker_status</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -227,7 +227,7 @@
-                             <property name="name">
-                                 <cstring>m_tracker_update_time</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>100</width>
-                                     <height>0</height>
-@@ -255,7 +255,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>207</width>
-                             <height>20</height>
-@@ -344,7 +344,7 @@
-                                             <verstretch>0</verstretch>
-                                         </sizepolicy>
-                                     </property>
--                                    <property name="tqminimumSize">
-+                                    <property name="minimumSize">
-                                         <size>
-                                             <width>0</width>
-                                             <height>20</height>
-@@ -379,7 +379,7 @@
-                                             <verstretch>0</verstretch>
-                                         </sizepolicy>
-                                     </property>
--                                    <property name="tqminimumSize">
-+                                    <property name="minimumSize">
-                                         <size>
-                                             <width>0</width>
-                                             <height>20</height>
-@@ -398,7 +398,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>16</height>
-@@ -477,7 +477,7 @@
-                                             <verstretch>0</verstretch>
-                                         </sizepolicy>
-                                     </property>
--                                    <property name="tqminimumSize">
-+                                    <property name="minimumSize">
-                                         <size>
-                                             <width>20</width>
-                                             <height>0</height>
-@@ -515,7 +515,7 @@
-                                                     <verstretch>0</verstretch>
-                                                 </sizepolicy>
-                                             </property>
--                                            <property name="tqminimumSize">
-+                                            <property name="minimumSize">
-                                                 <size>
-                                                     <width>20</width>
-                                                     <height>0</height>
-@@ -561,7 +561,7 @@
-                                     <property name="name">
-                                         <cstring>m_share_ratio</cstring>
-                                     </property>
--                                    <property name="tqminimumSize">
-+                                    <property name="minimumSize">
-                                         <size>
-                                             <width>50</width>
-                                             <height>0</height>
-@@ -589,7 +589,7 @@
-                             <property name="sizeType">
-                                 <enum>MinimumExpanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>20</width>
-                                     <height>20</height>
-diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp
-index c928a7f..7a84f12 100644
---- a/plugins/infowidget/trackerview.cpp
-+++ b/plugins/infowidget/trackerview.cpp
-@@ -167,7 +167,7 @@ namespace kt
- 		// only enable change when we can actually change and the torrent is running
- 		btnChange->setEnabled(s.running && listTrackers->childCount() > 1);
- 
--		lbltqStatus->setText("<b>" + s.trackerstatus + "</b>");
-+		lblStatus->setText("<b>" + s.trackerstatus + "</b>");
- 		if (tc->getTrackersList())
- 		{
- 			TQString t = tc->getTrackersList()->getTrackerURL().prettyURL();
-@@ -191,7 +191,7 @@ namespace kt
- 		listTrackers->clear();
- 		if(!tc)
- 		{
--			lbltqStatus->clear();
-+			lblStatus->clear();
- 			lblCurrent->clear();
- 			lblUpdate->clear();
- 			txtTracker->clear();
-diff --git a/plugins/infowidget/trackerviewbase.ui b/plugins/infowidget/trackerviewbase.ui
-index 154842b..ef49ec3 100644
---- a/plugins/infowidget/trackerviewbase.ui
-+++ b/plugins/infowidget/trackerviewbase.ui
-@@ -85,7 +85,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>68</height>
-@@ -180,7 +180,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-@@ -205,7 +205,7 @@
-                 </widget>
-                 <widget class="TQLabel">
-                     <property name="name">
--                        <cstring>lbltqStatus</cstring>
-+                        <cstring>lblStatus</cstring>
-                     </property>
-                     <property name="sizePolicy">
-                         <sizepolicy>
-@@ -229,7 +229,7 @@
-                     <property name="sizeType">
-                         <enum>Fixed</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>16</width>
-                             <height>20</height>
-diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui
-index 640e786..a77b639 100644
---- a/plugins/ipfilter/convert_dlg.ui
-+++ b/plugins/ipfilter/convert_dlg.ui
-@@ -73,7 +73,7 @@
-                     <verstretch>0</verstretch>
-                 </sizepolicy>
-             </property>
--            <property name="tqminimumSize">
-+            <property name="minimumSize">
-                 <size>
-                     <width>390</width>
-                     <height>0</height>
-diff --git a/plugins/ipfilter/ipblockingpref.ui b/plugins/ipfilter/ipblockingpref.ui
-index 44d48a9..a74fe6d 100644
---- a/plugins/ipfilter/ipblockingpref.ui
-+++ b/plugins/ipfilter/ipblockingpref.ui
-@@ -29,7 +29,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>20</height>
-@@ -108,7 +108,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>361</width>
-                                     <height>20</height>
-@@ -152,7 +152,7 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string>
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>20</height>
-diff --git a/plugins/logviewer/logprefwidgetbase.ui b/plugins/logviewer/logprefwidgetbase.ui
-index f940a87..1fcf3bb 100644
---- a/plugins/logviewer/logprefwidgetbase.ui
-+++ b/plugins/logviewer/logprefwidgetbase.ui
-@@ -29,7 +29,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>110</height>
-diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
-index ac3e02e..8107191 100644
---- a/plugins/logviewer/logviewer.cpp
-+++ b/plugins/logviewer/logviewer.cpp
-@@ -50,7 +50,7 @@ namespace kt
- 		setTextFormat(TQt::LogText);
- 		setMaxLogLines(200);
- 		setMinimumSize(TQSize(0,50));
--		tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
-+		setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
- 		KGlobal::config()->setGroup("LogViewer");
- 		if (KGlobal::config()->hasKey("LogViewerWidgetSize"))
- 		{
-diff --git a/plugins/partfileimport/importdlgbase.ui b/plugins/partfileimport/importdlgbase.ui
-index 9d1dd95..f171831 100644
---- a/plugins/partfileimport/importdlgbase.ui
-+++ b/plugins/partfileimport/importdlgbase.ui
-@@ -39,7 +39,7 @@
-                             <property name="name">
-                                 <cstring>textLabel1</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>60</width>
-                                     <height>0</height>
-@@ -53,7 +53,7 @@
-                             <property name="name">
-                                 <cstring>textLabel2</cstring>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>60</width>
-                                     <height>0</height>
-@@ -118,7 +118,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>61</width>
-                             <height>20</height>
-diff --git a/plugins/rssfeed/rss/article.cpp b/plugins/rssfeed/rss/article.cpp
-index 9e52589..47413b3 100644
---- a/plugins/rssfeed/rss/article.cpp
-+++ b/plugins/rssfeed/rss/article.cpp
-@@ -54,7 +54,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
- 
- 	d->numComments=0;
- 
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
- 		d->title = elemText;
-    
- 
-@@ -62,14 +62,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
- 	bool foundTorrentEnclosure = false;
- 	for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
- 		const TQDomElement e = n.toElement();
--		if ( (e.tagName()==TQString::tqfromLatin1("enclosure") ) )
-+		if ( (e.tagName()==TQString::fromLatin1("enclosure") ) )
- 			{
--			TQString enclosureAttr = e.attribute(TQString::tqfromLatin1("type"));
-+			TQString enclosureAttr = e.attribute(TQString::fromLatin1("type"));
- 			if (!enclosureAttr.isNull() )
- 				{
- 				if (enclosureAttr == "application/x-bittorrent")
- 					{
--					enclosureAttr = e.attribute(TQString::tqfromLatin1("url"));
-+					enclosureAttr = e.attribute(TQString::fromLatin1("url"));
- 					if (!enclosureAttr.isNull() )
- 						{
- 						d->link=enclosureAttr;
-@@ -88,41 +88,41 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
- 			TQDomNode n;
- 			for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
- 				const TQDomElement e = n.toElement();
--				if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
--					(e.attribute(TQString::tqfromLatin1("rel"))==TQString::tqfromLatin1("alternate")))
-+				if ( (e.tagName()==TQString::fromLatin1("link")) &&
-+					(e.attribute(TQString::fromLatin1("rel"))==TQString::fromLatin1("alternate")))
- 					{   
--						d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
-+						d->link=n.toElement().attribute(TQString::fromLatin1("href"));
- 						break;
- 					}
- 			}
- 		}
- 		else
- 		{
--			if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
-+			if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
- 				d->link = elemText;
- 		}
- 	}
- 
- 
-     // prefer content/content:encoded over summary/description for feeds that provide it
--    TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
-+    TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
-     
-     if (!(elemText = extractNode(node, tagName, false)).isNull())
-         d->description = elemText;
-     
-     if (d->description.isEmpty())
-     {
--		if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
-+		if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
- 	    	d->description = elemText;
-     
- 		if (d->description.isEmpty())  // 3rd try: see http://www.intertwingly.net/blog/1299.html
- 		{
--			if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
-+			if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
- 				d->description = elemText;
- 		}
-     }
-     
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull())
-     {
- 		time_t _time;
- 		if (format==AtomFeed)
-@@ -134,7 +134,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
-         if (_time != 0)
- 		  d->pubDate.setTime_t(_time);
- 	}
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
-     {
- 		time_t _time = parseISO8601Date(elemText);
- 
-@@ -146,23 +146,23 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
- 	//no luck so far - so let's set it to the current time
- 	if (!d->pubDate.isValid())
- 	{
--		d->pubDate = TQDateTime::tqcurrentDateTime();
-+		d->pubDate = TQDateTime::currentDateTime();
- 	}
- 	
- 
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
- 		d->commentsLink = elemText;
- 	}
- 
--    if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
-+    if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
-         d->numComments = elemText.toInt();
-     }
- 
--    tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
-+    tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
-     n = node.namedItem(tagName);
- 	if (!n.isNull()) {
- 		d->guidIsPermaLink = (format==AtomFeed)? false : true;
--		if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
-+		if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
- 
- 		if (!(elemText = extractNode(node, tagName)).isNull())
- 			d->guid = elemText;
-@@ -176,14 +176,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
- 		md5Machine.update(d->title.utf8());
- 		md5Machine.update(d->description.utf8());
- 		d->guid = TQString(md5Machine.hexDigest().data());
--        d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
-+        d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
- 	}
- 
-     for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling())
-     {
--        if (i.isElement() && i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
-+        if (i.isElement() && i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
-         {
--            TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
-+            TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
-             d->meta[type] = i.toElement().text();
-         }
-     }
-diff --git a/plugins/rssfeed/rss/document.cpp b/plugins/rssfeed/rss/document.cpp
-index c65e263..d820613 100644
---- a/plugins/rssfeed/rss/document.cpp
-+++ b/plugins/rssfeed/rss/document.cpp
-@@ -79,42 +79,42 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-     TQString attr;
- 
-     // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
--    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
-+    if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
-         d->valid=false;
-     else
-         d->valid=true;
-     
--    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
-+    attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
-     if (!attr.isNull()) {
-         if (rootNode.toElement().tagName()=="feed")
-         {
-             d->format=AtomFeed;
--            if (attr == TQString::tqfromLatin1("0.3"))
-+            if (attr == TQString::fromLatin1("0.3"))
-                 d->version = vAtom_0_3;
--            else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
-+            else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
-                d->version = vAtom_0_2;
--            else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
-+            else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
-               d->version = vAtom_0_1;
-         }
-         else
-         {
-             d->format=RSSFeed;
--            if (attr == TQString::tqfromLatin1("0.91"))
-+            if (attr == TQString::fromLatin1("0.91"))
-                 d->version = v0_91;
--            else if (attr == TQString::tqfromLatin1("0.92"))
-+            else if (attr == TQString::fromLatin1("0.92"))
-                 d->version = v0_92;
--            else if (attr == TQString::tqfromLatin1("0.93"))
-+            else if (attr == TQString::fromLatin1("0.93"))
-                 d->version = v0_93;
--            else if (attr == TQString::tqfromLatin1("0.94"))
-+            else if (attr == TQString::fromLatin1("0.94"))
-                 d->version = v0_94;
--            else if (attr.startsWith("2.0") || attr == TQString::tqfromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
-+            else if (attr.startsWith("2.0") || attr == TQString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
-                 d->version = v2_0;
-         }
-     }
- 
-     if (d->format==UnknownFormat)
-     {
--        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString());
-+        attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
-         if (!attr.isNull()) {
-         /*
-          * Hardcoding these URLs is actually a bad idea, since the DTD doesn't
-@@ -124,11 +124,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-          * distinguish the RSS versions by analyzing the relationship between
-          * the nodes.
-          */
--            if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
-+            if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
-                 d->format=RSSFeed;
-                 d->version = v0_90;
-              }
--            else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
-+            else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
-                 d->format=RSSFeed;
-                 d->version = v1_0;
-             }
-@@ -140,13 +140,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-     if (d->format == AtomFeed)
-         channelNode=rootNode;
-     else
--        channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
-+        channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
- 
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("title"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("title"))).isNull())
-         d->title = elemText;
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("description"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("description"))).isNull())
-         d->description = elemText;
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("link"))).isNull())
-         d->link = elemText;
- 
-     
-@@ -159,27 +159,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-     else
-     {
- 	// following is a HACK for broken 0.91 feeds like xanga.com's
--	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
-+	if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
- 	    parentNode = rootNode;
- 	else
-             parentNode = channelNode;
-     }
-     
-     // image and textinput aren't supported by Atom.. handle in case feed provides
--    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
-+    TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
-     if (!n.isNull())
-         d->image = new Image(n);
- 
--    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
-+    n = parentNode.namedItem(TQString::fromLatin1("textinput"));
-     if (!n.isNull())
-         d->textInput = new TextInput(n);
- 
-     // Our (hopefully faster) version of elementsByTagName()
-     TQString tagName;
-     if (d->format == AtomFeed)
--        tagName=TQString::tqfromLatin1("entry");
-+        tagName=TQString::fromLatin1("entry");
-     else
--        tagName=TQString::tqfromLatin1("item");
-+        tagName=TQString::fromLatin1("item");
- 
-     for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
-         const TQDomElement e = n.toElement();
-@@ -187,212 +187,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-             d->articles.append(Article(e, d->format));
-     }
- 
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
-         d->copyright = elemText;
- 
-     if (d->format == AtomFeed)
--        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
-+        elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
-     else
--        elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
-+        elemText = extractNode(channelNode, TQString::fromLatin1("language"));
- 
-     if (!elemText.isNull()){
--        if (elemText == TQString::tqfromLatin1("af"))
-+        if (elemText == TQString::fromLatin1("af"))
-             d->language = af;
--        else if (elemText == TQString::tqfromLatin1("sq"))
-+        else if (elemText == TQString::fromLatin1("sq"))
-             d->language = sq;
--        else if (elemText == TQString::tqfromLatin1("eu"))
-+        else if (elemText == TQString::fromLatin1("eu"))
-             d->language = eu;
--        else if (elemText == TQString::tqfromLatin1("be"))
-+        else if (elemText == TQString::fromLatin1("be"))
-             d->language = be;
--        else if (elemText == TQString::tqfromLatin1("bg"))
-+        else if (elemText == TQString::fromLatin1("bg"))
-             d->language = bg;
--        else if (elemText == TQString::tqfromLatin1("ca"))
-+        else if (elemText == TQString::fromLatin1("ca"))
-             d->language = ca;
--        else if (elemText == TQString::tqfromLatin1("zh-cn"))
-+        else if (elemText == TQString::fromLatin1("zh-cn"))
-             d->language = zh_cn;
--        else if (elemText == TQString::tqfromLatin1("zh-tw"))
-+        else if (elemText == TQString::fromLatin1("zh-tw"))
-             d->language = zh_tw;
--        else if (elemText == TQString::tqfromLatin1("hr"))
-+        else if (elemText == TQString::fromLatin1("hr"))
-             d->language = hr;
--        else if (elemText == TQString::tqfromLatin1("cs"))
-+        else if (elemText == TQString::fromLatin1("cs"))
-             d->language = cs;
--        else if (elemText == TQString::tqfromLatin1("da"))
-+        else if (elemText == TQString::fromLatin1("da"))
-             d->language = da;
--        else if (elemText == TQString::tqfromLatin1("nl"))
-+        else if (elemText == TQString::fromLatin1("nl"))
-             d->language = nl;
--        else if (elemText == TQString::tqfromLatin1("nl-be"))
-+        else if (elemText == TQString::fromLatin1("nl-be"))
-             d->language = nl_be;
--        else if (elemText == TQString::tqfromLatin1("nl-nl"))
-+        else if (elemText == TQString::fromLatin1("nl-nl"))
-             d->language = nl_nl;
--        else if (elemText == TQString::tqfromLatin1("en"))
-+        else if (elemText == TQString::fromLatin1("en"))
-             d->language = en;
--        else if (elemText == TQString::tqfromLatin1("en-au"))
-+        else if (elemText == TQString::fromLatin1("en-au"))
-             d->language = en_au;
--        else if (elemText == TQString::tqfromLatin1("en-bz"))
-+        else if (elemText == TQString::fromLatin1("en-bz"))
-             d->language = en_bz;
--        else if (elemText == TQString::tqfromLatin1("en-ca"))
-+        else if (elemText == TQString::fromLatin1("en-ca"))
-             d->language = en_ca;
--        else if (elemText == TQString::tqfromLatin1("en-ie"))
-+        else if (elemText == TQString::fromLatin1("en-ie"))
-             d->language = en_ie;
--        else if (elemText == TQString::tqfromLatin1("en-jm"))
-+        else if (elemText == TQString::fromLatin1("en-jm"))
-             d->language = en_jm;
--        else if (elemText == TQString::tqfromLatin1("en-nz"))
-+        else if (elemText == TQString::fromLatin1("en-nz"))
-             d->language = en_nz;
--        else if (elemText == TQString::tqfromLatin1("en-ph"))
-+        else if (elemText == TQString::fromLatin1("en-ph"))
-             d->language = en_ph;
--        else if (elemText == TQString::tqfromLatin1("en-za"))
-+        else if (elemText == TQString::fromLatin1("en-za"))
-             d->language = en_za;
--        else if (elemText == TQString::tqfromLatin1("en-tt"))
-+        else if (elemText == TQString::fromLatin1("en-tt"))
-             d->language = en_tt;
--        else if (elemText == TQString::tqfromLatin1("en-gb"))
-+        else if (elemText == TQString::fromLatin1("en-gb"))
-             d->language = en_gb;
--        else if (elemText == TQString::tqfromLatin1("en-us"))
-+        else if (elemText == TQString::fromLatin1("en-us"))
-             d->language = en_us;
--        else if (elemText == TQString::tqfromLatin1("en-zw"))
-+        else if (elemText == TQString::fromLatin1("en-zw"))
-             d->language = en_zw;
--        else if (elemText == TQString::tqfromLatin1("fo"))
-+        else if (elemText == TQString::fromLatin1("fo"))
-             d->language = fo;
--        else if (elemText == TQString::tqfromLatin1("fi"))
-+        else if (elemText == TQString::fromLatin1("fi"))
-             d->language = fi;
--        else if (elemText == TQString::tqfromLatin1("fr"))
-+        else if (elemText == TQString::fromLatin1("fr"))
-             d->language = fr;
--        else if (elemText == TQString::tqfromLatin1("fr-be"))
-+        else if (elemText == TQString::fromLatin1("fr-be"))
-             d->language = fr_be;
--        else if (elemText == TQString::tqfromLatin1("fr-ca"))
-+        else if (elemText == TQString::fromLatin1("fr-ca"))
-             d->language = fr_ca;
--        else if (elemText == TQString::tqfromLatin1("fr-fr"))
-+        else if (elemText == TQString::fromLatin1("fr-fr"))
-             d->language = fr_fr;
--        else if (elemText == TQString::tqfromLatin1("fr-lu"))
-+        else if (elemText == TQString::fromLatin1("fr-lu"))
-             d->language = fr_lu;
--        else if (elemText == TQString::tqfromLatin1("fr-mc"))
-+        else if (elemText == TQString::fromLatin1("fr-mc"))
-             d->language = fr_mc;
--        else if (elemText == TQString::tqfromLatin1("fr-ch"))
-+        else if (elemText == TQString::fromLatin1("fr-ch"))
-             d->language = fr_ch;
--        else if (elemText == TQString::tqfromLatin1("gl"))
-+        else if (elemText == TQString::fromLatin1("gl"))
-             d->language = gl;
--        else if (elemText == TQString::tqfromLatin1("gd"))
-+        else if (elemText == TQString::fromLatin1("gd"))
-             d->language = gd;
--        else if (elemText == TQString::tqfromLatin1("de"))
-+        else if (elemText == TQString::fromLatin1("de"))
-             d->language = de;
--        else if (elemText == TQString::tqfromLatin1("de-at"))
-+        else if (elemText == TQString::fromLatin1("de-at"))
-             d->language = de_at;
--        else if (elemText == TQString::tqfromLatin1("de-de"))
-+        else if (elemText == TQString::fromLatin1("de-de"))
-             d->language = de_de;
--        else if (elemText == TQString::tqfromLatin1("de-li"))
-+        else if (elemText == TQString::fromLatin1("de-li"))
-             d->language = de_li;
--        else if (elemText == TQString::tqfromLatin1("de-lu"))
-+        else if (elemText == TQString::fromLatin1("de-lu"))
-             d->language = de_lu;
--        else if (elemText == TQString::tqfromLatin1("de-ch"))
-+        else if (elemText == TQString::fromLatin1("de-ch"))
-             d->language = de_ch;
--        else if (elemText == TQString::tqfromLatin1("el"))
-+        else if (elemText == TQString::fromLatin1("el"))
-             d->language = el;
--        else if (elemText == TQString::tqfromLatin1("hu"))
-+        else if (elemText == TQString::fromLatin1("hu"))
-             d->language = hu;
--        else if (elemText == TQString::tqfromLatin1("is"))
-+        else if (elemText == TQString::fromLatin1("is"))
-             d->language = is;
--        else if (elemText == TQString::tqfromLatin1("id"))
-+        else if (elemText == TQString::fromLatin1("id"))
-             d->language = id;
--        else if (elemText == TQString::tqfromLatin1("ga"))
-+        else if (elemText == TQString::fromLatin1("ga"))
-             d->language = ga;
--        else if (elemText == TQString::tqfromLatin1("it"))
-+        else if (elemText == TQString::fromLatin1("it"))
-             d->language = it;
--        else if (elemText == TQString::tqfromLatin1("it-it"))
-+        else if (elemText == TQString::fromLatin1("it-it"))
-             d->language = it_it;
--        else if (elemText == TQString::tqfromLatin1("it-ch"))
-+        else if (elemText == TQString::fromLatin1("it-ch"))
-             d->language = it_ch;
--        else if (elemText == TQString::tqfromLatin1("ja"))
-+        else if (elemText == TQString::fromLatin1("ja"))
-             d->language = ja;
--        else if (elemText == TQString::tqfromLatin1("ko"))
-+        else if (elemText == TQString::fromLatin1("ko"))
-             d->language = ko;
--        else if (elemText == TQString::tqfromLatin1("mk"))
-+        else if (elemText == TQString::fromLatin1("mk"))
-             d->language = mk;
--        else if (elemText == TQString::tqfromLatin1("no"))
-+        else if (elemText == TQString::fromLatin1("no"))
-             d->language = no;
--        else if (elemText == TQString::tqfromLatin1("pl"))
-+        else if (elemText == TQString::fromLatin1("pl"))
-             d->language = pl;
--        else if (elemText == TQString::tqfromLatin1("pt"))
-+        else if (elemText == TQString::fromLatin1("pt"))
-             d->language = pt;
--        else if (elemText == TQString::tqfromLatin1("pt-br"))
-+        else if (elemText == TQString::fromLatin1("pt-br"))
-             d->language = pt_br;
--        else if (elemText == TQString::tqfromLatin1("pt-pt"))
-+        else if (elemText == TQString::fromLatin1("pt-pt"))
-             d->language = pt_pt;
--        else if (elemText == TQString::tqfromLatin1("ro"))
-+        else if (elemText == TQString::fromLatin1("ro"))
-             d->language = ro;
--        else if (elemText == TQString::tqfromLatin1("ro-mo"))
-+        else if (elemText == TQString::fromLatin1("ro-mo"))
-             d->language = ro_mo;
--        else if (elemText == TQString::tqfromLatin1("ro-ro"))
-+        else if (elemText == TQString::fromLatin1("ro-ro"))
-             d->language = ro_ro;
--        else if (elemText == TQString::tqfromLatin1("ru"))
-+        else if (elemText == TQString::fromLatin1("ru"))
-             d->language = ru;
--        else if (elemText == TQString::tqfromLatin1("ru-mo"))
-+        else if (elemText == TQString::fromLatin1("ru-mo"))
-             d->language = ru_mo;
--        else if (elemText == TQString::tqfromLatin1("ru-ru"))
-+        else if (elemText == TQString::fromLatin1("ru-ru"))
-             d->language = ru_ru;
--        else if (elemText == TQString::tqfromLatin1("sr"))
-+        else if (elemText == TQString::fromLatin1("sr"))
-             d->language = sr;
--        else if (elemText == TQString::tqfromLatin1("sk"))
-+        else if (elemText == TQString::fromLatin1("sk"))
-             d->language = sk;
--        else if (elemText == TQString::tqfromLatin1("sl"))
-+        else if (elemText == TQString::fromLatin1("sl"))
-             d->language = sl;
--        else if (elemText == TQString::tqfromLatin1("es"))
-+        else if (elemText == TQString::fromLatin1("es"))
-             d->language = es;
--        else if (elemText == TQString::tqfromLatin1("es-ar"))
-+        else if (elemText == TQString::fromLatin1("es-ar"))
-             d->language = es_ar;
--        else if (elemText == TQString::tqfromLatin1("es-bo"))
-+        else if (elemText == TQString::fromLatin1("es-bo"))
-             d->language = es_bo;
--        else if (elemText == TQString::tqfromLatin1("es-cl"))
-+        else if (elemText == TQString::fromLatin1("es-cl"))
-             d->language = es_cl;
--        else if (elemText == TQString::tqfromLatin1("es-co"))
-+        else if (elemText == TQString::fromLatin1("es-co"))
-             d->language = es_co;
--        else if (elemText == TQString::tqfromLatin1("es-cr"))
-+        else if (elemText == TQString::fromLatin1("es-cr"))
-             d->language = es_cr;
--        else if (elemText == TQString::tqfromLatin1("es-do"))
-+        else if (elemText == TQString::fromLatin1("es-do"))
-             d->language = es_do;
--        else if (elemText == TQString::tqfromLatin1("es-ec"))
-+        else if (elemText == TQString::fromLatin1("es-ec"))
-             d->language = es_ec;
--        else if (elemText == TQString::tqfromLatin1("es-sv"))
-+        else if (elemText == TQString::fromLatin1("es-sv"))
-             d->language = es_sv;
--        else if (elemText == TQString::tqfromLatin1("es-gt"))
-+        else if (elemText == TQString::fromLatin1("es-gt"))
-             d->language = es_gt;
--        else if (elemText == TQString::tqfromLatin1("es-hn"))
-+        else if (elemText == TQString::fromLatin1("es-hn"))
-             d->language = es_hn;
--        else if (elemText == TQString::tqfromLatin1("es-mx"))
-+        else if (elemText == TQString::fromLatin1("es-mx"))
-             d->language = es_mx;
--        else if (elemText == TQString::tqfromLatin1("es-ni"))
-+        else if (elemText == TQString::fromLatin1("es-ni"))
-             d->language = es_ni;
--        else if (elemText == TQString::tqfromLatin1("es-pa"))
-+        else if (elemText == TQString::fromLatin1("es-pa"))
-             d->language = es_pa;
--        else if (elemText == TQString::tqfromLatin1("es-py"))
-+        else if (elemText == TQString::fromLatin1("es-py"))
-             d->language = es_py;
--        else if (elemText == TQString::tqfromLatin1("es-pe"))
-+        else if (elemText == TQString::fromLatin1("es-pe"))
-             d->language = es_pe;
--        else if (elemText == TQString::tqfromLatin1("es-pr"))
-+        else if (elemText == TQString::fromLatin1("es-pr"))
-             d->language = es_pr;
--        else if (elemText == TQString::tqfromLatin1("es-es"))
-+        else if (elemText == TQString::fromLatin1("es-es"))
-             d->language = es_es;
--        else if (elemText == TQString::tqfromLatin1("es-uy"))
-+        else if (elemText == TQString::fromLatin1("es-uy"))
-             d->language = es_uy;
--        else if (elemText == TQString::tqfromLatin1("es-ve"))
-+        else if (elemText == TQString::fromLatin1("es-ve"))
-             d->language = es_ve;
--        else if (elemText == TQString::tqfromLatin1("sv"))
-+        else if (elemText == TQString::fromLatin1("sv"))
-             d->language = sv;
--        else if (elemText == TQString::tqfromLatin1("sv-fi"))
-+        else if (elemText == TQString::fromLatin1("sv-fi"))
-             d->language = sv_fi;
--        else if (elemText == TQString::tqfromLatin1("sv-se"))
-+        else if (elemText == TQString::fromLatin1("sv-se"))
-             d->language = sv_se;
--        else if (elemText == TQString::tqfromLatin1("tr"))
-+        else if (elemText == TQString::fromLatin1("tr"))
-             d->language = tr;
--        else if (elemText == TQString::tqfromLatin1("uk"))
-+        else if (elemText == TQString::fromLatin1("uk"))
-             d->language = uk;
-         else
-             d->language = UndefinedLanguage;
-     }
- 
-     if (d->format == AtomFeed)
--        tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
-+        tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
-                                                // but some broken feeds do this
-     else
--        tagName=TQString::tqfromLatin1("pubDate");
-+        tagName=TQString::fromLatin1("pubDate");
- 
-     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
-         time_t _time;
-@@ -408,7 +408,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-         d->pubDate.setTime_t(_time);
-     }
- 
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) {
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
-         time_t _time = parseISO8601Date(elemText);
-         /* \bug This isn't really the right way since it will set the date to
-          * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
-@@ -418,9 +418,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-     }
- 
-     if (d->format == AtomFeed)
--        tagName=TQString::tqfromLatin1("modified");
-+        tagName=TQString::fromLatin1("modified");
-     else
--        tagName=TQString::tqfromLatin1("lastBuildDate");
-+        tagName=TQString::fromLatin1("lastBuildDate");
-     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
-         time_t _time;
-         if (d->format == AtomFeed)
-@@ -430,44 +430,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
-         d->lastBuildDate.setTime_t(_time);
-     }
- 
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
-         d->rating = elemText;
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
-         d->docs = elemText;
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
-         d->managingEditor = elemText;
--    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
-+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
-         d->webMaster = elemText;
- 
--	if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
-+	if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
-         d->ttl = elemText.toUInt();
- 
--    n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
-+    n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
-     if (!n.isNull())
-         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
--            if (e.tagName() == TQString::tqfromLatin1("hour"))
-+            if (e.tagName() == TQString::fromLatin1("hour"))
-                 d->skipHours.append(e.text().toUInt());
- 
--    n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
-+    n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
-     if (!n.isNull()) {
-         Day day;
-         TQString elemText;
-         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
--            if (e.tagName() == TQString::tqfromLatin1("day")) {
-+            if (e.tagName() == TQString::fromLatin1("day")) {
-                 elemText = e.text().lower();
--                if (elemText == TQString::tqfromLatin1("monday"))
-+                if (elemText == TQString::fromLatin1("monday"))
-                     day = Monday;
--                else if (elemText == TQString::tqfromLatin1("tuesday"))
-+                else if (elemText == TQString::fromLatin1("tuesday"))
-                     day = Tuesday;
--                else if (elemText == TQString::tqfromLatin1("wednesday"))
-+                else if (elemText == TQString::fromLatin1("wednesday"))
-                     day = Wednesday;
--                else if (elemText == TQString::tqfromLatin1("thursday"))
-+                else if (elemText == TQString::fromLatin1("thursday"))
-                     day = Thursday;
--                else if (elemText == TQString::tqfromLatin1("friday"))
-+                else if (elemText == TQString::fromLatin1("friday"))
-                     day = Friday;
--                else if (elemText == TQString::tqfromLatin1("saturday"))
-+                else if (elemText == TQString::fromLatin1("saturday"))
-                     day = Saturday;
--                else if (elemText == TQString::tqfromLatin1("sunday"))
-+                else if (elemText == TQString::fromLatin1("sunday"))
-                     day = Sunday;
-                 else
-                     day = UndefinedDay;
-@@ -496,16 +496,16 @@ Version Document::version() const
- TQString Document::verbVersion() const
- {
-     switch (d->version) {
--        case v0_90: return TQString::tqfromLatin1("0.90");
--        case v0_91: return TQString::tqfromLatin1("0.91");
--        case v0_92: return TQString::tqfromLatin1("0.92");
--        case v0_93: return TQString::tqfromLatin1("0.93");
--        case v0_94: return TQString::tqfromLatin1("0.94");
--        case v1_0: return TQString::tqfromLatin1("1.0");
--        case v2_0: return TQString::tqfromLatin1("2.0");
--        case vAtom_0_3: return TQString::tqfromLatin1("0.3");
--        case vAtom_0_2: return TQString::tqfromLatin1("0.2");
--        case vAtom_0_1: return TQString::tqfromLatin1("0.1");
-+        case v0_90: return TQString::fromLatin1("0.90");
-+        case v0_91: return TQString::fromLatin1("0.91");
-+        case v0_92: return TQString::fromLatin1("0.92");
-+        case v0_93: return TQString::fromLatin1("0.93");
-+        case v0_94: return TQString::fromLatin1("0.94");
-+        case v1_0: return TQString::fromLatin1("1.0");
-+        case v2_0: return TQString::fromLatin1("2.0");
-+        case vAtom_0_3: return TQString::fromLatin1("0.3");
-+        case vAtom_0_2: return TQString::fromLatin1("0.2");
-+        case vAtom_0_1: return TQString::fromLatin1("0.1");
-     }
-     return TQString();
- }
-diff --git a/plugins/rssfeed/rss/global.h b/plugins/rssfeed/rss/global.h
-index e4bc7c7..92d3866 100644
---- a/plugins/rssfeed/rss/global.h
-+++ b/plugins/rssfeed/rss/global.h
-@@ -39,7 +39,7 @@ namespace RSS
- 	 * Possible status values returned by the signal
- 	 * Loader::loadingComplete().
- 	 */
--	enum tqStatus {
-+	enum Status {
- 		Success,	   /**
- 						* Nothing went wrong so far, but you still have to check
- 						* what values are returned by the classes since it's not
-diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
-index 98074be..cb8d7c8 100644
---- a/plugins/rssfeed/rss/image.cpp
-+++ b/plugins/rssfeed/rss/image.cpp
-@@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
- {
- 	TQString elemText;
- 
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
- 		d->title = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
- 		d->url = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
- 		d->link = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
- 		d->description = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
- 		d->height = elemText.toUInt();
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
- 		d->width = elemText.toUInt();
- }
- 
-diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
-index 835a2e6..6c5b3d5 100644
---- a/plugins/rssfeed/rss/loader.cpp
-+++ b/plugins/rssfeed/rss/loader.cpp
-@@ -240,7 +240,7 @@ Loader *Loader::create()
- Loader *Loader::create(TQObject *object, const char *slot)
- {
-    Loader *loader = create();
--   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
-+   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-            object, slot);
-    return loader;
- }
-@@ -300,7 +300,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
-    d->retriever = NULL;
- 
-    Document rssDoc;
--   tqStatus status = Success;
-+   Status status = Success;
- 
-    if (success) {
-       TQDomDocument doc;
-diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
-index 438ebaf..807bee5 100644
---- a/plugins/rssfeed/rss/loader.h
-+++ b/plugins/rssfeed/rss/loader.h
-@@ -209,8 +209,8 @@ namespace RSS
- 	 *
- 	 * \code
- 	 * Loader *loader = Loader::create();
--	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
--	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus)));
-+	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-+	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
- 	 * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
- 	 * \endcode
- 	 *
-@@ -234,7 +234,7 @@ namespace RSS
- 	 * 'slotLoadingComplete' method might look like this:
- 	 *
- 	 * \code
--	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status)
-+	 * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
- 	 * {
- 	 *     // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
- 	 *     // You don't need to do that anyway since Loader instances delete themselves.
-@@ -320,9 +320,9 @@ namespace RSS
- 			 * the case if you intend to call getPixmap() on Document::image()!
- 			 * @param status A status byte telling whether there were any problems
- 			 * while retrieving or parsing the data.
--			 * @see Document, tqStatus
-+			 * @see Document, Status
- 			 */
--			void loadingComplete(Loader *loader, Document doc, tqStatus status);
-+			void loadingComplete(Loader *loader, Document doc, Status status);
- 
- 		private slots:
- 			void slotRetrieverDone(const TQByteArray &data, bool success);
-diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp
-index 571717a..7d88c3d 100644
---- a/plugins/rssfeed/rss/testlibrss.cpp
-+++ b/plugins/rssfeed/rss/testlibrss.cpp
-@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
- void Tester::test( const TQString &url )
- {
- 	Loader *loader = Loader::create();
--	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
--	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) );
-+	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-+	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
- 	loader->loadFrom( url, new FileRetriever );
- }
- 
--void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status )
-+void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
- {
- 	if ( status == Success )
- 	{
-diff --git a/plugins/rssfeed/rss/testlibrss.h b/plugins/rssfeed/rss/testlibrss.h
-index 18e1832..3d3e963 100644
---- a/plugins/rssfeed/rss/testlibrss.h
-+++ b/plugins/rssfeed/rss/testlibrss.h
-@@ -10,7 +10,7 @@
- 
- using RSS::Loader;
- using RSS::Document;
--using RSS::tqStatus;
-+using RSS::Status;
- 
- class Tester : public TQObject
- {
-@@ -20,7 +20,7 @@ class Tester : public TQObject
- 		void test( const TQString &url );
- 
- 	private slots:
--		void slotLoadingComplete( Loader *loader, Document doc, tqStatus status );
-+		void slotLoadingComplete( Loader *loader, Document doc, Status status );
- };
- 
- #endif
-diff --git a/plugins/rssfeed/rss/textinput.cpp b/plugins/rssfeed/rss/textinput.cpp
-index a12442f..04799fc 100644
---- a/plugins/rssfeed/rss/textinput.cpp
-+++ b/plugins/rssfeed/rss/textinput.cpp
-@@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
- {
- 	TQString elemText;
- 
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
- 		d->title = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
- 		d->description = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
- 		d->name = elemText;
--	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
-+	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
- 		d->link = elemText;
- }
- 
-diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
-index f051f1b..2b70193 100644
---- a/plugins/rssfeed/rssfeed.cpp
-+++ b/plugins/rssfeed/rssfeed.cpp
-@@ -223,7 +223,7 @@ namespace kt
- 		RssArticle::List::iterator it;
- 		for ( it = m_articles.begin(); it != m_articles.end();  )
- 			{
--			if ((*it).pubDate().daysTo(TQDateTime::tqcurrentDateTime()) > m_articleAge)
-+			if ((*it).pubDate().daysTo(TQDateTime::currentDateTime()) > m_articleAge)
- 				{
- 				it = m_articles.erase(it);
- 				removed = true;
-@@ -254,12 +254,12 @@ namespace kt
- 		feedLoading = true;
- 		cleanArticles();
- 		Loader * feedLoader = Loader::create();
--		connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
--			this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) );
-+		connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-+			this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
- 		feedLoader->loadFrom( m_feedUrl, new FileRetriever );
- 	}
- 	
--	void RssFeed::feedLoaded(Loader *feedLoader, Document doc, tqStatus status)
-+	void RssFeed::feedLoaded(Loader *feedLoader, Document doc, Status status)
- 	{
- 		feedLoading = false;
- 
-@@ -290,7 +290,7 @@ namespace kt
- 			for (int i=doc.articles().count()-1; i>=0; i--)
- 			{
- 				curArticle = doc.articles()[i];
--				if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
-+				if (curArticle.pubDate().daysTo(TQDateTime::currentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
- 				{
- 					m_articles.prepend(curArticle);
- 					emit scanRssArticle(curArticle);
-@@ -306,8 +306,8 @@ namespace kt
- 			qDebug( "There was and error loading the feed\n");
- 		}
- 		
--		disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
--			this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) );
-+		disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-+			this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
- 		feedLoader->deleteLater();
- 
- 	}
-diff --git a/plugins/rssfeed/rssfeed.h b/plugins/rssfeed/rssfeed.h
-index 5213d8f..835d1b3 100644
---- a/plugins/rssfeed/rssfeed.h
-+++ b/plugins/rssfeed/rssfeed.h
-@@ -73,7 +73,7 @@ namespace kt
- 
- 		public slots:
- 			void refreshFeed();
--			void feedLoaded(Loader *feedLoader, Document doc, tqStatus status);
-+			void feedLoaded(Loader *feedLoader, Document doc, Status status);
- 			
- 			void clearArticles();
- 			
-diff --git a/plugins/rssfeed/rssfeedwidget.ui b/plugins/rssfeed/rssfeedwidget.ui
-index 5cd8e89..4a35633 100644
---- a/plugins/rssfeed/rssfeedwidget.ui
-+++ b/plugins/rssfeed/rssfeedwidget.ui
-@@ -152,7 +152,7 @@
-                                             <property name="sizeType">
-                                                 <enum>Expanding</enum>
-                                             </property>
--                                            <property name="tqsizeHint">
-+                                            <property name="sizeHint">
-                                                 <size>
-                                                     <width>90</width>
-                                                     <height>21</height>
-@@ -252,7 +252,7 @@
-                                             <property name="sizeType">
-                                                 <enum>Expanding</enum>
-                                             </property>
--                                            <property name="tqsizeHint">
-+                                            <property name="sizeHint">
-                                                 <size>
-                                                     <width>60</width>
-                                                     <height>21</height>
-@@ -600,7 +600,7 @@
-                                                         <property name="sizeType">
-                                                             <enum>Preferred</enum>
-                                                         </property>
--                                                        <property name="tqsizeHint">
-+                                                        <property name="sizeHint">
-                                                             <size>
-                                                                 <width>50</width>
-                                                                 <height>21</height>
-@@ -614,7 +614,7 @@
-                                                         <property name="enabled">
-                                                             <bool>true</bool>
-                                                         </property>
--                                                        <property name="tqmaximumSize">
-+                                                        <property name="maximumSize">
-                                                             <size>
-                                                                 <width>60</width>
-                                                                 <height>32767</height>
-@@ -633,7 +633,7 @@
-                                                 <property name="name">
-                                                     <cstring>seriesBox</cstring>
-                                                 </property>
--                                                <property name="tqmaximumSize">
-+                                                <property name="maximumSize">
-                                                     <size>
-                                                         <width>32000</width>
-                                                         <height>32000</height>
-@@ -664,7 +664,7 @@
-                                                                 <property name="sizeType">
-                                                                     <enum>Expanding</enum>
-                                                                 </property>
--                                                                <property name="tqsizeHint">
-+                                                                <property name="sizeHint">
-                                                                     <size>
-                                                                         <width>20</width>
-                                                                         <height>21</height>
-@@ -910,7 +910,7 @@
-                                                 <property name="sizeType">
-                                                     <enum>Expanding</enum>
-                                                 </property>
--                                                <property name="tqsizeHint">
-+                                                <property name="sizeHint">
-                                                     <size>
-                                                         <width>170</width>
-                                                         <height>21</height>
-diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp
-index 51ac2ff..32d13d0 100644
---- a/plugins/rssfeed/rssfilter.cpp
-+++ b/plugins/rssfeed/rssfilter.cpp
-@@ -302,8 +302,8 @@ namespace kt
- 				regEx.setPattern(*episodeFormats.at(i));
- 				if (regEx.search(article.title()) >= 0)
- 				{
--					season = (*regEx.tqcapturedTexts().at(1)).toInt();
--					episode = (*regEx.tqcapturedTexts().at(2)).toInt();
-+					season = (*regEx.capturedTexts().at(1)).toInt();
-+					episode = (*regEx.capturedTexts().at(2)).toInt();
- 					if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
- 					{
- 						return false;
-@@ -313,8 +313,8 @@ namespace kt
- 			
- 				if (regEx.search(article.link().prettyURL()) >= 0)
- 				{
--					season = (*regEx.tqcapturedTexts().at(1)).toInt();
--					episode = (*regEx.tqcapturedTexts().at(2)).toInt();
-+					season = (*regEx.capturedTexts().at(1)).toInt();
-+					episode = (*regEx.capturedTexts().at(2)).toInt();
- 					if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
- 					{
- 						return false;
-@@ -324,8 +324,8 @@ namespace kt
- 			
- 				if (regEx.search(article.description()) >= 0)
- 				{
--					season = (*regEx.tqcapturedTexts().at(1)).toInt();
--					episode = (*regEx.tqcapturedTexts().at(2)).toInt();
-+					season = (*regEx.capturedTexts().at(1)).toInt();
-+					episode = (*regEx.capturedTexts().at(2)).toInt();
- 					if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
- 					{
- 						return false;
-diff --git a/plugins/rssfeed/rssfilter.h b/plugins/rssfeed/rssfilter.h
-index 53695f5..2a24d7d 100644
---- a/plugins/rssfeed/rssfilter.h
-+++ b/plugins/rssfeed/rssfilter.h
-@@ -42,8 +42,8 @@ namespace kt
- 	{
- 		public:
- 		
--			FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::tqcurrentDateTime().toString(); m_link=TQString(); };
--			FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::tqcurrentDateTime().toString());
-+			FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::currentDateTime().toString(); m_link=TQString(); };
-+			FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::currentDateTime().toString());
- 			FilterMatch(const FilterMatch &other);
- 			FilterMatch &operator=(const FilterMatch &other);
- 			bool operator==(const FilterMatch &other) const;
-diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
-index 972a220..57db6ee 100644
---- a/plugins/rssfeed/rsslinkdownloader.cpp
-+++ b/plugins/rssfeed/rsslinkdownloader.cpp
-@@ -59,10 +59,10 @@ namespace kt
- 			
- 		}
- 		
--	void RssLinkDownloader::processLink(KIO::Job* jobtqStatus)
-+	void RssLinkDownloader::processLink(KIO::Job* jobStatus)
- 		{
- 		
--		if (!jobtqStatus->error())
-+		if (!jobStatus->error())
- 			{
- 			//the file downloaded ok - so let's check if it's a torrent
- 			KMimeType linkType = *KMimeType::findByContent(curFile->data());
-@@ -100,15 +100,15 @@ namespace kt
- 							hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]");
- 							hrefText.setCaseSensitive(false);
- 				
--							hrefTags.tqcapturedTexts()[0].find(hrefText);
-+							hrefTags.capturedTexts()[0].find(hrefText);
- 							//lets get the captured
- 							TQString hrefLink = hrefText.capturedTexts()[1];
- 								
--							if (hrefLink.tqstartsWith("/"))
-+							if (hrefLink.startsWith("/"))
- 								{
- 								hrefLink = url.protocol() + "://" + url.host() + hrefLink;
- 								} 
--							else if (!hrefLink.tqstartsWith("http://", false)) 
-+							else if (!hrefLink.startsWith("http://", false)) 
- 								{
- 								hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink;
- 								}
-diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
-index 2bd8bf1..17d8676 100644
---- a/plugins/rssfeed/rsslinkdownloader.h
-+++ b/plugins/rssfeed/rsslinkdownloader.h
-@@ -59,7 +59,7 @@ namespace kt
-  			
- 
- 		public slots:
--			void processLink(KIO::Job* jobtqStatus);
-+			void processLink(KIO::Job* jobStatus);
- 			void suicide();
- 			
- 		signals:
-diff --git a/plugins/scanfolder/sfprefwidgetbase.ui b/plugins/scanfolder/sfprefwidgetbase.ui
-index ae599b3..3fd83e4 100644
---- a/plugins/scanfolder/sfprefwidgetbase.ui
-+++ b/plugins/scanfolder/sfprefwidgetbase.ui
-@@ -188,7 +188,7 @@
-             <property name="sizeType">
-                 <enum>Fixed</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>20</height>
-@@ -205,7 +205,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>90</height>
-diff --git a/plugins/scheduler/bwscheduler.cpp b/plugins/scheduler/bwscheduler.cpp
-index a669360..a8b41af 100644
---- a/plugins/scheduler/bwscheduler.cpp
-+++ b/plugins/scheduler/bwscheduler.cpp
-@@ -160,7 +160,7 @@ namespace kt
- 		if(!m_enabled)
- 			return;
- 		
--		TQDateTime now = TQDateTime::tqcurrentDateTime();
-+		TQDateTime now = TQDateTime::currentDateTime();
- 
- 		TQString prefix = TQString("BWS: %1 :: ").tqarg(now.toString());
- 		
-diff --git a/plugins/scheduler/bwspage.ui b/plugins/scheduler/bwspage.ui
-index 12fdbd4..474969c 100644
---- a/plugins/scheduler/bwspage.ui
-+++ b/plugins/scheduler/bwspage.ui
-@@ -12,13 +12,13 @@
-             <height>530</height>
-         </rect>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>0</width>
-             <height>0</height>
-         </size>
-     </property>
--    <property name="tqmaximumSize">
-+    <property name="maximumSize">
-         <size>
-             <width>750</width>
-             <height>540</height>
-@@ -73,7 +73,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -95,7 +95,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -117,7 +117,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -139,7 +139,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -177,7 +177,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -245,7 +245,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -267,7 +267,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -289,7 +289,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -311,7 +311,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -349,7 +349,7 @@
-                                     <verstretch>0</verstretch>
-                                 </sizepolicy>
-                             </property>
--                            <property name="tqminimumSize">
-+                            <property name="minimumSize">
-                                 <size>
-                                     <width>30</width>
-                                     <height>15</height>
-@@ -581,13 +581,13 @@
-                     <verstretch>0</verstretch>
-                 </sizepolicy>
-             </property>
--            <property name="tqminimumSize">
-+            <property name="minimumSize">
-                 <size>
-                     <width>379</width>
-                     <height>510</height>
-                 </size>
-             </property>
--            <property name="tqmaximumSize">
-+            <property name="maximumSize">
-                 <size>
-                     <width>379</width>
-                     <height>508</height>
-@@ -604,7 +604,7 @@
-                 </property>
-                 <widget class="TQLabel">
-                     <property name="name">
--                        <cstring>lbltqStatus</cstring>
-+                        <cstring>lblStatus</cstring>
-                     </property>
-                     <property name="text">
-                         <string></string>
-@@ -641,7 +641,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>16</height>
-@@ -700,7 +700,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>36</width>
-                             <height>20</height>
-@@ -728,7 +728,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>35</width>
-                             <height>20</height>
-diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
-index 95f72d6..391ccbf 100644
---- a/plugins/scheduler/bwsprefpagewidget.cpp
-+++ b/plugins/scheduler/bwsprefpagewidget.cpp
-@@ -51,7 +51,7 @@ namespace kt
- 
- 		loadDefault();
- 
--		lbltqStatus->clear();
-+		lblStatus->clear();
- 
- 		pix_icon->setPixmap(KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup));
- 		
-@@ -162,7 +162,7 @@ namespace kt
- 				stream << (int) schedule.getCategory(i, j);
- 
- 		file.close();
--		lbltqStatus->setText(i18n("Schedule saved."));
-+		lblStatus->setText(i18n("Schedule saved."));
- 	}
- 
- 	void BWSPrefPageWidget::loadSchedule(TQString& fn, bool showmsg)
-@@ -205,7 +205,7 @@ namespace kt
- 		file.close();
- 
- 		m_bwsWidget->setSchedule(schedule);
--		lbltqStatus->setText(i18n("Schedule loaded."));
-+		lblStatus->setText(i18n("Schedule loaded."));
- 	}
- 
- 	void BWSPrefPageWidget::loadDefault()
-@@ -228,7 +228,7 @@ namespace kt
- 		ulCat2->setValue(0);
- 		ulCat3->setValue(0);
- 
--		lbltqStatus->clear();
-+		lblStatus->clear();
- 	}
- 
- 	void BWSPrefPageWidget::apply()
-diff --git a/plugins/scheduler/schedulerpage.ui b/plugins/scheduler/schedulerpage.ui
-index 9b6f292..0fc52b3 100644
---- a/plugins/scheduler/schedulerpage.ui
-+++ b/plugins/scheduler/schedulerpage.ui
-@@ -72,7 +72,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>40</width>
-                             <height>20</height>
-@@ -89,7 +89,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>20</width>
-                             <height>80</height>
-@@ -108,7 +108,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>40</height>
-diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp
-index ddef7c8..436f32b 100644
---- a/plugins/scheduler/schedulerplugin.cpp
-+++ b/plugins/scheduler/schedulerplugin.cpp
-@@ -74,7 +74,7 @@ namespace kt
- 		getGUI()->addPrefPage(Pref);
- 		BWScheduler::instance().setCoreInterface(getCore());
- 		
--		TQDateTime now = TQDateTime::tqcurrentDateTime();
-+		TQDateTime now = TQDateTime::currentDateTime();
- 		
- 		//each hour
- 		TQDateTime hour = now.addSecs(3600);
-@@ -115,7 +115,7 @@ namespace kt
- 	void SchedulerPlugin::timer_triggered()
- 	{
- 		m_timer.changeInterval(3600*1000);
--		TQDateTime now = TQDateTime::tqcurrentDateTime();
-+		TQDateTime now = TQDateTime::currentDateTime();
- 		BWScheduler::instance().trigger();
- 	}
- 	
-diff --git a/plugins/search/searchbar.ui b/plugins/search/searchbar.ui
-index 370da86..7784264 100644
---- a/plugins/search/searchbar.ui
-+++ b/plugins/search/searchbar.ui
-@@ -63,7 +63,7 @@
-             <property name="sizeType">
-                 <enum>Maximum</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>60</width>
-                     <height>20</height>
-diff --git a/plugins/search/searchpref.ui b/plugins/search/searchpref.ui
-index cadfbd8..fb03f02 100644
---- a/plugins/search/searchpref.ui
-+++ b/plugins/search/searchpref.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>500</width>
-             <height>350</height>
-@@ -97,7 +97,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>40</width>
-                                     <height>20</height>
-@@ -223,7 +223,7 @@
-                             <verstretch>0</verstretch>
-                         </sizepolicy>
-                     </property>
--                    <property name="tqminimumSize">
-+                    <property name="minimumSize">
-                         <size>
-                             <width>0</width>
-                             <height>50</height>
-@@ -267,7 +267,7 @@
-                             <property name="sizeType">
-                                 <enum>Maximum</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>16</width>
-                                     <height>20</height>
-diff --git a/plugins/stats/sprefwgt.ui b/plugins/stats/sprefwgt.ui
-index 980f024..62cb6d3 100644
---- a/plugins/stats/sprefwgt.ui
-+++ b/plugins/stats/sprefwgt.ui
-@@ -484,7 +484,7 @@
-             <property name="sizeType">
-                 <enum>Expanding</enum>
-             </property>
--            <property name="tqsizeHint">
-+            <property name="sizeHint">
-                 <size>
-                     <width>20</width>
-                     <height>40</height>
-diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/plugins/upnp/upnpdescriptionparser.cpp
-index bd933a4..1e73362 100644
---- a/plugins/upnp/upnpdescriptionparser.cpp
-+++ b/plugins/upnp/upnpdescriptionparser.cpp
-@@ -32,7 +32,7 @@ namespace kt
- 	
- 	class XMLContentHandler : public TQXmlDefaultHandler
- 	{
--		enum tqStatus
-+		enum Status
- 		{
- 		    TOPLEVEL,ROOT,DEVICE,SERVICE,FIELD,OTHER
- 		};
-@@ -40,7 +40,7 @@ namespace kt
- 		TQString tmp;
- 		UPnPRouter* router;
- 		UPnPService curr_service;
--		TQValueStack<tqStatus> status_stack;
-+		TQValueStack<Status> status_stack;
- 	public:
- 		XMLContentHandler(UPnPRouter* router);
- 		virtual ~XMLContentHandler();
-diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui
-index 50e1e1a..3dc7944 100644
---- a/plugins/upnp/upnpwidget.ui
-+++ b/plugins/upnp/upnpwidget.ui
-@@ -109,7 +109,7 @@
-                     <property name="sizeType">
-                         <enum>Expanding</enum>
-                     </property>
--                    <property name="tqsizeHint">
-+                    <property name="sizeHint">
-                         <size>
-                             <width>70</width>
-                             <height>20</height>
-diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
-index d04449b..915e28f 100644
---- a/plugins/webinterface/httpserver.cpp
-+++ b/plugins/webinterface/httpserver.cpp
-@@ -248,7 +248,7 @@ namespace kt
- 	void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info)
- 	{
- 		hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO);
--		hdr.setValue("Date",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC),false));
-+		hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false));
- 		hdr.setValue("Content-Type",content_type);
- 		hdr.setValue("Connection","keep-alive");
- 		if (with_session_info && session.sessionId && session.logged_in)
-@@ -328,7 +328,7 @@ namespace kt
- 			if (path.endsWith("login.html"))
- 			{
- 				// clear cookie in case of login page
--				TQDateTime dt = TQDateTime::tqcurrentDateTime().addDays(-1);
-+				TQDateTime dt = TQDateTime::currentDateTime().addDays(-1);
- 				TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").tqarg(DateTimeToString(dt,true));
- 				rhdr.setValue("Set-Cookie",cookie);
- 			}
-@@ -351,7 +351,7 @@ namespace kt
- 					setDefaultResponseHeaders(rhdr,"text/html",true);
- 					rhdr.setValue("Cache-Control","max-age=0");
- 					rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
--					rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false));
-+					rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
- 					hdlr->sendResponse(rhdr);
- 					return;
- 				}
-@@ -361,7 +361,7 @@ namespace kt
- 			HttpResponseHeader rhdr(200);
- 			setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true);
- 			rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
--			rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false));
-+			rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
- 			rhdr.setValue("Cache-Control","private");
- 			if (!hdlr->sendFile(rhdr,path))
- 			{
-diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
-index 87c8acd..9b5ac85 100644
---- a/plugins/webinterface/php_handler.cpp
-+++ b/plugins/webinterface/php_handler.cpp
-@@ -76,7 +76,7 @@ namespace kt
- 		ts.setEncoding( TQTextStream::UnicodeUTF8 );
- 		ts.writeRawBytes(php_s.data(),off); // first write the opening tag from the script
- 		php_i->globalInfo(ts);
--		php_i->downloadtqStatus(ts);
-+		php_i->downloadStatus(ts);
- 		
- 		TQMap<TQString,TQString>::const_iterator it;
- 			
-diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
-index 9e2a577..e98a309 100644
---- a/plugins/webinterface/php_interface.cpp
-+++ b/plugins/webinterface/php_interface.cpp
-@@ -72,12 +72,12 @@ namespace kt
- 	}
- 	
- 	/*Generate php code
--	* function downloadtqStatus()
-+	* function downloadStatus()
- 	* {
- 	*	return array( ... );
- 	* }
- 	*/
--	void PhpCodeGenerator::downloadtqStatus(TQTextStream & out)
-+	void PhpCodeGenerator::downloadStatus(TQTextStream & out)
- 	{
- 		TorrentStats stats;
- 		//Priority file_priority;
-@@ -156,7 +156,7 @@ namespace kt
- 	}
- 	
- 	/*Generate php code
--	* function globaltqStatus()
-+	* function globalStatus()
- 	* {
- 	*	return array( ... );
- 	* }
-diff --git a/plugins/webinterface/php_interface.h b/plugins/webinterface/php_interface.h
-index 4995ae6..acfd8c7 100644
---- a/plugins/webinterface/php_interface.h
-+++ b/plugins/webinterface/php_interface.h
-@@ -40,7 +40,7 @@ namespace kt
- 			PhpCodeGenerator(CoreInterface *c);
- 			virtual ~PhpCodeGenerator(){}
- 			
--			void downloadtqStatus(TQTextStream & out);
-+			void downloadStatus(TQTextStream & out);
- 			void globalInfo(TQTextStream & out);
- 		private:
- 			CoreInterface *core;
-diff --git a/plugins/webinterface/webinterfacepref.ui b/plugins/webinterface/webinterfacepref.ui
-index dca1d84..a36f7f8 100644
---- a/plugins/webinterface/webinterfacepref.ui
-+++ b/plugins/webinterface/webinterfacepref.ui
-@@ -20,7 +20,7 @@
-             <verstretch>0</verstretch>
-         </sizepolicy>
-     </property>
--    <property name="tqminimumSize">
-+    <property name="minimumSize">
-         <size>
-             <width>500</width>
-             <height>350</height>
-@@ -92,7 +92,7 @@
-                             <property name="sizeType">
-                                 <enum>Expanding</enum>
-                             </property>
--                            <property name="tqsizeHint">
-+                            <property name="sizeHint">
-                                 <size>
-                                     <width>54</width>
-                                     <height>21</height>
-diff --git a/plugins/webinterface/www/default/details.php b/plugins/webinterface/www/default/details.php
-index 92c8d48..a19d57e 100644
---- a/plugins/webinterface/www/default/details.php
-+++ b/plugins/webinterface/www/default/details.php
-@@ -1,5 +1,5 @@
- <?php
--$stats=downloadtqStatus();
-+$stats=downloadStatus();
- $num_torrent=$_REQUEST['torrent'];
- 
- function cut_name_if_long($string)
-@@ -61,7 +61,7 @@ $display_name=cut_name_if_long($stats[$num_torrent]['torrent_name']);
- 		<tr>
- 			<th>Actions</th>
- 			<th>File</th>
--			<th>tqStatus</th>
-+			<th>Status</th>
- 			<th>Size</th>
- 			<th>Complete</th>
- 		</tr>
-diff --git a/plugins/webinterface/www/default/interface.php b/plugins/webinterface/www/default/interface.php
-index f34e651..6432798 100644
---- a/plugins/webinterface/www/default/interface.php
-+++ b/plugins/webinterface/www/default/interface.php
-@@ -1,6 +1,6 @@
- <?php
- $globalinfo=globalInfo();
--$stats=downloadtqStatus();
-+$stats=downloadStatus();
- 
- function get_torrent_status_name($status_id)
- {
-@@ -18,7 +18,7 @@ function get_torrent_status_name($status_id)
- 	10 => 'Checking Data'
- 	);
- 	if (array_key_exists($status_id, $table)) return $table[$status_id];
--	else return 'Not supported tqStatus';
-+	else return 'Not supported Status';
- }
- 
- function generate_button_code($img, $alt, $href='')
-@@ -104,7 +104,7 @@ function generate_button_code($img, $alt, $href='')
- 		<tr>
- 			<th>Actions</th>
- 			<th>File</th>
--			<th>tqStatus</th>
-+			<th>Status</th>
- 			<th>Downloaded</th>
- 			<th>Size</th>
- 			<th>Uploaded</th>
-diff --git a/plugins/webinterface/www/mobile/interface.php b/plugins/webinterface/www/mobile/interface.php
-index 3f5e88b..57582de 100644
---- a/plugins/webinterface/www/mobile/interface.php
-+++ b/plugins/webinterface/www/mobile/interface.php
-@@ -18,7 +18,7 @@
- <table  width="100%">
-   <tbody>
-     	<?php
--		$stats=downloadtqStatus();
-+		$stats=downloadStatus();
- 		$a = 0;
- 		foreach ($stats as $torrent) {
- 			echo "<tr>";
-diff --git a/plugins/webinterface/www/mobile/torrent.php b/plugins/webinterface/www/mobile/torrent.php
-index b041d3f..a1e451d 100644
---- a/plugins/webinterface/www/mobile/torrent.php
-+++ b/plugins/webinterface/www/mobile/torrent.php
-@@ -8,7 +8,7 @@
-     <tr>
-       <td align="center"><IMG src="ktorrentwebinterfacelogo.png" width="340" height="150" align="top" border="0"></td>
-       <?php
--      	$stats=downloadtqStatus();
-+      	$stats=downloadStatus();
-       	$t=$stats[$_REQUEST['id']];
-       	echo "<td><strong>ktorrent-><a href=\"interface.php\">transfers</a></strong>->{$t['torrent_name']}</td>";
-       	echo "<td><a href=\"torrent.php?id={$_REQUEST['id']}\" >refresh</a></td>";
diff --git a/redhat/applications/ktorrent/bp001-bb37c405.diff b/redhat/applications/ktorrent/bp001-bb37c405.diff
deleted file mode 100644
index c06ac5e7e..000000000
--- a/redhat/applications/ktorrent/bp001-bb37c405.diff
+++ /dev/null
@@ -1,3511 +0,0 @@
-commit bb37c4052a9edfff2196984cef241b1ce2df7bb3
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316389 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/apps/ktcachecheck/cachechecker.cpp b/apps/ktcachecheck/cachechecker.cpp
-index f05fb18..c8371a7 100644
---- a/apps/ktcachecheck/cachechecker.cpp
-+++ b/apps/ktcachecheck/cachechecker.cpp
-@@ -44,7 +44,7 @@ namespace ktdebug
- 		this->index_file = index_file;
- 		File fptr;
- 		if (!fptr.open(index_file,"rb"))
--			throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
- 
- 		if (fptr.seek(File::END,0) != 0)
- 		{
-@@ -73,7 +73,7 @@ namespace ktdebug
- 
- 		File fptr;
- 		if (!fptr.open(index_file,"wb"))
--			throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
- 
- 		std::set<bt::Uint32>::iterator i;
- 		// first remove failed chunks from downloaded
-diff --git a/apps/ktcachecheck/multicachechecker.cpp b/apps/ktcachecheck/multicachechecker.cpp
-index 3132e12..53e8fee 100644
---- a/apps/ktcachecheck/multicachechecker.cpp
-+++ b/apps/ktcachecheck/multicachechecker.cpp
-@@ -79,7 +79,7 @@ namespace ktdebug
- 					// we can read the chunk from this file
- 					File fptr;
- 					if (!fptr.open(cache + tf.getPath(),"rb"))
--						throw Error(TQString("Cannot open %1 : %2").tqarg(cache + tf.getPath()).tqarg(fptr.errorString()));
-+						throw Error(TQString("Cannot open %1 : %2").arg(cache + tf.getPath()).arg(fptr.errorString()));
- 
- 					fptr.seek(File::BEGIN,curr_file_off);
- 					fptr.read(buf + bytes_offset,to_read);
-@@ -94,7 +94,7 @@ namespace ktdebug
- // 					Out() << "Partially reading " << to_read << endl;
- 					File fptr;
- 					if (!fptr.open(cache + tf.getPath(),"rb"))
--						throw Error(TQString("Cannot open %1 : %2").tqarg(cache + tf.getPath()).tqarg(fptr.errorString()));
-+						throw Error(TQString("Cannot open %1 : %2").arg(cache + tf.getPath()).arg(fptr.errorString()));
- 
- 					fptr.seek(File::BEGIN,curr_file_off);
- 					fptr.read(buf + bytes_offset,to_read);
-diff --git a/apps/ktcachecheck/singlecachechecker.cpp b/apps/ktcachecheck/singlecachechecker.cpp
-index c311db1..ab64fc3 100644
---- a/apps/ktcachecheck/singlecachechecker.cpp
-+++ b/apps/ktcachecheck/singlecachechecker.cpp
-@@ -48,7 +48,7 @@ namespace ktdebug
- 		if (!fptr.open(cache,"rb"))
- 		{
- 			throw Error(TQString("Cannot open file : %1 : %2")
--					.tqarg(cache).tqarg( fptr.errorString()));
-+					.arg(cache).arg( fptr.errorString()));
- 		}
- 
- 		Uint32 num_ok = 0,num_not_ok = 0,num_not_downloaded = 0,extra_ok = 0;
-diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
-index 11a6aa6..92b78c3 100644
---- a/apps/ktorrent/groups/groupview.cpp
-+++ b/apps/ktorrent/groups/groupview.cpp
-@@ -163,7 +163,7 @@ namespace kt
- 		
- 		if (gman->find(name))
- 		{
--			KMessageBox::error(this,i18n("The group %1 already exists.").tqarg(name));
-+			KMessageBox::error(this,i18n("The group %1 already exists.").arg(name));
- 			return;
- 		}
- 		
-@@ -214,7 +214,7 @@ namespace kt
- 		
- 		if (gman->find(name)) 
- 		{
--			KMessageBox::error(this,i18n("The group %1 already exists.").tqarg(name));
-+			KMessageBox::error(this,i18n("The group %1 already exists.").arg(name));
- 		}
- 		else
- 		{
-diff --git a/apps/ktorrent/groups/torrentgroup.cpp b/apps/ktorrent/groups/torrentgroup.cpp
-index 65fed38..d44b744 100644
---- a/apps/ktorrent/groups/torrentgroup.cpp
-+++ b/apps/ktorrent/groups/torrentgroup.cpp
-@@ -51,7 +51,7 @@ namespace kt
- 			if (hashes.count(tor->getInfoHash()))
- 			{
- 		/*		bt::Out(SYS_GEN|LOG_DEBUG) << 
--						TQString("TG %1 : Torrent %2 from hashes list").tqarg(groupName()).tqarg(tor->getStats().torrent_name) << endl;
-+						TQString("TG %1 : Torrent %2 from hashes list").arg(groupName()).arg(tor->getStats().torrent_name) << endl;
- 		*/ 
- 				hashes.erase(tor->getInfoHash());
- 				torrents.insert(tor);
-diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
-index 76ba43f..152e8c1 100644
---- a/apps/ktorrent/ipfilterwidget.cpp
-+++ b/apps/ktorrent/ipfilterwidget.cpp
-@@ -140,7 +140,7 @@ void IPFilterWidget::saveFilter(TQString& fn)
- 	
- 	if (!fptr.open(IO_WriteOnly))
- 	{
--		Out(SYS_GEN|LOG_NOTICE) << TQString("Could not open file %1 for writing.").tqarg(fn) << endl;
-+		Out(SYS_GEN|LOG_NOTICE) << TQString("Could not open file %1 for writing.").arg(fn) << endl;
- 		return;
- 	}
- 	
-diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
-index dea4bc2..e29ffe7 100644
---- a/apps/ktorrent/ipfilterwidgetbase.ui
-+++ b/apps/ktorrent/ipfilterwidgetbase.ui
-@@ -29,7 +29,7 @@
-             <property name="text">
-                 <string>Note: Blacklist applies to current session only. Use save/open to save your entries or use IPFilter plugin (PeerGuardian).</string>
-             </property>
--            <property name="tqalignment">
-+            <property name="alignment">
-                 <set>WordBreak|AlignVCenter</set>
-             </property>
-         </widget>
-diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
-index 85cb4f0..a113576 100644
---- a/apps/ktorrent/ktorrent.cpp
-+++ b/apps/ktorrent/ktorrent.cpp
-@@ -791,14 +791,14 @@ void KTorrent::updatedStats()
- 	
- 	//m_statusInfo->setText(i18n("Some info here e.g. connected/disconnected"));
- 	TQString tmp = i18n("Speed down: %1 / up: %2")
--			.tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0))
--			.tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0));
-+			.arg(KBytesPerSecToString((double)stats.download_speed/1024.0))
-+			.arg(KBytesPerSecToString((double)stats.upload_speed/1024.0));
- 
- 	m_statusSpeed->setText(tmp);
- 
- 	TQString tmp1 = i18n("Transferred down: %1 / up: %2")
--			.tqarg(BytesToString(stats.bytes_downloaded))
--			.tqarg(BytesToString(stats.bytes_uploaded));
-+			.arg(BytesToString(stats.bytes_downloaded))
-+			.arg(BytesToString(stats.bytes_uploaded));
- 	m_statusTransfer->setText(tmp1);
- 	
- 	if (ServerAuthenticate::isFirewalled() && m_core->getNumTorrentsRunning() > 0) 
-@@ -817,7 +817,7 @@ void KTorrent::updatedStats()
- 	{
- 		const dht::Stats & s = Globals::instance().getDHT().getStats();
- 		m_statusDHT->setText(i18n("DHT: %1 nodes, %2 tasks")
--				.tqarg(s.num_peers).tqarg(s.num_tasks));
-+				.arg(s.num_peers).arg(s.num_tasks));
- 	}
- 	else
- 		m_statusDHT->setText(i18n("DHT: off"));
-diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
-index e97dc84..de0984a 100644
---- a/apps/ktorrent/ktorrentcore.cpp
-+++ b/apps/ktorrent/ktorrentcore.cpp
-@@ -114,7 +114,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
- 			KMessageBox::information(0,
- 			                         i18n("Specified port (%1) is unavailable or in"
- 			                              " use by another application. KTorrent is now using port %2.")
--			                         .tqarg(port).tqarg(port + i - 1));
-+			                         .arg(port).arg(port + i - 1));
- 
- 		Out(SYS_GEN|LOG_NOTICE) << "Bound to port " << (port + i - 1) << endl;
- 	}
-@@ -122,7 +122,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
- 	{
- 		KMessageBox::error(0,
- 			i18n("KTorrent is unable to accept connections because the ports %1 to %2 are "
--			   "already in use by another program.").tqarg(port).tqarg(port + i - 1));
-+			   "already in use by another program.").arg(port).arg(port + i - 1));
- 		Out(SYS_GEN|LOG_IMPORTANT) << "Cannot find free port" << endl;
- 	}
- 
-@@ -465,7 +465,7 @@ TQString KTorrentCore::findNewTorrentDir() const
- 	while (true)
- 	{
- 		TQDir d;
--		TQString dir = data_dir + TQString("tor%1/").tqarg(i);
-+		TQString dir = data_dir + TQString("tor%1/").arg(i);
- 		if (!d.exists(dir))
- 		{
- 			return dir;
-@@ -764,7 +764,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke
- 
- 		// Show error message
- 		KMessageBox::error(0,
--		                   i18n("Cannot create torrent: %1").tqarg(e.toString()),
-+		                   i18n("Cannot create torrent: %1").arg(e.toString()),
- 		                   i18n("Error"));
- 	}
- }
-@@ -889,7 +889,7 @@ void KTorrentCore::queue(kt::TorrentInterface* tc)
- 
- TorrentInterface* KTorrentCore::getTorFromNumber(int tornumber)
- {
--        TQString tordir = data_dir + "tor" + TQString("%1").tqarg(tornumber) + "/";
-+        TQString tordir = data_dir + "tor" + TQString("%1").arg(tornumber) + "/";
- 	Out() << "tordir " << tordir << endl;
-         TQPtrList<TorrentInterface>::iterator i = qman->begin();
-         while(i != qman->end())
-@@ -1025,7 +1025,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
- 	
- 	if (tc->getStats().multi_file_torrent)
- 	{
--		TQString msg = i18n("Several data files of the torrent \"%1\" are missing, do you want to recreate them, or do you want to not download them?").tqarg(tc->getStats().torrent_name);
-+		TQString msg = i18n("Several data files of the torrent \"%1\" are missing, do you want to recreate them, or do you want to not download them?").arg(tc->getStats().torrent_name);
- 					
- 		int ret = KMessageBox::warningYesNoCancelList(0,msg,missing,TQString(),
- 				KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Download")));
-@@ -1038,7 +1038,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
- 			}
- 			catch (bt::Error & e)
- 			{
--				KMessageBox::error(0,i18n("Cannot recreate missing files: %1").tqarg(e.toString()));
-+				KMessageBox::error(0,i18n("Cannot recreate missing files: %1").arg(e.toString()));
- 				tc->handleError(i18n("Data files are missing"));
- 				ret = false;
- 			}
-@@ -1052,7 +1052,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
- 			}
- 			catch (bt::Error & e)
- 			{
--				KMessageBox::error(0,i18n("Cannot deselect missing files: %1").tqarg(e.toString()));
-+				KMessageBox::error(0,i18n("Cannot deselect missing files: %1").arg(e.toString()));
- 				tc->handleError(i18n("Data files are missing"));
- 				ret = false;
- 			}
-@@ -1065,7 +1065,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
- 	}
- 	else
- 	{
--		TQString msg = i18n("The file where the data is saved of the torrent \"%1\" is missing, do you want to recreate it?").tqarg(tc->getStats().torrent_name);
-+		TQString msg = i18n("The file where the data is saved of the torrent \"%1\" is missing, do you want to recreate it?").arg(tc->getStats().torrent_name);
- 		int ret = KMessageBox::warningYesNo(0,msg, i18n("Recreate"),KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Recreate")));
- 		if (ret == KMessageBox::Yes)
- 		{
-@@ -1075,7 +1075,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
- 			}
- 			catch (bt::Error & e)
- 			{
--				KMessageBox::error(0,i18n("Cannot recreate data file: %1").tqarg(e.toString()));
-+				KMessageBox::error(0,i18n("Cannot recreate data file: %1").arg(e.toString()));
- 				tc->handleError(i18n("Data file is missing"));
- 				ret = false;
- 			}
-diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
-index e445fbb..5c04732 100644
---- a/apps/ktorrent/ktorrentview.cpp
-+++ b/apps/ktorrent/ktorrentview.cpp
-@@ -198,9 +198,9 @@ void KTorrentView::setCurrentGroup(Group* group)
- 	}
- 	
- 	if (current_group)
--		setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total));
-+		setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
- 	else
--		setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total));
-+		setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
- 	
- 	onSelectionChanged();
- 	onExecuted(view->currentItem());
-@@ -208,7 +208,7 @@ void KTorrentView::setCurrentGroup(Group* group)
- 
- void KTorrentView::saveSettings(KConfig* cfg,int idx)
- {
--	TQString group = TQString("KTorrentView-%1").tqarg(idx);
-+	TQString group = TQString("KTorrentView-%1").arg(idx);
- 	view->saveLayout(cfg,group);
- 	cfg->setGroup(group);
- 	filter_bar->saveSettings(cfg);
-@@ -217,7 +217,7 @@ void KTorrentView::saveSettings(KConfig* cfg,int idx)
- 
- void KTorrentView::loadSettings(KConfig* cfg,int idx)
- {
--	TQString group = TQString("KTorrentView-%1").tqarg(idx);
-+	TQString group = TQString("KTorrentView-%1").arg(idx);
- 	view->restoreLayout(cfg,group);
- 	view->setDragEnabled(true);
- 
-@@ -373,7 +373,7 @@ void KTorrentView::removeDownloads()
- 			if (!s.completed)
- 			{
- 				TQString msg = i18n("The torrent %1 has not finished downloading, "
--						"do you want to delete the incomplete data, too?").tqarg(s.torrent_name);
-+						"do you want to delete the incomplete data, too?").arg(s.torrent_name);
- 				int ret = KMessageBox::questionYesNoCancel(
- 						this,msg,i18n("Remove Download"),
- 						i18n("Delete Data"),i18n("Keep Data"));
-@@ -546,9 +546,9 @@ void KTorrentView::update()
- 		total = t;
- 		
- 		if (current_group)
--			setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total));
-+			setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
- 		else
--			setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total));
-+			setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
- 		onSelectionChanged();
- 	}
- 	
-@@ -628,7 +628,7 @@ void KTorrentView::checkDataIntegrity()
- 	}
- 	else
- 	{
--		KMessageBox::error(0,i18n("You are already checking the data of the torrent %1 !").tqarg(tc->getStats().torrent_name));
-+		KMessageBox::error(0,i18n("You are already checking the data of the torrent %1 !").arg(tc->getStats().torrent_name));
- 	}
- }
- 
-@@ -748,7 +748,7 @@ void KTorrentView::setDownloadLocationSlot()
- 		if (tc)
- 		{
- 			TQString dn;
--			dn = KFileDialog::getExistingDirectory(tc->getStats().output_path, this, i18n("Choose download location for %1").tqarg(tc->getStats().torrent_name));
-+			dn = KFileDialog::getExistingDirectory(tc->getStats().output_path, this, i18n("Choose download location for %1").arg(tc->getStats().torrent_name));
- 								
- 			if(dn.isNull() || dn.isEmpty())
- 				continue;
-@@ -872,9 +872,9 @@ void KTorrentView::updateCaption()
- 		total = t;
- 		
- 		if (current_group)
--			setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total));
-+			setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
- 		else
--			setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total));
-+			setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
- 	}
- }
- 
-diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
-index 048692b..a9392bd 100644
---- a/apps/ktorrent/ktorrentviewitem.cpp
-+++ b/apps/ktorrent/ktorrentviewitem.cpp
-@@ -222,7 +222,7 @@ void KTorrentViewItem::update()
- 			Uint32 secs = tc->getETA();
- 			if(secs == -1)
- 			{
--				setText(7,TQString("%1").tqarg(TQChar(0x221E)));
-+				setText(7,TQString("%1").arg(TQChar(0x221E)));
- 				eta = -2;
- 			}
- 			else
-@@ -233,7 +233,7 @@ void KTorrentViewItem::update()
- 		}
- 		else
- 		{
--			setText(7,TQString("%1").tqarg(TQChar(0x221E)));
-+			setText(7,TQString("%1").arg(TQChar(0x221E)));
- 			eta = -2;
- 		}
- 	}
-@@ -242,23 +242,23 @@ void KTorrentViewItem::update()
- 	
- 	if(m_parent->columnVisible(8))
- 	{
--		setText(8,TQString("%1 (%2)").tqarg(TQString::number(s.seeders_connected_to)).tqarg(TQString::number(s.seeders_total)));	
-+		setText(8,TQString("%1 (%2)").arg(TQString::number(s.seeders_connected_to)).arg(TQString::number(s.seeders_total)));	
- 	}
- 
- 	if(m_parent->columnVisible(9))
- 	{
--		setText(9,TQString("%1 (%2)").tqarg(TQString::number(s.leechers_connected_to)).tqarg(TQString::number(s.leechers_total)));
-+		setText(9,TQString("%1 (%2)").arg(TQString::number(s.leechers_connected_to)).arg(TQString::number(s.leechers_total)));
- 	}
- 
- 	if(m_parent->columnVisible(10))
- 	{
--		setText(10,i18n("%1 %").tqarg(KGlobal::locale()->formatNumber(Percentage(s),2)));
-+		setText(10,i18n("%1 %").arg(KGlobal::locale()->formatNumber(Percentage(s),2)));
- 	}
- 	
- 	if(m_parent->columnVisible(11))
- 	{
- 		float ratio = kt::ShareRatio(s);
--		setText(11,TQString("%1").tqarg(KGlobal::locale()->formatNumber(ratio,2)));
-+		setText(11,TQString("%1").arg(KGlobal::locale()->formatNumber(ratio,2)));
- 	}
- 	
- 	if (m_parent->columnVisible(12))
-diff --git a/apps/ktorrent/leaktrace.cpp b/apps/ktorrent/leaktrace.cpp
-index f3bdb5f..76439ce 100644
---- a/apps/ktorrent/leaktrace.cpp
-+++ b/apps/ktorrent/leaktrace.cpp
-@@ -180,7 +180,7 @@ static void DeregisterAlloc(void* ptr)
- 				
- 		if (!p->left && !p->right)
- 		{
--			// no tqchildren so just free p
-+			// no children so just free p
- 			if (prev->left == p)
- 			{
- 				free(prev->left);
-@@ -214,7 +214,7 @@ static void DeregisterAlloc(void* ptr)
- 		}
- 		else
- 		{
--			// both tqchildren exist
-+			// both children exist
- 			if (prev->left == p)
- 			{
- 				// attach the left child of p
-diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp
-index 5e9fcb2..fa21922 100644
---- a/apps/ktorrent/main.cpp
-+++ b/apps/ktorrent/main.cpp
-@@ -79,7 +79,7 @@ static const char description[] =
- bool GrabPIDLock()
- {
- 	// create a lock file in /tmp/ with the user id of the current user included in the name
--	TQString pid_file = TQString("/tmp/.ktorrent_%1.lock").tqarg(getuid());
-+	TQString pid_file = TQString("/tmp/.ktorrent_%1.lock").arg(getuid());
- 		
- 	int fd = open(TQFile::encodeName(pid_file),O_RDWR|O_CREAT,0640);
- 	if (fd < 0)
-diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
-index 33bdf7f..4819657 100644
---- a/apps/ktorrent/newui/button.cpp
-+++ b/apps/ktorrent/newui/button.cpp
-@@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
- 
-     KConfig *config = kapp->config();
-     config->setGroup("UI");
--    TQString accel = config->readEntry(TQString("button_%1").tqarg(text), "");
-+    TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
-     if (!accel.isEmpty())
--        setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText));
-+        setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
- }
- 
- Button::~Button()
-@@ -80,11 +80,11 @@ Button::~Button()
-         TQString text = m_realText;
-         if (text.contains(r2))
-             text.remove(r2);
--        config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1));
-+        config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
-     }
-     else
-     {
--        config->writeEntry(TQString("button_%1").tqarg(m_realText), "");
-+        config->writeEntry(TQString("button_%1").arg(m_realText), "");
-     }
- }
- 
-@@ -320,7 +320,7 @@ void Button::assignAccel()
-     if (ok)
-     {
-         TQString text = realTextWithoutAccel();
--        text = TQString("&%1 %2").tqarg(num).tqarg(text);
-+        text = TQString("&%1 %2").arg(num).arg(text);
-         setRealText(text);
-     }
- }
-diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
-index 3b67ff3..114927a 100644
---- a/apps/ktorrent/newui/ddockwindow.cpp
-+++ b/apps/ktorrent/newui/ddockwindow.cpp
-@@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
- {
-     //write dock width to the config file
-     KConfig *config = kapp->config();
--    TQString group = TQString("%1").tqarg(m_name);
-+    TQString group = TQString("%1").arg(m_name);
-     config->setGroup(group);
- 
-     if (m_visible)
-@@ -115,7 +115,7 @@ void DDockWindow::setVisible(bool v)
-     v ? m_widgetStack->show() : m_widgetStack->hide();
-     m_visible = v;
- 
--    m_internalLayout->tqinvalidate();
-+    m_internalLayout->invalidate();
-     if (!m_visible)
-     {
-         if (m_position == DDockWindow::Bottom)
-@@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
- void DDockWindow::saveSettings()
- {
-     KConfig *config = kapp->config();
--    TQString group = TQString("%1").tqarg(m_name);
-+    TQString group = TQString("%1").arg(m_name);
-     int invisibleWidth = 0;
-     config->setGroup(group);
-     if (config->hasKey("ViewWidth"))
-@@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
-         //if the widget was selected last time the dock is deleted
-         //we need to show it
-         KConfig *config = kapp->config();
--        TQString group = TQString("%1").tqarg(m_name);
-+        TQString group = TQString("%1").arg(m_name);
-         config->setGroup(group);
-         if (config->readEntry("ViewLastWidget") == title)
-         {
-diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
-index a21fa5c..d5edb2f 100644
---- a/apps/ktorrent/newui/dmainwindow.cpp
-+++ b/apps/ktorrent/newui/dmainwindow.cpp
-@@ -190,7 +190,7 @@ DTabWidget *DMainWindow::splitVertical()
- void DMainWindow::invalidateActiveTabWidget()
- {
- /*    TQWidget *focused = m_central->focusWidget();
--    kdDebug(9000) << "tqinvalidate: " << focused << endl;
-+    kdDebug(9000) << "invalidate: " << focused << endl;
-     if (focused == 0)
-         return;
-     if (!m_widgets.contains(focused))
-diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp
-index fd7fad0..202396a 100644
---- a/apps/ktorrent/newui/dtabwidget.cpp
-+++ b/apps/ktorrent/newui/dtabwidget.cpp
-@@ -90,7 +90,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
-     if (m_closeButton && m_closeButtonShown)
-         m_closeButton->show();
-     KTabWidget::insertTab(child, label, index);
--    if (index != -1) tabBar()->tqrepaint();
-+    if (index != -1) tabBar()->repaint();
- }
- 
- void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, 
-@@ -99,7 +99,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
-     if (m_closeButton && m_closeButtonShown)
-         m_closeButton->show();
-     KTabWidget::insertTab(child, iconset, label, index);
--    if (index != -1) tabBar()->tqrepaint();
-+    if (index != -1) tabBar()->repaint();
- }
- 
- /*void DTabWidget::updateHistory(TQWidget *w)
-diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
-index 4fbc0fd..826663a 100644
---- a/apps/ktorrent/pref.cpp
-+++ b/apps/ktorrent/pref.cpp
-@@ -281,7 +281,7 @@ bool GeneralPrefPage::apply()
- 		{
- 			TQString err = KResolver::errorString(res.error());
- 			TQString msg = i18n("Cannot lookup %1: %2\n"
--							   "Please provide a valid IP address or hostname.").tqarg(externalIP).tqarg(err);
-+							   "Please provide a valid IP address or hostname.").arg(externalIP).arg(err);
- 			KMessageBox::error(0, msg, i18n("Error"));
- 			return false;
- 		}
-diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
-index 80c6440..d5cb5e5 100644
---- a/apps/ktorrent/queuedialog.cpp
-+++ b/apps/ktorrent/queuedialog.cpp
-@@ -300,7 +300,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
- 	
- 	dlStatus->setText(tc->statusToString());
- 	dlTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
--	dlRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
-+	dlRatio->setText(TQString("%1").arg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
- 	dlBytes->setText(BytesToString(s.bytes_left_to_download));
- 	dlDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes"));
- }
-@@ -321,7 +321,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
- 	
- 	ulStatus->setText(tc->statusToString());
- 	ulTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
--	ulRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
-+	ulRatio->setText(TQString("%1").arg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
- 	ulBytes->setText(BytesToString(s.bytes_uploaded));
- 	ulDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes"));
- }
-diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp
-index 292c1ea..80fd681 100644
---- a/apps/ktorrent/scandialog.cpp
-+++ b/apps/ktorrent/scandialog.cpp
-@@ -67,14 +67,14 @@ void ScanDialog::scan()
- 	}
- 	catch (bt::Error & err)
- 	{
--		KMessageBox::error(0,i18n("Error scanning data: %1").tqarg(err.toString()));
-+		KMessageBox::error(0,i18n("Error scanning data: %1").arg(err.toString()));
- 	}
- 	
- }
- 
- void ScanDialog::execute(kt::TorrentInterface* tc,bool silently)
- {
--	m_torrent_label->setText(i18n("Scanning data of <b>%1</b> :").tqarg(tc->getStats().torrent_name));
-+	m_torrent_label->setText(i18n("Scanning data of <b>%1</b> :").arg(tc->getStats().torrent_name));
- 	adjustSize();
- 	m_cancel->setEnabled(true);
- 	this->silently = silently;
-diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui
-index 2538680..189e551 100644
---- a/apps/ktorrent/scandlgbase.ui
-+++ b/apps/ktorrent/scandlgbase.ui
-@@ -96,7 +96,7 @@
-                             <property name="text">
-                                 <string>0</string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -119,7 +119,7 @@
-                             <property name="text">
-                                 <string>0</string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/apps/ktorrent/speedlimitsdlg.cpp
-index 5fbe5b4..69c6a48 100644
---- a/apps/ktorrent/speedlimitsdlg.cpp
-+++ b/apps/ktorrent/speedlimitsdlg.cpp
-@@ -33,7 +33,7 @@ using namespace kt;
- SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent, const char* name)
- 		: SpeedLimitsDlgBase(parent,name,true,0),tor(ti)
- {
--	m_main_caption->setText(i18n("Speed limits for <b>%1</b>:").tqarg(tor->getStats().torrent_name));
-+	m_main_caption->setText(i18n("Speed limits for <b>%1</b>:").arg(tor->getStats().torrent_name));
- 	Uint32 up,down;
- 	tor->getTrafficLimits(up,down);
- 	m_upload_rate->setValue(up / 1024);
-diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
-index d42c06f..8518de3 100644
---- a/apps/ktorrent/torrentcreatordlg.cpp
-+++ b/apps/ktorrent/torrentcreatordlg.cpp
-@@ -46,7 +46,7 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const
- 	TQMap<TQString, int> n = bt::Globals::instance().getDHT().getClosestGoodNodes(10);
- 	
- 	for(TQMap<TQString, int>::iterator it = n.begin(); it!=n.end(); ++it)
--		new TQListViewItem(m_nodeList, it.key(), TQString("%1").tqarg(it.data()));
-+		new TQListViewItem(m_nodeList, it.key(), TQString("%1").arg(it.data()));
- }
- 
- TorrentCreatorDlg::~TorrentCreatorDlg()
-@@ -105,7 +105,7 @@ void TorrentCreatorDlg::onCreate()
- 		s += ".torrent";
- 
- 	KProgressDialog* dlg = new KProgressDialog(this,0);
--	dlg->setLabel(i18n("Creating %1...").tqarg(s));
-+	dlg->setLabel(i18n("Creating %1...").arg(s));
- 	dlg->setModal(true);
- 	dlg->setAllowCancel(false);
- 	dlg->show();
-@@ -136,7 +136,7 @@ void TorrentCreatorDlg::btnRemoveNode_clicked()
- 
- void TorrentCreatorDlg::btnAddNode_clicked()
- {
--	new TQListViewItem(m_nodeList, m_node->text(), TQString("%1").tqarg(m_port->value()));
-+	new TQListViewItem(m_nodeList, m_node->text(), TQString("%1").arg(m_port->value()));
- }
- 
- void TorrentCreatorDlg::m_nodeList_selectionChanged(TQListViewItem*)
-diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
-index 3db0c49..d051a0e 100644
---- a/apps/ktorrent/torrentcreatordlgbase.ui
-+++ b/apps/ktorrent/torrentcreatordlgbase.ui
-@@ -436,7 +436,7 @@
-                     <property name="text">
-                         <string>NOTE: Some known good DHT nodes are already inserted. You should probably insert your own IP address and port too if you plan to seed this torrent.</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>WordBreak|AlignVCenter</set>
-                     </property>
-                 </widget>
-diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
-index 14a3db7..8588fc2 100644
---- a/apps/ktorrent/trayicon.cpp
-+++ b/apps/ktorrent/trayicon.cpp
-@@ -88,24 +88,24 @@ void TrayIcon::leaveEvent(TQEvent* )
- void TrayIcon::updateStats(const CurrentStats stats, bool showBars,int downloadBandwidth, int uploadBandwidth )
- {
- 	TQString tip = i18n("<table cellpadding='2' cellspacing='2' align='center'><tr><td><b>Speed:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%1</font></td><td>Upload: <font color='#990000'>%2</font></td></tr><tr><td><b>Transfer:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%3</font></td><td>Upload: <font color='#990000'>%4</font></td></tr></table>")
--			.tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0))
--			.tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0))
--			.tqarg(BytesToString(stats.bytes_downloaded))
--			.tqarg(BytesToString(stats.bytes_uploaded));
-+			.arg(KBytesPerSecToString((double)stats.download_speed/1024.0))
-+			.arg(KBytesPerSecToString((double)stats.upload_speed/1024.0))
-+			.arg(BytesToString(stats.bytes_downloaded))
-+			.arg(BytesToString(stats.bytes_uploaded));
- 	m_hover_popup->updateText(tip);
- 	
- 	if(showBars)
- 		drawSpeedBar(stats.download_speed/1024,stats.upload_speed/1024, downloadBandwidth, uploadBandwidth);
- 	else if (previousDownloadHeight > 0 || previousUploadHeight > 0)
- 	{
--		tqrepaint(); // clear the bars if they are disabled
-+		repaint(); // clear the bars if they are disabled
- 		previousDownloadHeight = previousUploadHeight = 0;
- 	}
- }
- 
- void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBandwidth, int uploadBandwidth )
- {
--	//check if need tqrepaint
-+	//check if need repaint
- 	if (uploadBandwidth == 0)
- 		 uploadBandwidth = 1;
- 	if (downloadBandwidth == 0)
-@@ -116,7 +116,7 @@ void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBand
- 	if(previousDownloadHeight==DownloadHeight && previousUploadHeight==UploadHeight)
- 		return;
- 	
--	tqrepaint ();
-+	repaint ();
- 
- 	TQBrush brushD(green);
- 	TQBrush brushU(red);
-@@ -146,9 +146,9 @@ void TrayIcon::finished(TorrentInterface* tc)
- 
- 	TQString msg = i18n("<b>%1</b> has completed downloading."
- 						"<br>Average speed: %2 DL / %3 UL.")
--						.tqarg(s.torrent_name)
--						.tqarg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL()))
--						.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
-+						.arg(s.torrent_name)
-+						.arg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL()))
-+						.arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
- 
- 	showPassivePopup(msg,i18n("Download completed"));
- }
-@@ -164,10 +164,10 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc)
- 	
- 	TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped."
- 			"<br>Uploaded %3 at an average speed of %4.")
--			.tqarg(s.torrent_name)
--			.tqarg(loc->formatNumber(s.max_share_ratio,2))
--			.tqarg(BytesToString(s.bytes_uploaded))
--			.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
-+			.arg(s.torrent_name)
-+			.arg(loc->formatNumber(s.max_share_ratio,2))
-+			.arg(BytesToString(s.bytes_uploaded))
-+			.arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
- 	
- 	showPassivePopup(msg,i18n("Seeding completed"));
- }
-@@ -183,10 +183,10 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc)
- 	
- 	TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped."
- 			"<br>Uploaded %3 at an average speed of %4.")
--			.tqarg(s.torrent_name)
--			.tqarg(loc->formatNumber(s.max_seed_time,2))
--			.tqarg(BytesToString(s.bytes_uploaded))
--			.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
-+			.arg(s.torrent_name)
-+			.arg(loc->formatNumber(s.max_seed_time,2))
-+			.arg(BytesToString(s.bytes_uploaded))
-+			.arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
- 	
- 	showPassivePopup(msg,i18n("Seeding completed"));
- }
-@@ -198,7 +198,7 @@ void TrayIcon::torrentStoppedByError(kt::TorrentInterface* tc, TQString msg)
- 	
- 	const TorrentStats & s = tc->getStats();
- 	TQString err_msg = i18n("<b>%1</b> has been stopped with the following error: <br>%2")
--				.tqarg(s.torrent_name).tqarg(msg);
-+				.arg(s.torrent_name).arg(msg);
- 	
- 	showPassivePopup(err_msg,i18n("Error"));
- }
-@@ -211,7 +211,7 @@ void TrayIcon::corruptedData(kt::TorrentInterface* tc)
- 	const TorrentStats & s = tc->getStats();
- 	TQString err_msg = i18n("Corrupted data has been found in the torrent <b>%1</b>"
- 			"<br>It would be a good idea to do a data integrity check on the torrent.")
--			.tqarg(s.torrent_name);
-+			.arg(s.torrent_name);
- 	showPassivePopup(err_msg,i18n("Error"));
- }
- 
-@@ -227,10 +227,10 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc)
- 	 
- 	if (tc->overMaxRatio())
- 		msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.")
--				.tqarg(s.torrent_name).tqarg(loc->formatNumber(s.max_share_ratio,2));
-+				.arg(s.torrent_name).arg(loc->formatNumber(s.max_share_ratio,2));
- 	else
- 		msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and cannot be enqueued. Remove the limit manually if you want to continue seeding.")
--				.tqarg(s.torrent_name).tqarg(loc->formatNumber(s.max_seed_time,2));
-+				.arg(s.torrent_name).arg(loc->formatNumber(s.max_seed_time,2));
- 	
- 	showPassivePopup(msg,i18n("Torrent cannot be enqueued."));
- }
-@@ -240,7 +240,7 @@ void TrayIcon::canNotStart(kt::TorrentInterface* tc,kt::TorrentStartResponse rea
- 	if (!Settings::showPopups())
- 		return;
- 	
--	TQString msg = i18n("Cannot start <b>%1</b> : <br>").tqarg(tc->getStats().torrent_name);
-+	TQString msg = i18n("Cannot start <b>%1</b> : <br>").arg(tc->getStats().torrent_name);
- 	switch (reason)
- 	{
- 	case kt::TQM_LIMITS_REACHED:
-@@ -274,7 +274,7 @@ void TrayIcon::lowDiskSpace(kt::TorrentInterface * tc, bool stopped)
- 	
- 	const TorrentStats & s = tc->getStats();
- 	
--	TQString msg = i18n("Your disk is running out of space.<br /><b>%1</b> is being downloaded to '%2'.").tqarg(s.torrent_name).tqarg(tc->getDataDir());
-+	TQString msg = i18n("Your disk is running out of space.<br /><b>%1</b> is being downloaded to '%2'.").arg(s.torrent_name).arg(tc->getDataDir());
- 	
- 	if(stopped)
- 		msg.prepend(i18n("Torrent has been stopped.<br />"));
-@@ -335,10 +335,10 @@ void SetMaxRate::makeMenu()
- 			{
- 				if(rate == valuePair[j] && j==0)
- 				{
--					setItemChecked(insertItem(TQString("%1").tqarg(valuePair[j]),-1, (j == 0) ? 2 : count()), true);
-+					setItemChecked(insertItem(TQString("%1").arg(valuePair[j]),-1, (j == 0) ? 2 : count()), true);
- 				}
- 				else
--					insertItem(TQString("%1").tqarg(valuePair[j]),-1, (j == 0) ? 2 : count());
-+					insertItem(TQString("%1").arg(valuePair[j]),-1, (j == 0) ? 2 : count());
- 			}
- 		}
- 
-diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp
-index 526fd08..e98a64f 100644
---- a/libktorrent/datachecker/multidatachecker.cpp
-+++ b/libktorrent/datachecker/multidatachecker.cpp
-@@ -109,8 +109,8 @@ namespace bt
- 		File fptr;
- 		if (!fptr.open(cache + tf.getPath(), "rb"))
- 		{
--			Out() << TQString("Warning : Cannot open %1 : %2").tqarg(cache + 
--					tf.getPath()).tqarg(fptr.errorString()) << endl;
-+			Out() << TQString("Warning : Cannot open %1 : %2").arg(cache + 
-+					tf.getPath()).arg(fptr.errorString()) << endl;
- 			return 0;
- 		}
- 		
-@@ -183,8 +183,8 @@ namespace bt
- 				File fptr;
- 				if (!fptr.open(cache + f.getPath(), "rb"))
- 				{
--					Out() << TQString("Warning : Cannot open %1 : %2").tqarg(cache + 
--							f.getPath()).tqarg(fptr.errorString()) << endl;
-+					Out() << TQString("Warning : Cannot open %1 : %2").arg(cache + 
-+							f.getPath()).arg(fptr.errorString()) << endl;
- 					return false;
- 				}
- 				else
-diff --git a/libktorrent/datachecker/singledatachecker.cpp b/libktorrent/datachecker/singledatachecker.cpp
-index e086e90..948537c 100644
---- a/libktorrent/datachecker/singledatachecker.cpp
-+++ b/libktorrent/datachecker/singledatachecker.cpp
-@@ -48,7 +48,7 @@ namespace bt
- 		if (!fptr.open(path,"rb"))
- 		{
- 			throw Error(i18n("Cannot open file : %1 : %2")
--					.tqarg(path).tqarg( fptr.errorString()));
-+					.arg(path).arg( fptr.errorString()));
- 		}
- 
- 		// initialize the bitsets
-diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp
-index 86481f2..93db727 100644
---- a/libktorrent/interfaces/filetreediritem.cpp
-+++ b/libktorrent/interfaces/filetreediritem.cpp
-@@ -73,7 +73,7 @@ namespace kt
- 		int p = path.find(bt::DirSeparator());
- 		if (p == -1)
- 		{
--			tqchildren.insert(path,newFileTreeItem(path,file));
-+			children.insert(path,newFileTreeItem(path,file));
- 		}
- 		else
- 		{
-@@ -98,8 +98,8 @@ namespace kt
- 			manual_change = false;
- 		}
- 	// first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			i->second->setChecked(on,keep_data);
- 			i++;
-@@ -118,8 +118,8 @@ namespace kt
- 	void FileTreeDirItem::invertChecked()
- 	{
- 	// first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			FileTreeItem* item = i->second;
- 			item->setChecked(!item->isOn());
-@@ -171,8 +171,8 @@ namespace kt
- 	{
- 		Uint64 tot = 0;
- 		// first check all the child items
--		bt::PtrMap<TQString,FileTreeItem>::const_iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::const_iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			const FileTreeItem* item = i->second;
- 			tot += item->bytesToDownload();
-@@ -192,8 +192,8 @@ namespace kt
- 	bool FileTreeDirItem::allChildrenOn()
- 	{
- 		// first check all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			FileTreeItem* item = i->second;
- 			if (!item->isOn())
-@@ -214,7 +214,7 @@ namespace kt
- 
- 	void FileTreeDirItem::childStateChange()
- 	{
--	// only set this dir on if all tqchildren are on
-+	// only set this dir on if all children are on
- 		manual_change = true;
- 		setOn(allChildrenOn());
- 		manual_change = false;
-@@ -248,8 +248,8 @@ namespace kt
- 	{
- 	// first check all the child items
- 		TorrentFileInterface & nullfile = (TorrentFileInterface &)TorrentFile::null;
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			FileTreeItem* file = i->second;
- 			if (file == (FileTreeItem*)item)
-diff --git a/libktorrent/interfaces/filetreediritem.h b/libktorrent/interfaces/filetreediritem.h
-index 37de320..6deaab8 100644
---- a/libktorrent/interfaces/filetreediritem.h
-+++ b/libktorrent/interfaces/filetreediritem.h
-@@ -49,7 +49,7 @@ namespace kt
- 	protected:
- 		TQString name;
- 		Uint64 size;
--		bt::PtrMap<TQString,FileTreeItem> tqchildren;
-+		bt::PtrMap<TQString,FileTreeItem> children;
- 		bt::PtrMap<TQString,FileTreeDirItem> subdirs;
- 		FileTreeDirItem* parent;
- 		bool manual_change;
-diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp
-index cade53a..6a19d7f 100644
---- a/libktorrent/interfaces/functions.cpp
-+++ b/libktorrent/interfaces/functions.cpp
-@@ -32,19 +32,19 @@ namespace kt
- 	{
- 		KLocale* loc = KGlobal::locale();
- 		if (bytes >= 1024 * 1024 * 1024)
--			return i18n("%1 GB").tqarg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
-+			return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
- 		else if (bytes >= 1024*1024)
--			return i18n("%1 MB").tqarg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
-+			return i18n("%1 MB").arg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
- 		else if (bytes >= 1024)
--			return i18n("%1 KB").tqarg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
-+			return i18n("%1 KB").arg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
- 		else
--			return i18n("%1 B").tqarg(bytes);
-+			return i18n("%1 B").arg(bytes);
- 	}
- 
- 	TQString KBytesPerSecToString(double speed,int precision)
- 	{
- 		KLocale* loc = KGlobal::locale();
--		return i18n("%1 KB/s").tqarg(loc->formatNumber(speed,precision));
-+		return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
- 	}
- 
- 	TQString DurationToString(Uint32 nsecs)
-diff --git a/libktorrent/kademlia/dhttrackerbackend.cpp b/libktorrent/kademlia/dhttrackerbackend.cpp
-index 96277a3..f266744 100644
---- a/libktorrent/kademlia/dhttrackerbackend.cpp
-+++ b/libktorrent/kademlia/dhttrackerbackend.cpp
-@@ -137,7 +137,7 @@ namespace dht
- 			{
- 				Out(SYS_DHT|LOG_NOTICE) << 
- 						TQString("DHT: Got %1 potential peers for torrent %2")
--						.tqarg(cnt).tqarg(tor->getStats().torrent_name) << endl;
-+						.arg(cnt).arg(tor->getStats().torrent_name) << endl;
- 				peersReady(this);
- 			}
- 		}
-diff --git a/libktorrent/kademlia/rpcmsg.cpp b/libktorrent/kademlia/rpcmsg.cpp
-index 6ef62b9..90d2484 100644
---- a/libktorrent/kademlia/rpcmsg.cpp
-+++ b/libktorrent/kademlia/rpcmsg.cpp
-@@ -192,7 +192,7 @@ namespace dht
- 		if (mt_id.length() == 0)
- 			return 0;
- 		
--		Uint8 mtid = (char)mt_id.tqat(0).latin1();
-+		Uint8 mtid = (char)mt_id.at(0).latin1();
- 		TQString str = vn->data().toString();
- 		
- 		return new ErrMsg(mtid,id,str);
-@@ -266,7 +266,7 @@ namespace dht
- 	
- 	void PingReq::print()
- 	{
--		Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : ping").tqarg(mtid).tqarg(id.toString()) << endl;
-+		Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : ping").arg(mtid).arg(id.toString()) << endl;
- 	}
- 	
- 	void PingReq::encode(TQByteArray & arr)
-@@ -303,7 +303,7 @@ namespace dht
- 	void FindNodeReq::print()
- 	{
- 		Out(SYS_DHT|LOG_NOTICE) << TQString("REQ: %1 %2 : find_node %3")
--				.tqarg(mtid).tqarg(id.toString()).tqarg(target.toString()) << endl;
-+				.arg(mtid).arg(id.toString()).arg(target.toString()) << endl;
- 	}
- 	
- 	void FindNodeReq::encode(TQByteArray & arr)
-@@ -342,7 +342,7 @@ namespace dht
- 	void GetPeersReq::print()
- 	{
- 		Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : get_peers %3")
--				.tqarg(mtid).tqarg(id.toString()).tqarg(info_hash.toString()) << endl;
-+				.arg(mtid).arg(id.toString()).arg(info_hash.toString()) << endl;
- 	}
- 	
- 	void GetPeersReq::encode(TQByteArray & arr)
-@@ -381,8 +381,8 @@ namespace dht
- 	void AnnounceReq::print()
- 	{
- 		Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : announce_peer %3 %4 %5")
--				.tqarg(mtid).tqarg(id.toString()).tqarg(info_hash.toString())
--				.tqarg(port).tqarg(token.toString()) << endl;
-+				.arg(mtid).arg(id.toString()).arg(info_hash.toString())
-+				.arg(port).arg(token.toString()) << endl;
- 	}
- 	
- 	void AnnounceReq::encode(TQByteArray & arr)
-@@ -421,7 +421,7 @@ namespace dht
- 	void PingRsp::print()
- 	{
- 		Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : ping")
--					.tqarg(mtid).tqarg(id.toString()) << endl;
-+					.arg(mtid).arg(id.toString()) << endl;
- 	}
- 	
- 	void PingRsp::encode(TQByteArray & arr)
-@@ -456,7 +456,7 @@ namespace dht
- 	void FindNodeRsp::print()
- 	{
- 		Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : find_node")
--				.tqarg(mtid).tqarg(id.toString()) << endl;
-+				.arg(mtid).arg(id.toString()) << endl;
- 	}
- 	
- 	void FindNodeRsp::encode(TQByteArray & arr)
-@@ -498,7 +498,7 @@ namespace dht
- 	void GetPeersRsp::print()
- 	{
- 		Out() << TQString("RSP: %1 %2 : get_peers(%3)")
--				.tqarg(mtid).tqarg(id.toString()).tqarg(data.size() > 0 ? "nodes" : "values") << endl;
-+				.arg(mtid).arg(id.toString()).arg(data.size() > 0 ? "nodes" : "values") << endl;
- 	}
- 
- 	void GetPeersRsp::encode(TQByteArray & arr)
-@@ -552,7 +552,7 @@ namespace dht
- 	void AnnounceRsp::print()
- 	{
- 		Out() << TQString("RSP: %1 %2 : announce_peer")
--				.tqarg(mtid).tqarg(id.toString()) << endl;
-+				.arg(mtid).arg(id.toString()) << endl;
- 	}
- 	
- 	void AnnounceRsp::encode(TQByteArray & arr)
-diff --git a/libktorrent/migrate/ccmigrate.cpp b/libktorrent/migrate/ccmigrate.cpp
-index 3975de4..e824830 100644
---- a/libktorrent/migrate/ccmigrate.cpp
-+++ b/libktorrent/migrate/ccmigrate.cpp
-@@ -116,13 +116,13 @@ namespace bt
- 		// open the old current_chunks file
- 		File old_cc;
- 		if (!old_cc.open(current_chunks,"rb"))
--			throw Error(i18n("Cannot open file %1 : %2").tqarg(current_chunks).tqarg(old_cc.errorString()));
-+			throw Error(i18n("Cannot open file %1 : %2").arg(current_chunks).arg(old_cc.errorString()));
- 		
- 		// open a new file in the /tmp dir
- 		File new_cc;
- 		TQString tmp = current_chunks + ".tmp";
- 		if (!new_cc.open(tmp,"wb"))
--			throw Error(i18n("Cannot open file %1 : %2").tqarg(tmp).tqarg(old_cc.errorString()));
-+			throw Error(i18n("Cannot open file %1 : %2").arg(tmp).arg(old_cc.errorString()));
- 		
- 		// read the number of chunks
- 		Uint32 num = 0;
-diff --git a/libktorrent/migrate/migrate.cpp b/libktorrent/migrate/migrate.cpp
-index a59f83c..ef6ddf1 100644
---- a/libktorrent/migrate/migrate.cpp
-+++ b/libktorrent/migrate/migrate.cpp
-@@ -42,7 +42,7 @@ namespace bt
- 	{
- 		// check if directory exists
- 		if (!bt::Exists(tor_dir))
--			throw Error(i18n("The directory %1 does not exist").tqarg(tor_dir));
-+			throw Error(i18n("The directory %1 does not exist").arg(tor_dir));
- 		
- 		// make sure it ends with a /
- 		TQString tdir = tor_dir;
-diff --git a/libktorrent/mse/functions.cpp b/libktorrent/mse/functions.cpp
-index d9ed5cf..a478cda 100644
---- a/libktorrent/mse/functions.cpp
-+++ b/libktorrent/mse/functions.cpp
-@@ -66,7 +66,7 @@ namespace mse
- 		lg << name << " (" << nb << ") = ";
- 		for (Uint32 i = 0;i < nb;i++)
- 		{
--			lg << TQString("0x%1 ").tqarg(buf[i],0,16);
-+			lg << TQString("0x%1 ").arg(buf[i],0,16);
- 		}
- 		lg << endl;
- 	}
-diff --git a/libktorrent/net/address.cpp b/libktorrent/net/address.cpp
-index e1de8d0..d4877da 100644
---- a/libktorrent/net/address.cpp
-+++ b/libktorrent/net/address.cpp
-@@ -58,10 +58,10 @@ namespace net
- 	TQString Address::toString() const
- 	{
- 		return TQString("%1.%2.%3.%4")
--				.tqarg((m_ip & 0xFF000000) >> 24)
--				.tqarg((m_ip & 0x00FF0000) >> 16)
--				.tqarg((m_ip & 0x0000FF00) >> 8)
--				.tqarg(m_ip & 0x000000FF);
-+				.arg((m_ip & 0xFF000000) >> 24)
-+				.arg((m_ip & 0x00FF0000) >> 16)
-+				.arg((m_ip & 0x0000FF00) >> 8)
-+				.arg(m_ip & 0x000000FF);
- 	}
- 
- }
-diff --git a/libktorrent/net/socket.cpp b/libktorrent/net/socket.cpp
-index ff09a34..e1e67ea 100644
---- a/libktorrent/net/socket.cpp
-+++ b/libktorrent/net/socket.cpp
-@@ -60,7 +60,7 @@ namespace net
- 		int val = 1; 
- 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
- 		{
--			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").tqarg(strerror(errno)) << endl;
-+			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
- 		}
- #endif
- 		cacheAddress();
-@@ -71,14 +71,14 @@ namespace net
- 		int fd = socket(PF_INET,tcp ? SOCK_STREAM : SOCK_DGRAM,0);
- 		if (fd < 0)
- 		{
--			Out(SYS_GEN|LOG_IMPORTANT) << TQString("Cannot create socket : %1").tqarg(strerror(errno)) << endl;
-+			Out(SYS_GEN|LOG_IMPORTANT) << TQString("Cannot create socket : %1").arg(strerror(errno)) << endl;
- 		}
- 		m_fd = fd;
- #if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020)
- 		int val = 1;
- 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
- 		{
--			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").tqarg(strerror(errno)) << endl;
-+			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
- 		}
- #endif	
- 	}
-@@ -127,7 +127,7 @@ namespace net
- 			else
- 			{
- 				Out(SYS_CON|LOG_NOTICE) << TQString("Cannot connect to host %1:%2 : %3")
--					.tqarg(a.toString()).tqarg(a.port()).tqarg(strerror(errno)) << endl;
-+					.arg(a.toString()).arg(a.port()).arg(strerror(errno)) << endl;
- 				return false;
- 			}
- 		}
-@@ -145,20 +145,20 @@ namespace net
- 	
- 		if (::bind(m_fd,(struct sockaddr*)&addr,sizeof(struct sockaddr)) < 0)
- 		{
--			Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot bind to port %1 : %2").tqarg(port).tqarg(strerror(errno)) << endl;
-+			Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot bind to port %1 : %2").arg(port).arg(strerror(errno)) << endl;
- 			return false;
- 		}
- 
- 		if (also_listen && listen(m_fd,5) < 0)
- 		{
--			Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot listen to port %1 : %2").tqarg(port).tqarg(strerror(errno)) << endl;
-+			Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot listen to port %1 : %2").arg(port).arg(strerror(errno)) << endl;
- 			return false;
- 		}
- 
- 		int val = 1;
- 		if (setsockopt(m_fd,SOL_SOCKET,SO_REUSEADDR,&val,sizeof(int)) < 0)
- 		{
--			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the reuseaddr option : %1").tqarg(strerror(errno)) << endl;
-+			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the reuseaddr option : %1").arg(strerror(errno)) << endl;
- 		}
- 		m_state = BOUND;
- 		return true;
-@@ -272,7 +272,7 @@ namespace net
- 		if (setsockopt(m_fd,IPPROTO_IP,IP_TOS,&c,sizeof(c)) < 0)
- 		{
- 			Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set TOS to %1 : %2")
--					.tqarg(type_of_service).tqarg(strerror(errno)) << endl;
-+					.arg(type_of_service).arg(strerror(errno)) << endl;
- 			return false;
- 		}
- 		return true;
-diff --git a/libktorrent/pluginmanager.cpp b/libktorrent/pluginmanager.cpp
-index 3ea1282..dcd4749 100644
---- a/libktorrent/pluginmanager.cpp
-+++ b/libktorrent/pluginmanager.cpp
-@@ -71,7 +71,7 @@ namespace kt
- 			{
- 				Out(SYS_GEN|LOG_NOTICE) <<
- 						TQString("Plugin %1 version does not match KTorrent version, unloading it.")
--						.tqarg(service->library()) << endl;
-+						.arg(service->library()) << endl;
- 
- 				delete plugin;
- 				// unload the library again, no need to have it loaded
-diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
-index 70a8777..8a6e33c 100644
---- a/libktorrent/pluginmanagerprefpage.cpp
-+++ b/libktorrent/pluginmanagerprefpage.cpp
-@@ -51,9 +51,9 @@ namespace kt
- 		{
- 			setTitle("<h3>" + p->getGuiName() + "</h3>");
- 			setDescription(
--				i18n("%1<br>Status: <b>%2</b><br>Author: %3").tqarg(p->getDescription())
--					.tqarg(p->isLoaded() ? i18n("Loaded") : i18n("Not loaded"))
--					.tqarg(p->getAuthor()));
-+				i18n("%1<br>Status: <b>%2</b><br>Author: %3").arg(p->getDescription())
-+					.arg(p->isLoaded() ? i18n("Loaded") : i18n("Not loaded"))
-+					.arg(p->getAuthor()));
- 		}
- 		
- 		TQString pluginName() {return p->getName();}
-diff --git a/libktorrent/torrent/bdecoder.cpp b/libktorrent/torrent/bdecoder.cpp
-index 778cf8a..e965eb5 100644
---- a/libktorrent/torrent/bdecoder.cpp
-+++ b/libktorrent/torrent/bdecoder.cpp
-@@ -59,7 +59,7 @@ namespace bt
- 		}
- 		else
- 		{
--			throw Error(i18n("Illegal token: %1").tqarg(data[pos]));
-+			throw Error(i18n("Illegal token: %1").arg(data[pos]));
- 		}
- 	}
- 
-@@ -161,7 +161,7 @@ namespace bt
- 			Int64 bi = 0LL;
- 			bi = n.toLongLong(&ok);
- 			if (!ok)
--				throw Error(i18n("Cannot convert %1 to an int").tqarg(n));
-+				throw Error(i18n("Cannot convert %1 to an int").arg(n));
- 
- 			pos++;
- 			if (verbose) Out() << "INT64 = " << n << endl;
-@@ -195,7 +195,7 @@ namespace bt
- 		len = n.toInt(&ok);
- 		if (!ok)
- 		{
--			throw Error(i18n("Cannot convert %1 to an int").tqarg(n));
-+			throw Error(i18n("Cannot convert %1 to an int").arg(n));
- 		}
- 		// move pos to the first part of the string
- 		pos++;
-@@ -204,7 +204,7 @@ namespace bt
- 			
- 		TQByteArray arr(len);
- 		for (unsigned int i = pos;i < pos + len;i++)
--			arr.tqat(i-pos) = data[i];
-+			arr.at(i-pos) = data[i];
- 		pos += len;
- 		// read the string into n
- 
-diff --git a/libktorrent/torrent/bencoder.cpp b/libktorrent/torrent/bencoder.cpp
-index ef01123..cb82db7 100644
---- a/libktorrent/torrent/bencoder.cpp
-+++ b/libktorrent/torrent/bencoder.cpp
-@@ -87,7 +87,7 @@ namespace bt
- 	{
- 		if (!out) return;
- 		
--		TQCString s = TQString("i%1e").tqarg(val).utf8();
-+		TQCString s = TQString("i%1e").arg(val).utf8();
- 		out->write(s,s.length());
- 	}
- 
-@@ -95,7 +95,7 @@ namespace bt
- 	{
- 		if (!out) return;
- 		
--		TQCString s = TQString("i%1e").tqarg(val).utf8();
-+		TQCString s = TQString("i%1e").arg(val).utf8();
- 		out->write(s,s.length());
- 	}
- 	
-@@ -104,7 +104,7 @@ namespace bt
- 		if (!out) return;
- 		
- 		TQCString u = str.utf8();
--		TQCString s = TQString("%1:").tqarg(u.length()).utf8();
-+		TQCString s = TQString("%1:").arg(u.length()).utf8();
- 		out->write(s,s.length());
- 		out->write(u,u.length());
- 	}
-@@ -123,7 +123,7 @@ namespace bt
- 	{
- 		if (!out) return;
- 		
--		TQCString s = TQString("%1:").tqarg(size).utf8();
-+		TQCString s = TQString("%1:").arg(size).utf8();
- 		out->write(s,s.length());
- 		out->write((const char*)data,size);
- 	}
-diff --git a/libktorrent/torrent/bnode.cpp b/libktorrent/torrent/bnode.cpp
-index 07b7ba0..c32f09b 100644
---- a/libktorrent/torrent/bnode.cpp
-+++ b/libktorrent/torrent/bnode.cpp
-@@ -56,8 +56,8 @@ namespace bt
- 	
- 	BDictNode::~BDictNode()
- 	{
--		TQValueList<DictEntry>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQValueList<DictEntry>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			DictEntry & e = *i;
- 			delete e.node;
-@@ -70,13 +70,13 @@ namespace bt
- 		DictEntry entry;
- 		entry.key = key;
- 		entry.node = node;
--		tqchildren.append(entry);
-+		children.append(entry);
- 	}
- 	
- 	BNode* BDictNode::getData(const TQString & key)
- 	{
--		TQValueList<DictEntry>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQValueList<DictEntry>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			DictEntry & e = *i;
- 			if (TQString(e.key) == key)
-@@ -88,8 +88,8 @@ namespace bt
- 	
- 	BDictNode* BDictNode::getDict(const TQByteArray & key)
- 	{
--		TQValueList<DictEntry>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQValueList<DictEntry>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			DictEntry & e = *i;
- 			if (e.key == key)
-@@ -120,8 +120,8 @@ namespace bt
- 	void BDictNode::printDebugInfo()
- 	{
- 		Out() << "DICT" << endl;
--		TQValueList<DictEntry>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQValueList<DictEntry>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			DictEntry & e = *i;
- 			Out() << TQString(e.key) << ": " << endl;
-@@ -135,7 +135,7 @@ namespace bt
- 
- 	BListNode::BListNode(Uint32 off) : BNode(LIST,off)
- 	{
--		tqchildren.setAutoDelete(true);
-+		children.setAutoDelete(true);
- 	}
- 	
- 	
-@@ -145,7 +145,7 @@ namespace bt
- 	
- 	void BListNode::append(BNode* node)
- 	{
--		tqchildren.append(node);
-+		children.append(node);
- 	}
- 
- 	BListNode* BListNode::getList(Uint32 idx)
-@@ -165,10 +165,10 @@ namespace bt
- 	
- 	void BListNode::printDebugInfo()
- 	{
--		Out() << "LIST " <<  tqchildren.count() << endl;
--		for (Uint32 i = 0;i < tqchildren.count();i++)
-+		Out() << "LIST " <<  children.count() << endl;
-+		for (Uint32 i = 0;i < children.count();i++)
- 		{
--			BNode* n = tqchildren.at(i);
-+			BNode* n = children.at(i);
- 			n->printDebugInfo();
- 		}
- 		Out() << "END" << endl;
-diff --git a/libktorrent/torrent/bnode.h b/libktorrent/torrent/bnode.h
-index ccd2c94..84b306e 100644
---- a/libktorrent/torrent/bnode.h
-+++ b/libktorrent/torrent/bnode.h
-@@ -102,7 +102,7 @@ namespace bt
- 			TQByteArray key;
- 			BNode* node;
- 		};
--		TQValueList<DictEntry> tqchildren;
-+		TQValueList<DictEntry> children;
- 	public:
- 		BDictNode(Uint32 off);
- 		virtual ~BDictNode();
-@@ -159,7 +159,7 @@ namespace bt
- 	 */
- 	class BListNode : public BNode
- 	{
--		TQPtrList<BNode> tqchildren;
-+		TQPtrList<BNode> children;
- 	public:
- 		BListNode(Uint32 off);
- 		virtual ~BListNode();
-@@ -172,14 +172,14 @@ namespace bt
- 		void printDebugInfo();
- 
- 		/// Get the number of nodes in the list.
--		Uint32 getNumChildren() const {return tqchildren.count();}
-+		Uint32 getNumChildren() const {return children.count();}
- 		
- 		/**
- 		 * Get a node from the list
- 		 * @param idx The index
- 		 * @return The node or 0 if idx is out of bounds
- 		 */
--		BNode* getChild(Uint32 idx) {return tqchildren.at(idx);}
-+		BNode* getChild(Uint32 idx) {return children.at(idx);}
- 
- 		/**
- 		 * Get a BListNode.
-diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
-index 678124a..7f02b6b 100644
---- a/libktorrent/torrent/cachefile.cpp
-+++ b/libktorrent/torrent/cachefile.cpp
-@@ -92,7 +92,7 @@ namespace bt
- 		
- 		if (fd < 0)
- 		{
--			throw Error(i18n("Cannot open %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot open %1 : %2").arg(path).arg(strerror(errno)));
- 		}
- 		
- 		file_size = FileSize(fd);
-@@ -118,7 +118,7 @@ namespace bt
- 		
- 		if (read_only && mode != READ)
- 		{
--			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
-+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
- 		}
- 		
- 		if (off + size > max_size)
-@@ -217,7 +217,7 @@ namespace bt
- 		}
- 		
- 		if (read_only)
--			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
-+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
- 		
- 		// jump to the end of the file
- 		SeekFile(fd,0,SEEK_END);
-@@ -237,22 +237,22 @@ namespace bt
- 			int nb = to_write > 1024 ? 1024 : to_write;
- 			int ret = ::write(fd,buf,nb);
- 			if (ret < 0)
--				throw Error(i18n("Cannot expand file %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot expand file %1 : %2").arg(path).arg(strerror(errno)));
- 			else if (ret != nb)
--				throw Error(i18n("Cannot expand file %1 : incomplete write").tqarg(path));
-+				throw Error(i18n("Cannot expand file %1 : incomplete write").arg(path));
- 			to_write -= nb;
- 		}
- 		file_size += num;
- //		
--	//	Out() << TQString("growing %1 = %2").tqarg(path).tqarg(kt::BytesToString(file_size)) << endl;
-+	//	Out() << TQString("growing %1 = %2").arg(path).arg(kt::BytesToString(file_size)) << endl;
- 
- 		if (file_size != FileSize(fd))
- 		{
--//			Out() << TQString("Homer Simpson %1 %2").tqarg(file_size).tqarg(sb.st_size) << endl;
-+//			Out() << TQString("Homer Simpson %1 %2").arg(file_size).arg(sb.st_size) << endl;
- 			fsync(fd);
- 			if (file_size != FileSize(fd))
- 			{
--				throw Error(i18n("Cannot expand file %1").tqarg(path));
-+				throw Error(i18n("Cannot expand file %1").arg(path));
- 			}
- 		}
- 	}
-@@ -292,7 +292,7 @@ namespace bt
- 		
- 		if (ret < 0)
- 		{
--			Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").tqarg(errno).tqarg(strerror(errno)) << endl;
-+			Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").arg(errno).arg(strerror(errno)) << endl;
- 		}
- 	}
- 		
-@@ -326,7 +326,7 @@ namespace bt
- 						
- 			if (ret < 0)
- 			{
--				Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").tqarg(errno).tqarg(strerror(errno)) << endl;
-+				Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").arg(errno).arg(strerror(errno)) << endl;
- 			}	
- 		}
- 		::close(fd);
-@@ -348,7 +348,7 @@ namespace bt
- 		
- 		if (off >= file_size || off >= max_size)
- 		{
--			throw Error(i18n("Error : Reading past the end of the file %1").tqarg(path));
-+			throw Error(i18n("Error : Reading past the end of the file %1").arg(path));
- 		}
- 		
- 		// jump to right position
-@@ -358,7 +358,7 @@ namespace bt
- 			if (close_again)
- 				closeTemporary();
- 			
--			throw Error(i18n("Error reading from %1").tqarg(path));
-+			throw Error(i18n("Error reading from %1").arg(path));
- 		}
- 		
- 		if (close_again)
-@@ -379,7 +379,7 @@ namespace bt
- 		}
- 		
- 		if (read_only)
--			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
-+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
- 		
- 		if (off + size > max_size)
- 		{
-@@ -389,7 +389,7 @@ namespace bt
- 		
- 		if (file_size < off)
- 		{
--			//Out() << TQString("Writing %1 bytes at %2").tqarg(size).tqarg(off) << endl;
-+			//Out() << TQString("Writing %1 bytes at %2").arg(size).arg(off) << endl;
- 			growFile(off - file_size);
- 		}
- 		
-@@ -400,11 +400,11 @@ namespace bt
- 			closeTemporary();
- 		
- 		if (ret == -1)
--			throw Error(i18n("Error writing to %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+			throw Error(i18n("Error writing to %1 : %2").arg(path).arg(strerror(errno)));
- 		else if ((Uint32)ret != size)
- 		{
--			Out() << TQString("Incomplete write of %1 bytes, should be %2").tqarg(ret).tqarg(size) << endl;
--			throw Error(i18n("Error writing to %1").tqarg(path));
-+			Out() << TQString("Incomplete write of %1 bytes, should be %2").arg(ret).arg(size) << endl;
-+			throw Error(i18n("Error writing to %1").arg(path));
- 		}
- 		
- 		if (off + size > file_size)
-@@ -445,7 +445,7 @@ namespace bt
- 			if (close_again)
- 				closeTemporary();
- 			
--			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
-+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
- 		}
- 
- 		try
-@@ -472,7 +472,7 @@ namespace bt
- 				if (close_again)
- 					closeTemporary();
- 				
--				throw Error(i18n("Cannot preallocate diskspace : %1").tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot preallocate diskspace : %1").arg(strerror(errno)));
- 			}
- 		}
- 
-diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
-index 3475441..38e4fec 100644
---- a/libktorrent/torrent/chunkdownload.cpp
-+++ b/libktorrent/torrent/chunkdownload.cpp
-@@ -196,7 +196,7 @@ namespace bt
- 	{
- 		if (chunk->getIndex() == r.getIndex())
- 		{
--//			Out(SYS_CON|LOG_DEBUG) << TQString("Request rejected %1 %2 %3 %4").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()).tqarg(r.getPeer()) << endl;
-+//			Out(SYS_CON|LOG_DEBUG) << TQString("Request rejected %1 %2 %3 %4").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()).arg(r.getPeer()) << endl;
- 		
- 			notDownloaded(r,true);
- 		}
-@@ -207,7 +207,7 @@ namespace bt
- 		// see if we are dealing with a piece of ours
- 		if (chunk->getIndex() == r.getIndex())
- 		{
--			Out(SYS_CON|LOG_DEBUG) << TQString("Request timed out %1 %2 %3 %4").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()).tqarg(r.getPeer()) << endl;
-+			Out(SYS_CON|LOG_DEBUG) << TQString("Request timed out %1 %2 %3 %4").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()).arg(r.getPeer()) << endl;
- 		
- 			notDownloaded(r,false);
- 		}
-diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
-index a0849a4..e98c58b 100644
---- a/libktorrent/torrent/chunkmanager.cpp
-+++ b/libktorrent/torrent/chunkmanager.cpp
-@@ -204,7 +204,7 @@ namespace bt
- 	{
- 		File fptr;
- 		if (!fptr.open(index_file,"wb"))
--			throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
- 		
- 		for (unsigned int i = 0;i < tor.getNumChunks();i++)
- 		{
-@@ -387,7 +387,7 @@ namespace bt
- 			}
- 		}
- 	//	Uint32 num_in_mem = loaded.count();
--	//	Out() << TQString("Cleaned %1 chunks, %2 still in memory").tqarg(num_removed).tqarg(num_in_mem) << endl;
-+	//	Out() << TQString("Cleaned %1 chunks, %2 still in memory").arg(num_removed).arg(num_in_mem) << endl;
- 	}
- 	
- 	void ChunkManager::saveChunk(unsigned int i,bool update_index)
-@@ -429,7 +429,7 @@ namespace bt
- 			// try again
- 			if (!fptr.open(index_file,"r+b"))
- 				// panick if it failes
--				throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
-+				throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
- 		}
- 
- 		
-diff --git a/libktorrent/torrent/dndfile.cpp b/libktorrent/torrent/dndfile.cpp
-index 2ca669b..dffb763 100644
---- a/libktorrent/torrent/dndfile.cpp
-+++ b/libktorrent/torrent/dndfile.cpp
-@@ -105,7 +105,7 @@ namespace bt
- 		
- 		File fptr;
- 		if (!fptr.open(path,"wb"))
--			throw Error(i18n("Cannot create file %1 : %2").tqarg(path).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot create file %1 : %2").arg(path).arg(fptr.errorString()));
- 		
- 		fptr.write(&hdr,sizeof(DNDFileHeader));
- 		fptr.close();
-@@ -172,7 +172,7 @@ namespace bt
- 			create();
- 			if (!fptr.open(path,"r+b"))
- 			{
--				throw Error(i18n("Failed to write first chunk to DND file : %1").tqarg(fptr.errorString()));
-+				throw Error(i18n("Failed to write first chunk to DND file : %1").arg(fptr.errorString()));
- 			}
- 		}
- 		
-@@ -230,7 +230,7 @@ namespace bt
- 			create();
- 			if (!fptr.open(path,"r+b"))
- 			{
--				throw Error(i18n("Failed to write last chunk to DND file : %1").tqarg(fptr.errorString()));
-+				throw Error(i18n("Failed to write last chunk to DND file : %1").arg(fptr.errorString()));
- 			}
- 		}
- 		
-diff --git a/libktorrent/torrent/ipblocklist.cpp b/libktorrent/torrent/ipblocklist.cpp
-index 547b6ad..f524d6b 100644
---- a/libktorrent/torrent/ipblocklist.cpp
-+++ b/libktorrent/torrent/ipblocklist.cpp
-@@ -338,7 +338,7 @@ namespace bt
- 		if(tmpmask == 0)
- 			out.prepend("*");
- 		else
--			out.prepend(TQString("%1").tqarg(tmp));
-+			out.prepend(TQString("%1").arg(tmp));
- 		ip >>= 8;
- 		mask >>= 8;
- 		tmp = ip;
-@@ -348,7 +348,7 @@ namespace bt
- 		if(tmpmask == 0)
- 			out.prepend("*.");
- 		else
--			out.prepend(TQString("%1.").tqarg(tmp));
-+			out.prepend(TQString("%1.").arg(tmp));
- 		ip >>= 8;
- 		mask >>= 8;
- 		tmp = ip;
-@@ -358,7 +358,7 @@ namespace bt
- 		if(tmpmask == 0)
- 			out.prepend("*.");
- 		else
--			out.prepend(TQString("%1.").tqarg(tmp));
-+			out.prepend(TQString("%1.").arg(tmp));
- 		ip >>= 8;
- 		mask >>= 8;
- 		tmp = ip;
-@@ -368,7 +368,7 @@ namespace bt
- 		if(tmpmask == 0)
- 			out.prepend("*.");
- 		else
--			out.prepend(TQString("%1.").tqarg(tmp));
-+			out.prepend(TQString("%1.").arg(tmp));
- 	
- 		return out;
- 	}
-diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
-index e842560..9d41fb8 100644
---- a/libktorrent/torrent/multifilecache.cpp
-+++ b/libktorrent/torrent/multifilecache.cpp
-@@ -592,7 +592,7 @@ namespace bt
- 		DNDFile out(dst_file);
- 		File fptr;
- 		if (!fptr.open(src_file,"rb"))
--			throw Error(i18n("Cannot open file %1 : %2").tqarg(src_file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open file %1 : %2").arg(src_file).arg(fptr.errorString()));
- 		
- 		Uint32 cs = 0;
- 		if (tf->getFirstChunk() == tor.getNumChunks() - 1)
-@@ -654,7 +654,7 @@ namespace bt
- 			// first attempt failed, must be fat so try that
- 			if (!FatPreallocate(output_file,tf->getSize()))
- 			{	
--				throw Error(i18n("Cannot preallocate diskspace : %1").tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot preallocate diskspace : %1").arg(strerror(errno)));
- 			}
- 		}
- 		
-@@ -670,7 +670,7 @@ namespace bt
- 		
- 		File fptr;
- 		if (!fptr.open(output_file,"r+b"))
--			throw Error(i18n("Cannot open file %1 : %2").tqarg(output_file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open file %1 : %2").arg(output_file).arg(fptr.errorString()));
- 			
- 		
- 		Uint32 ts = cs - tf->getFirstChunkOffset() > tf->getLastChunkSize() ? 
-@@ -782,7 +782,7 @@ namespace bt
- 			else
- 			{
- 				
--				// tqchildren, so we cannot delete any more directories higher up
-+				// children, so we cannot delete any more directories higher up
- 				return;
- 			}
- 		}
-diff --git a/libktorrent/torrent/packet.cpp b/libktorrent/torrent/packet.cpp
-index 4e6cf01..e5b1aa0 100644
---- a/libktorrent/torrent/packet.cpp
-+++ b/libktorrent/torrent/packet.cpp
-@@ -138,16 +138,16 @@ namespace bt
- 		
- 		switch (data[4])
- 		{
--			case CHOKE : return TQString("CHOKE %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case UNCHOKE : return TQString("UNCHOKE %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case INTERESTED : return TQString("INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case HAVE : return TQString("HAVE %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case BITFIELD : return TQString("BITFIELD %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case PIECE : return TQString("PIECE %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case REQUEST : return TQString("REQUEST %1 %2").tqarg(hdr_length).tqarg(data_length);
--			case CANCEL : return TQString("CANCEL %1 %2").tqarg(hdr_length).tqarg(data_length);
--			default: return TQString("UNKNOWN %1 %2").tqarg(hdr_length).tqarg(data_length);
-+			case CHOKE : return TQString("CHOKE %1 %2").arg(hdr_length).arg(data_length);
-+			case UNCHOKE : return TQString("UNCHOKE %1 %2").arg(hdr_length).arg(data_length);
-+			case INTERESTED : return TQString("INTERESTED %1 %2").arg(hdr_length).arg(data_length);
-+			case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").arg(hdr_length).arg(data_length);
-+			case HAVE : return TQString("HAVE %1 %2").arg(hdr_length).arg(data_length);
-+			case BITFIELD : return TQString("BITFIELD %1 %2").arg(hdr_length).arg(data_length);
-+			case PIECE : return TQString("PIECE %1 %2").arg(hdr_length).arg(data_length);
-+			case REQUEST : return TQString("REQUEST %1 %2").arg(hdr_length).arg(data_length);
-+			case CANCEL : return TQString("CANCEL %1 %2").arg(hdr_length).arg(data_length);
-+			default: return TQString("UNKNOWN %1 %2").arg(hdr_length).arg(data_length);
- 		}
- 	}
- 	*/
-diff --git a/libktorrent/torrent/packetreader.cpp b/libktorrent/torrent/packetreader.cpp
-index 3d4910a..b17becc 100644
---- a/libktorrent/torrent/packetreader.cpp
-+++ b/libktorrent/torrent/packetreader.cpp
-@@ -36,13 +36,13 @@ namespace bt
- #ifdef LOG_PACKET
- 	static void LogPacket(const Uint8* data,Uint32 size,Uint32 len)
- 	{
--		TQString file = TQString("/tmp/kt-packetreader-%1.log").tqarg(getpid());
-+		TQString file = TQString("/tmp/kt-packetreader-%1.log").arg(getpid());
- 		File fptr;
- 		if (!fptr.open(file,"a"))
- 			return;
- 		
- 		
--		TQString tmp = TQString("PACKET len = %1, type = %2\nDATA: \n").tqarg(len).tqarg(data[0]);
-+		TQString tmp = TQString("PACKET len = %1, type = %2\nDATA: \n").arg(len).arg(data[0]);
- 		
- 		fptr.write(tmp.ascii(),tmp.length());
- 		
-@@ -51,7 +51,7 @@ namespace bt
- 		{
- 			for (Uint32 i = 0;i < size;i++)
- 			{
--				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
-+				tmp = TQString("0x%1 ").arg(data[i],0,16);
- 				fptr.write(tmp.ascii(),tmp.length());
- 				j++;
- 				if (j > 10)
-@@ -65,7 +65,7 @@ namespace bt
- 		{
- 			for (Uint32 i = 0;i < 20;i++)
- 			{
--				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
-+				tmp = TQString("0x%1 ").arg(data[i],0,16);
- 				fptr.write(tmp.ascii(),tmp.length());
- 				j++;
- 				if (j > 10)
-@@ -78,7 +78,7 @@ namespace bt
- 			fptr.write(tmp.ascii(),tmp.length());
- 			for (Uint32 i = size - 20;i < size;i++)
- 			{
--				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
-+				tmp = TQString("0x%1 ").arg(data[i],0,16);
- 				fptr.write(tmp.ascii(),tmp.length());
- 				j++;
- 				if (j > 10)
-diff --git a/libktorrent/torrent/packetwriter.cpp b/libktorrent/torrent/packetwriter.cpp
-index 6c186dc..21d26cf 100644
---- a/libktorrent/torrent/packetwriter.cpp
-+++ b/libktorrent/torrent/packetwriter.cpp
-@@ -195,7 +195,7 @@ namespace bt
- 		else
- 		{
- 	/*		Out(SYS_CON|LOG_DEBUG) << TQString("Uploading %1 %2 %3 %4 %5")
--					.tqarg(index).tqarg(begin).tqarg(len).tqarg((TQ_ULLONG)ch,0,16).tqarg((TQ_ULLONG)ch->getData(),0,16) 
-+					.arg(index).arg(begin).arg(len).arg((TQ_ULLONG)ch,0,16).arg((TQ_ULLONG)ch->getData(),0,16) 
- 					<< endl;;
- 	*/
- 			queuePacket(new Packet(index,begin,len,ch));
-@@ -218,7 +218,7 @@ namespace bt
- 			enc.write(TQString("p")); 
- 			enc.write((Uint32)port);
- 		}
--		enc.write(TQString("v")); enc.write(TQString("KTorrent %1").tqarg(kt::VERSION_STRING));
-+		enc.write(TQString("v")); enc.write(TQString("KTorrent %1").arg(kt::VERSION_STRING));
- 		enc.end();
- 		sendExtProtMsg(0,arr);
- 	}
-diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp
-index 09b4bff..802fca6 100644
---- a/libktorrent/torrent/peerid.cpp
-+++ b/libktorrent/torrent/peerid.cpp
-@@ -174,7 +174,7 @@ namespace bt
- 			Map["TS"] = "Torrent Storm";
- 			Map["TT"] = "TuoTu";
- 			Map["UL"] = "uLeecher!";
--			Map["UT"] = TQString("%1Torrent").tqarg(TQChar(0x00B5)); // µTorrent, 0x00B5 is tqunicode for µ
-+			Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is tqunicode for µ
- 			Map["WT"] = "BitLet";
- 			Map["WY"] = "FireTorrent";
- 			Map["XL"] = "Xunlei";
-@@ -201,31 +201,31 @@ namespace bt
- 		}
- 
- 		TQString name = i18n("Unknown client");
--		if (peer_id.tqat(0) == '-' &&
--			peer_id.tqat(1).isLetter() &&
--			peer_id.tqat(2).isLetter() ) //AZ style
-+		if (peer_id.at(0) == '-' &&
-+			peer_id.at(1).isLetter() &&
-+			peer_id.at(2).isLetter() ) //AZ style
- 		{
- 			TQString ID(peer_id.mid(1,2));
- 			if (Map.contains(ID))
--				name = Map[ID] + " " + peer_id.tqat(3) + "." + peer_id.tqat(4) + "."
--					+ peer_id.tqat(5) + "." + peer_id.tqat(6);
-+				name = Map[ID] + " " + peer_id.at(3) + "." + peer_id.at(4) + "."
-+					+ peer_id.at(5) + "." + peer_id.at(6);
- 		}
--		else if (peer_id.tqat(0).isLetter() &&
--				peer_id.tqat(1).isDigit() &&
--				peer_id.tqat(2).isDigit() )  //Shadow's style
-+		else if (peer_id.at(0).isLetter() &&
-+				peer_id.at(1).isDigit() &&
-+				peer_id.at(2).isDigit() )  //Shadow's style
- 		{
--			TQString ID = TQString(peer_id.tqat(0));
-+			TQString ID = TQString(peer_id.at(0));
- 			if (Map.contains(ID))
--				name = Map[ID] + " " + peer_id.tqat(1) + "." +
--						peer_id.tqat(2) + "." + peer_id.tqat(3);
-+				name = Map[ID] + " " + peer_id.at(1) + "." +
-+						peer_id.at(2) + "." + peer_id.at(3);
- 		}
--		else if (peer_id.tqat(0) == 'M' && peer_id.tqat(2) == '-' && (peer_id.tqat(4) == '-' || peer_id.tqat(5) == '-'))
-+		else if (peer_id.at(0) == 'M' && peer_id.at(2) == '-' && (peer_id.at(4) == '-' || peer_id.at(5) == '-'))
- 		{
--			name = Map["M"] + " " + peer_id.tqat(1) + "." + peer_id.tqat(3);
--			if(peer_id.tqat(4) == '-')
--				name += "." + peer_id.tqat(5);
-+			name = Map["M"] + " " + peer_id.at(1) + "." + peer_id.at(3);
-+			if(peer_id.at(4) == '-')
-+				name += "." + peer_id.at(5);
- 			else
--				name += peer_id.tqat(4) + "." + peer_id.tqat(6);
-+				name += peer_id.at(4) + "." + peer_id.at(6);
- 		}
- 		else if (peer_id.startsWith("OP"))
- 		{
-@@ -245,7 +245,7 @@ namespace bt
- 		}
- 		else if ( peer_id.startsWith("Mbrst"))
- 		{
--			name = Map["Mbrst"] + " " + peer_id.tqat(5) + "." + peer_id.tqat(7);
-+			name = Map["Mbrst"] + " " + peer_id.at(5) + "." + peer_id.at(7);
- 		}
- 			
- 		return name;
-diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp
-index adacbae..eefd246 100644
---- a/libktorrent/torrent/peermanager.cpp
-+++ b/libktorrent/torrent/peermanager.cpp
-@@ -475,10 +475,10 @@ namespace bt
- 				
- 				// convert IP address to string 
- 				pp.ip = TQString("%1.%2.%3.%4")
--						.tqarg((e.ip & 0xFF000000) >> 24)
--						.tqarg((e.ip & 0x00FF0000) >> 16)
--						.tqarg((e.ip & 0x0000FF00) >> 8)
--						.tqarg( e.ip & 0x000000FF);
-+						.arg((e.ip & 0xFF000000) >> 24)
-+						.arg((e.ip & 0x00FF0000) >> 16)
-+						.arg((e.ip & 0x0000FF00) >> 8)
-+						.arg( e.ip & 0x000000FF);
- 				pp.port = e.port;
- 				addPotentialPeer(pp);
- 			}
-@@ -564,10 +564,10 @@ namespace bt
- 			pp.port = ReadUint16(tmp,4);
- 			Uint32 ip = ReadUint32(tmp,0);
- 			pp.ip = TQString("%1.%2.%3.%4")
--						.tqarg((ip & 0xFF000000) >> 24)
--						.tqarg((ip & 0x00FF0000) >> 16)
--						.tqarg((ip & 0x0000FF00) >> 8)
--						.tqarg( ip & 0x000000FF);
-+						.arg((ip & 0xFF000000) >> 24)
-+						.arg((ip & 0x00FF0000) >> 16)
-+						.arg((ip & 0x0000FF00) >> 8)
-+						.arg( ip & 0x000000FF);
- 			pp.local = false;
- 			
- 			addPotentialPeer(pp);
-diff --git a/libktorrent/torrent/peeruploader.cpp b/libktorrent/torrent/peeruploader.cpp
-index 4881dc8..2de899b 100644
---- a/libktorrent/torrent/peeruploader.cpp
-+++ b/libktorrent/torrent/peeruploader.cpp
-@@ -45,7 +45,7 @@ namespace bt
- 	void PeerUploader::addRequest(const Request & r)
- 	{
- 	//	Out(SYS_CON|LOG_DEBUG) << 
--	//			TQString("PeerUploader::addRequest %1 %2 %3\n").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()) << endl;
-+	//			TQString("PeerUploader::addRequest %1 %2 %3\n").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()) << endl;
- 		
- 		// allowed fast chunks go to the front of the queue
- 		requests.append(r);
-@@ -54,7 +54,7 @@ namespace bt
- 	void PeerUploader::removeRequest(const Request & r)
- 	{
- 	//	Out(SYS_CON|LOG_DEBUG) << 
--	//			TQString("PeerUploader::removeRequest %1 %2 %3\n").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()) << endl;
-+	//			TQString("PeerUploader::removeRequest %1 %2 %3\n").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()) << endl;
- 		requests.remove(r);
- 		peer->getPacketWriter().doNotSendPiece(r,peer->getStats().fast_extensions);
- 	}
-diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
-index affedf5..0c76b8a 100644
---- a/libktorrent/torrent/queuemanager.cpp
-+++ b/libktorrent/torrent/queuemanager.cpp
-@@ -132,7 +132,7 @@ namespace bt
- 							return kt::NOT_ENOUGH_DISKSPACE;
- 
- 						case 1: //ask user
--							if (KMessageBox::questionYesNo(0, i18n("You don't have enough disk space to download this torrent. Are you sure you want to continue?"), i18n("Insufficient disk space for %1").tqarg(s.torrent_name)) == KMessageBox::No)
-+							if (KMessageBox::questionYesNo(0, i18n("You don't have enough disk space to download this torrent. Are you sure you want to continue?"), i18n("Insufficient disk space for %1").arg(s.torrent_name)) == KMessageBox::No)
- 							{
- 								tc->setPriority(0);
- 								return kt::USER_CANCELED;
-@@ -154,7 +154,7 @@ namespace bt
- 
- 			if (s.completed && max_ratio > 0 && ratio >= max_ratio)
- 			{
--				if (KMessageBox::questionYesNo(0, i18n("Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start seeding anyway?").tqarg(s.torrent_name), i18n("Maximum share ratio limit reached.")) == KMessageBox::Yes)
-+				if (KMessageBox::questionYesNo(0, i18n("Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start seeding anyway?").arg(s.torrent_name), i18n("Maximum share ratio limit reached.")) == KMessageBox::Yes)
- 				{
- 					tc->setMaxShareRatio(0.00f);
- 					startSafely(tc);
-@@ -234,7 +234,7 @@ namespace bt
- 				{
- 					TQString msg =
- 						i18n("Error stopping torrent %1 : %2")
--						.tqarg(s.torrent_name).tqarg(err.toString());
-+						.arg(s.torrent_name).arg(err.toString());
- 					KMessageBox::error(0, msg, i18n("Error"));
- 				}
- 			}
-@@ -740,7 +740,7 @@ namespace bt
- 
- 			TQString msg =
- 				i18n("Error starting torrent %1 : %2")
--				.tqarg(s.torrent_name).tqarg(err.toString());
-+				.arg(s.torrent_name).arg(err.toString());
- 
- 			KMessageBox::error(0, msg, i18n("Error"));
- 		}
-@@ -758,7 +758,7 @@ namespace bt
- 
- 			TQString msg =
- 				i18n("Error stopping torrent %1 : %2")
--				.tqarg(s.torrent_name).tqarg(err.toString());
-+				.arg(s.torrent_name).arg(err.toString());
- 
- 			KMessageBox::error(0, msg, i18n("Error"));
- 		}
-diff --git a/libktorrent/torrent/torrent.cpp b/libktorrent/torrent/torrent.cpp
-index c5d8459..c175be9 100644
---- a/libktorrent/torrent/torrent.cpp
-+++ b/libktorrent/torrent/torrent.cpp
-@@ -101,7 +101,7 @@ namespace bt
- 		TQFile fptr(file);
- 		if (!fptr.open(IO_ReadOnly))
- 			throw Error(i18n(" Unable to open torrent file %1 : %2")
--					.tqarg(file).tqarg(fptr.errorString()));
-+					.arg(file).arg(fptr.errorString()));
- 		
- 		TQByteArray data(fptr.size());
- 	//	Out() << "File size = " << fptr.size() << endl;
-@@ -366,7 +366,7 @@ namespace bt
- 	const SHA1Hash & Torrent::getHash(Uint32 idx) const
- 	{
- 		if (idx >= hash_pieces.count())
--			throw Error(TQString("Torrent::getHash %1 is out of bounds").tqarg(idx));
-+			throw Error(TQString("Torrent::getHash %1 is out of bounds").arg(idx));
- 		
- 		return hash_pieces[idx];
- 	}
-diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
-index 590a517..3e22ec1 100644
---- a/libktorrent/torrent/torrentcontrol.cpp
-+++ b/libktorrent/torrent/torrentcontrol.cpp
-@@ -506,7 +506,7 @@ namespace bt
- 			delete tor;
- 			tor = 0;
- 			throw Error(i18n("An error occurred while loading the torrent."
--					" The torrent is probably corrupt or is not a torrent file.\n%1").tqarg(torrent));
-+					" The torrent is probably corrupt or is not a torrent file.\n%1").arg(torrent));
- 		}
- 		
- 		initInternal(qman,tmpdir,ddir,default_save_dir,torrent.startsWith(tmpdir));
-@@ -544,7 +544,7 @@ namespace bt
- 		TQFile fptr(tor_copy);
- 		if (!fptr.open(IO_WriteOnly))
- 			throw Error(i18n("Unable to create %1 : %2")
--					.tqarg(tor_copy).tqarg(fptr.errorString()));
-+					.arg(tor_copy).arg(fptr.errorString()));
- 	
- 		fptr.writeBlock(data.data(),data.size());
- 	}
-@@ -559,12 +559,12 @@ namespace bt
- 			{
- 				qman->mergeAnnounceList(tor->getInfoHash(),tor->getTrackerList());
- 
--				throw Error(i18n("You are already downloading this torrent %1, the list of trackers of both torrents has been merged.").tqarg(tor->getNameSuggestion()));
-+				throw Error(i18n("You are already downloading this torrent %1, the list of trackers of both torrents has been merged.").arg(tor->getNameSuggestion()));
- 			}
- 			else
- 			{
- 				throw Error(i18n("You are already downloading the torrent %1")
--						.tqarg(tor->getNameSuggestion()));
-+						.arg(tor->getNameSuggestion()));
- 			}
- 		}
- 	}
-@@ -670,7 +670,7 @@ namespace bt
- 				
- 				throw Error(
- 						i18n("Cannot migrate %1 : %2")
--						.tqarg(tor->getNameSuggestion()).tqarg(err.toString()));
-+						.arg(tor->getNameSuggestion()).arg(err.toString()));
- 			}
- 		}
- 		setupData(ddir);
-@@ -993,20 +993,20 @@ namespace bt
- 		if (stats.running)
- 		{
- 			TQDateTime now = TQDateTime::currentDateTime();
--			st.write("RUNNING_TIME_DL",TQString("%1").tqarg(istats.running_time_dl + istats.time_started_dl.secsTo(now)));
--			st.write("RUNNING_TIME_UL",TQString("%1").tqarg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
-+			st.write("RUNNING_TIME_DL",TQString("%1").arg(istats.running_time_dl + istats.time_started_dl.secsTo(now)));
-+			st.write("RUNNING_TIME_UL",TQString("%1").arg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
- 		}
- 		else
- 		{
--			st.write("RUNNING_TIME_DL", TQString("%1").tqarg(istats.running_time_dl));
--			st.write("RUNNING_TIME_UL", TQString("%1").tqarg(istats.running_time_ul));
-+			st.write("RUNNING_TIME_DL", TQString("%1").arg(istats.running_time_dl));
-+			st.write("RUNNING_TIME_UL", TQString("%1").arg(istats.running_time_ul));
- 		}
- 		
--		st.write("PRIORITY", TQString("%1").tqarg(istats.priority));
--		st.write("AUTOSTART", TQString("%1").tqarg(stats.autostart));
--		st.write("IMPORTED", TQString("%1").tqarg(stats.imported_bytes));
-+		st.write("PRIORITY", TQString("%1").arg(istats.priority));
-+		st.write("AUTOSTART", TQString("%1").arg(stats.autostart));
-+		st.write("IMPORTED", TQString("%1").arg(stats.imported_bytes));
- 		st.write("CUSTOM_OUTPUT_NAME",istats.custom_output_name ? "1" : "0");
--		st.write("MAX_RATIO", TQString("%1").tqarg(stats.max_share_ratio,0,'f',2));
-+		st.write("MAX_RATIO", TQString("%1").arg(stats.max_share_ratio,0,'f',2));
- 		st.write("MAX_SEED_TIME",TQString::number(stats.max_seed_time));
- 		st.write("RESTART_DISK_PREALLOCATION",prealloc ? "1" : "0");
- 		
-@@ -1274,7 +1274,7 @@ namespace bt
- 							" To make sure this torrent still works with this version of KTorrent, "
- 							"we will migrate this torrent. You will be asked for a location to save "
- 							"the torrent to. If you press cancel, we will select your home directory.")
--								.tqarg(tor->getNameSuggestion()));
-+								.arg(tor->getNameSuggestion()));
- 					outputdir = KFileDialog::getExistingDirectory(TQString(), 0,i18n("Select Folder to Save To"));
- 					if (outputdir.isNull())
- 						outputdir = TQDir::homeDirPath();
-diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp
-index 5538b9e..fae7d75 100644
---- a/libktorrent/torrent/torrentcreator.cpp
-+++ b/libktorrent/torrent/torrentcreator.cpp
-@@ -120,7 +120,7 @@ namespace bt
- 	{
- 		File fptr;
- 		if (!fptr.open(url,"wb"))
--			throw Error(i18n("Cannot open file %1: %2").tqarg(url).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open file %1: %2").arg(url).arg(fptr.errorString()));
- 
- 		BEncoder enc(&fptr);
- 		enc.beginDict(); // top dict
-@@ -147,7 +147,7 @@ namespace bt
- 			enc.write(TQString("comments"));
- 			enc.write(comments);
- 		}
--		enc.write(TQString("created by"));enc.write(TQString("KTorrent %1").tqarg(kt::VERSION_STRING));
-+		enc.write(TQString("created by"));enc.write(TQString("KTorrent %1").arg(kt::VERSION_STRING));
- 		enc.write(TQString("creation date"));enc.write((Uint64)time(0));
- 		enc.write(TQString("info"));
- 		saveInfo(enc);
-@@ -237,7 +237,7 @@ namespace bt
- 		File fptr;
- 		if (!fptr.open(target,"rb"))
- 			throw Error(i18n("Cannot open file %1: %2")
--					.tqarg(target).tqarg(fptr.errorString()));
-+					.arg(target).arg(fptr.errorString()));
- 
- 		Uint32 s = cur_chunk != num_chunks - 1 ? chunk_size : last_size;
- 		fptr.seek(File::BEGIN,(Int64)cur_chunk*chunk_size);
-@@ -275,7 +275,7 @@ namespace bt
- 			if (!fptr.open(target + f.getPath(),"rb"))
- 			{
- 				throw Error(i18n("Cannot open file %1: %2")
--						.tqarg(f.getPath()).tqarg(fptr.errorString()));
-+						.arg(f.getPath()).arg(fptr.errorString()));
- 			}
- 
- 			// first calculate offset into file
-@@ -336,7 +336,7 @@ namespace bt
- 		// write full index file
- 		File fptr;
- 		if (!fptr.open(dd + "index","wb"))
--			throw Error(i18n("Cannot create index file: %1").tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot create index file: %1").arg(fptr.errorString()));
- 
- 		for (Uint32 i = 0;i < num_chunks;i++)
- 		{
-diff --git a/libktorrent/torrent/udptracker.cpp b/libktorrent/torrent/udptracker.cpp
-index 6597349..ab33771 100644
---- a/libktorrent/torrent/udptracker.cpp
-+++ b/libktorrent/torrent/udptracker.cpp
-@@ -144,10 +144,10 @@ namespace bt
- 		{
- 			Uint32 ip = ReadUint32(buf,i);
- 			addPeer(TQString("%1.%2.%3.%4")
--					.tqarg((ip & (0xFF000000)) >> 24)
--					.tqarg((ip & (0x00FF0000)) >> 16)
--					.tqarg((ip & (0x0000FF00)) >> 8)
--					.tqarg(ip & 0x000000FF),
-+					.arg((ip & (0xFF000000)) >> 24)
-+					.arg((ip & (0x00FF0000)) >> 16)
-+					.arg((ip & (0x0000FF00)) >> 8)
-+					.arg(ip & 0x000000FF),
- 					ReadUint16(buf,i+4));
- 		}
- 		
-diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp
-index e440e3c..78be6ad 100644
---- a/libktorrent/torrent/udptrackersocket.cpp
-+++ b/libktorrent/torrent/udptrackersocket.cpp
-@@ -59,7 +59,7 @@ namespace bt
- 		if (!bound)
- 		{
- 			KMessageBox::error(0,
--				i18n("Cannot bind to udp port %1 or the 10 following ports.").tqarg(port));
-+				i18n("Cannot bind to udp port %1 or the 10 following ports.").arg(port));
- 		}
- 		else
- 		{
-diff --git a/libktorrent/util/autorotatelogjob.cpp b/libktorrent/util/autorotatelogjob.cpp
-index d3a2d8a..de4d1c5 100644
---- a/libktorrent/util/autorotatelogjob.cpp
-+++ b/libktorrent/util/autorotatelogjob.cpp
-@@ -46,8 +46,8 @@ namespace bt
- 	{
- 		while (cnt > 1)
- 		{
--			TQString prev = TQString("%1-%2.gz").tqarg(file).tqarg(cnt - 1);
--			TQString curr = TQString("%1-%2.gz").tqarg(file).tqarg(cnt);
-+			TQString prev = TQString("%1-%2.gz").arg(file).arg(cnt - 1);
-+			TQString curr = TQString("%1-%2.gz").arg(file).arg(cnt);
- 			if (bt::Exists(prev)) // if file exists start the move job
- 			{
- 				KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false);
-diff --git a/libktorrent/util/file.cpp b/libktorrent/util/file.cpp
-index f757142..d27ccba 100644
---- a/libktorrent/util/file.cpp
-+++ b/libktorrent/util/file.cpp
-@@ -84,7 +84,7 @@ namespace bt
- 			if (errno == ENOSPC)
- 				Out() << "Disk full !" << endl;
- 			
--			throw Error(i18n("Cannot write to %1 : %2").tqarg(file).tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot write to %1 : %2").arg(file).arg(strerror(errno)));
- 		}
- 		return ret;
- 	}
-@@ -98,7 +98,7 @@ namespace bt
- 		if (ferror(fptr))
- 		{
- 			clearerr(fptr);
--			throw Error(i18n("Cannot read from %1").tqarg(file));
-+			throw Error(i18n("Cannot read from %1").arg(file));
- 		}
- 		return ret;
- 	}
-diff --git a/libktorrent/util/fileops.cpp b/libktorrent/util/fileops.cpp
-index a83134a..d9ef172 100644
---- a/libktorrent/util/fileops.cpp
-+++ b/libktorrent/util/fileops.cpp
-@@ -76,10 +76,10 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot create directory %1: %2")
--					.tqarg(dir).tqarg(strerror(errno)));
-+					.arg(dir).arg(strerror(errno)));
- 			else
- 			{
--				Out() << TQString("Error : Cannot create directory %1 : %2").tqarg(dir).tqarg(strerror(errno))<< endl;
-+				Out() << TQString("Error : Cannot create directory %1 : %2").arg(dir).arg(strerror(errno))<< endl;
- 			}
- 		}
- 	}
-@@ -90,12 +90,12 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot symlink %1 to %2: %3")
--					.tqarg(link_url.utf8().data()).tqarg(link_to.utf8().data())
--					.tqarg(strerror(errno)));
-+					.arg(link_url.utf8().data()).arg(link_to.utf8().data())
-+					.arg(strerror(errno)));
- 			else
- 				Out() << TQString("Error : Cannot symlink %1 to %2: %3")
--						.tqarg(link_url.utf8().data()).tqarg(link_to.utf8().data())
--				.tqarg(strerror(errno)) << endl;
-+						.arg(link_url.utf8().data()).arg(link_to.utf8().data())
-+				.arg(strerror(errno)) << endl;
- 		}
- 	}
- 
-@@ -106,12 +106,12 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot move %1 to %2: %3")
--					.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()));
-+					.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()));
- 			else
- 				Out() << TQString("Error : Cannot move %1 to %2: %3")
--						.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()) << endl;
-+						.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()) << endl;
- 		
- 		}
- 	}
-@@ -122,12 +122,12 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot copy %1 to %2: %3")
--						.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()));
-+						.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()));
- 			else
- 				Out() << TQString("Error : Cannot copy %1 to %2: %3")
--						.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()) << endl;
-+						.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()) << endl;
- 	
- 		}
- 	}
-@@ -138,12 +138,12 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot copy %1 to %2: %3")
--						.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()));
-+						.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()));
- 			else
- 				Out() << TQString("Error : Cannot copy %1 to %2: %3")
--						.tqarg(src).tqarg(dst)
--						.tqarg(KIO::NetAccess::lastErrorString()) << endl;
-+						.arg(src).arg(dst)
-+						.arg(KIO::NetAccess::lastErrorString()) << endl;
- 	
- 		}
- 	}
-@@ -230,8 +230,8 @@ namespace bt
- 		if (!ok)
- 		{
- 			TQString err = i18n("Cannot delete %1: %2")
--					.tqarg(url)
--					.tqarg(strerror(errno));
-+					.arg(url)
-+					.arg(strerror(errno));
- 			if (!nothrow)
- 				throw Error(err);
- 			else
-@@ -249,8 +249,8 @@ namespace bt
- 		{
- 			if (!nothrow)
- 				throw Error(i18n("Cannot create %1: %2")
--						.tqarg(url)
--						.tqarg(fptr.errorString()));
-+						.arg(url)
-+						.arg(fptr.errorString()));
- 			else
- 				Out() << "Error : Cannot create " << url << " : "
- 						<< fptr.errorString() << endl;
-@@ -270,7 +270,7 @@ namespace bt
- #endif
- 		if (ret < 0)
- 			throw Error(i18n("Cannot calculate the filesize of %1: %2")
--					.tqarg(url).tqarg(strerror(errno)));
-+					.arg(url).arg(strerror(errno)));
- 		
- 		return (Uint64)sb.st_size;
- 	}
-@@ -286,7 +286,7 @@ namespace bt
- 		ret = fstat(fd,&sb);
- #endif
- 		if (ret < 0)
--			throw Error(i18n("Cannot calculate the filesize : %2").tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot calculate the filesize : %2").arg(strerror(errno)));
- 		
- 		return (Uint64)sb.st_size;
- 	}
-@@ -314,7 +314,7 @@ namespace bt
- 	{
- 		int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
--			throw Error(i18n("Cannot open %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot open %1 : %2").arg(path).arg(strerror(errno)));
- 		
- 		bool ret = FatPreallocate(fd,size);
- 		close(fd);
-@@ -343,7 +343,7 @@ namespace bt
- 	{
- 		int fd = ::open(TQFile::encodeName(path), O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
--			throw Error(i18n("Cannot open %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot open %1 : %2").arg(path).arg(strerror(errno)));
- 		
- 		bool ret = XfsPreallocate(fd,size);
- 		close(fd);
-@@ -364,16 +364,16 @@ namespace bt
- #else
- 			if (ftruncate(fd,size) == -1)
- #endif	
--				throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
- 		}
- 		else
- 		{
- #if HAVE_POSIX_FALLOCATE64
- 			if (posix_fallocate64(fd,0,size) != 0)
--				throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
- #elif HAVE_POSIX_FALLOCATE
- 			if (posix_fallocate(fd,0,size) != 0)
--				throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno)));
-+				throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
- #else
- 			SeekFile(fd,0,SEEK_SET);
- 			bt::Array<Uint8> buf(4096);
-@@ -388,9 +388,9 @@ namespace bt
- 				
- 				int ret = write(fd,buf,to_write);
- 				if (ret < 0)
--					throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno)));
-+					throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
- 				else if (ret == 0 || ret != (int)to_write)
--					throw Error(i18n("Cannot expand file").tqarg(strerror(errno)));
-+					throw Error(i18n("Cannot expand file").arg(strerror(errno)));
- 				else
- 					written += to_write;
- 			}
-@@ -402,7 +402,7 @@ namespace bt
- 	{
- 		int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE);
- 		if (fd < 0)
--			throw Error(i18n("Cannot open %1 : %2").tqarg(path).tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot open %1 : %2").arg(path).arg(strerror(errno)));
- 		
- 		try
- 		{
-@@ -423,7 +423,7 @@ namespace bt
- #else
- 		if (lseek(fd,off,whence) == -1)
- #endif
--			throw Error(i18n("Cannot seek in file : %1").tqarg(strerror(errno)));
-+			throw Error(i18n("Cannot seek in file : %1").arg(strerror(errno)));
- 	}
- 	
- 	bool FreeDiskSpace(const TQString & path,Uint64 & bytes_free)
-diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
-index 2cb53da..2fb36f9 100644
---- a/libktorrent/util/log.cpp
-+++ b/libktorrent/util/log.cpp
-@@ -79,8 +79,8 @@ namespace bt
- 			// move all log files one up
- 			for (Uint32 i = 10;i > 1;i--)
- 			{
--				TQString prev = TQString("%1-%2.gz").tqarg(file).tqarg(i - 1);
--				TQString curr = TQString("%1-%2.gz").tqarg(file).tqarg(i);
-+				TQString prev = TQString("%1-%2.gz").arg(file).arg(i - 1);
-+				TQString curr = TQString("%1-%2.gz").arg(file).arg(i);
- 				if (bt::Exists(prev))
- 					bt::Move(prev,curr,true);
- 			}
-@@ -100,7 +100,7 @@ namespace bt
- 
- 			fptr.setName(file);
- 			if (!fptr.open(IO_WriteOnly))
--				throw Error(i18n("Cannot open log file %1 : %2").tqarg(file).tqarg(fptr.errorString()));
-+				throw Error(i18n("Cannot open log file %1 : %2").arg(file).arg(fptr.errorString()));
- 
- 			out->setDevice(TQT_TQIODEVICE(&fptr));
- 		}
-diff --git a/libktorrent/util/profiler.cpp b/libktorrent/util/profiler.cpp
-index a0f42d2..4da9e7f 100644
---- a/libktorrent/util/profiler.cpp
-+++ b/libktorrent/util/profiler.cpp
-@@ -30,7 +30,7 @@ namespace bt
- 		min = max = avg = 0.0;
- 		count = 0;
- 		start_time = 0.0;
--		tqchildren.setAutoDelete(true);
-+		children.setAutoDelete(true);
- 	}
- 	
- 	Profile::~Profile()
-@@ -63,8 +63,8 @@ namespace bt
- 		
- 	Profile* Profile::child(const TQString & name)
- 	{
--		TQPtrList<Profile>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQPtrList<Profile>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			Profile* p = *i;
- 			if (p->name == name)
-@@ -73,7 +73,7 @@ namespace bt
- 		}
- 		
- 		Profile* p = new Profile(this,name);
--		tqchildren.append(p);
-+		children.append(p);
- 		return p;
- 	}
- 	
-@@ -84,8 +84,8 @@ namespace bt
- 		out.precision(5);
- 		out << qSetW(60) << nb << qSetW(10) << min << qSetW(10) << max << qSetW(10) << avg << qSetW(10) << count << endl;
- 		
--		TQPtrList<Profile>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		TQPtrList<Profile>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			Profile* p = *i;
- 			p->save(out,nb);
-diff --git a/libktorrent/util/profiler.h b/libktorrent/util/profiler.h
-index 917a671..1b220b1 100644
---- a/libktorrent/util/profiler.h
-+++ b/libktorrent/util/profiler.h
-@@ -35,7 +35,7 @@ namespace bt
- 	class Profile
- 	{
- 		Profile* parent;
--		TQPtrList<Profile> tqchildren;
-+		TQPtrList<Profile> children;
- 		
- 		TQString name;
- 		double min,max,avg;
-diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp
-index eaed47e..90595bd 100644
---- a/plugins/infowidget/chunkdownloadview.cpp
-+++ b/plugins/infowidget/chunkdownloadview.cpp
-@@ -43,7 +43,7 @@ namespace kt
- 		cd->getStats(s);
- 			
- 		setText(0,TQString::number(s.chunk_index));
--		setText(1,TQString("%1 / %2").tqarg(s.pieces_downloaded).tqarg(s.total_pieces));
-+		setText(1,TQString("%1 / %2").arg(s.pieces_downloaded).arg(s.total_pieces));
- 		setText(2,s.current_peer_id);
- 		setText(3,KBytesPerSecToString(s.download_speed / 1024.0));
- 		setText(4,TQString::number(s.num_downloaders));
-diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/plugins/infowidget/chunkdownloadviewbase.ui
-index 01386e0..ddac38e 100644
---- a/plugins/infowidget/chunkdownloadviewbase.ui
-+++ b/plugins/infowidget/chunkdownloadviewbase.ui
-@@ -59,7 +59,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -97,7 +97,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -135,7 +135,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -173,7 +173,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -211,7 +211,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -249,7 +249,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
-index b8d371f..6c80bf7 100644
---- a/plugins/infowidget/fileview.cpp
-+++ b/plugins/infowidget/fileview.cpp
-@@ -186,7 +186,7 @@ namespace kt
- 			else if (percent > 100.0)
- 				percent = 100.0;
- 			KLocale* loc = KGlobal::locale();
--			it.current()->setText(4,i18n("%1 %").tqarg(loc->formatNumber(percent,2)));
-+			it.current()->setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
- 		}
- 	}
- 
-diff --git a/plugins/infowidget/flagdb.cpp b/plugins/infowidget/flagdb.cpp
-index c7ec520..c1e1fb4 100644
---- a/plugins/infowidget/flagdb.cpp
-+++ b/plugins/infowidget/flagdb.cpp
-@@ -40,9 +40,9 @@ kt::FlagDBSource::FlagDBSource()
- TQString kt::FlagDBSource::FlagDBSource::getPath(const TQString& country) const
- {
- 	if (type) {
--		return locate(type, pathPattern.tqarg(country));
-+		return locate(type, pathPattern.arg(country));
- 	} else {
--		return pathPattern.tqarg(country);
-+		return pathPattern.arg(country);
- 	}
- }
- 
-diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/plugins/infowidget/iwfiletreediritem.cpp
-index c143e7e..2abd159 100644
---- a/plugins/infowidget/iwfiletreediritem.cpp
-+++ b/plugins/infowidget/iwfiletreediritem.cpp
-@@ -51,8 +51,8 @@ namespace kt
- 	void IWFileTreeDirItem::updatePercentageInformation()
- 	{
- 		// first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			IWFileTreeItem* item = (IWFileTreeItem*)i->second;
- 			item->updatePercentageInformation();
-@@ -71,8 +71,8 @@ namespace kt
- 	void IWFileTreeDirItem::updatePreviewInformation(kt::TorrentInterface* tc)
- 	{
- 		// first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			IWFileTreeItem* item = (IWFileTreeItem*)i->second;
- 			item->updatePreviewInformation(tc);
-@@ -91,11 +91,11 @@ namespace kt
- 	Priority IWFileTreeDirItem::updatePriorityInformation(kt::TorrentInterface* tc)
- 	{
-                 // first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
- 		bool setpriority = false;
- 		bool oneexcluded = false;
- 		Priority priority = PREVIEW_PRIORITY;
--		if(i != tqchildren.end())
-+		if(i != children.end())
- 		{
- 			IWFileTreeItem* item = (IWFileTreeItem*)i->second;
- 			item->updatePriorityInformation(tc);
-@@ -105,7 +105,7 @@ namespace kt
- 				oneexcluded = true;
- 			setpriority = true;
- 		}
--		while (i != tqchildren.end())
-+		while (i != children.end())
- 		{
- 			IWFileTreeItem* item = (IWFileTreeItem*)i->second;
- 			item->updatePriorityInformation(tc);
-@@ -118,7 +118,7 @@ namespace kt
- 
-                 // then recursivly move on to subdirs
- 		bt::PtrMap<TQString,FileTreeDirItem>::iterator j = subdirs.begin();
--		if(j != subdirs.end() && tqchildren.begin() == tqchildren.end())
-+		if(j != subdirs.end() && children.begin() == children.end())
- 		{
- 			Priority priority =
- 					((IWFileTreeDirItem*)j->second)->updatePriorityInformation(tc);
-@@ -189,8 +189,8 @@ namespace kt
- 	void IWFileTreeDirItem::updateDNDInformation()
- 	{
- 			// first set all the child items
--		bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin();
--		while (i != tqchildren.end())
-+		bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
-+		while (i != children.end())
- 		{
- 			IWFileTreeItem* item = (IWFileTreeItem*)i->second;
- 			item->updateDNDInformation();
-diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp
-index fbfdb4b..04a4e41 100644
---- a/plugins/infowidget/iwfiletreeitem.cpp
-+++ b/plugins/infowidget/iwfiletreeitem.cpp
-@@ -92,7 +92,7 @@ namespace kt
- 		else if (percent > 100.0)
- 			percent = 100.0;
- 		KLocale* loc = KGlobal::locale();
--		setText(4,i18n("%1 %").tqarg(loc->formatNumber(percent,2)));
-+		setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
- 		perc_complete = percent;
- 	}
- 	
-diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
-index 35d2024..365e79d 100644
---- a/plugins/infowidget/peerview.cpp
-+++ b/plugins/infowidget/peerview.cpp
-@@ -170,11 +170,11 @@ namespace kt
- 		setText(5,s.choked ? i18n("Yes") : i18n("No"));
- 		//setPixmap(6,!s.snubbed ? yes_pix : no_pix);
- 		setText(6,s.snubbed ? i18n("Yes") : i18n("No"));
--		setText(7,TQString("%1 %").tqarg(loc->formatNumber(s.perc_of_file,2)));
-+		setText(7,TQString("%1 %").arg(loc->formatNumber(s.perc_of_file,2)));
- 		setPixmap(8,s.dht_support ? yes_pix : no_pix);
- 		setText(9,loc->formatNumber(s.aca_score,2));
- 		setPixmap(10,s.has_upload_slot ? yes_pix : TQPixmap());
--		setText(11,TQString("%1 / %2").tqarg(s.num_down_requests).tqarg(s.num_up_requests));
-+		setText(11,TQString("%1 / %2").arg(s.num_down_requests).arg(s.num_up_requests));
- 		setText(12, BytesToString(s.bytes_downloaded));
- 		setText(13, BytesToString(s.bytes_uploaded));
- 	}
-diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp
-index dee05fc..44fe656 100644
---- a/plugins/infowidget/statustab.cpp
-+++ b/plugins/infowidget/statustab.cpp
-@@ -142,16 +142,16 @@ namespace kt
- 		m_tracker_status->setText(s.trackerstatus);
- 		
- 		m_seeders->setText(TQString("%1 (%2)")
--				.tqarg(s.seeders_connected_to).tqarg(s.seeders_total));
-+				.arg(s.seeders_connected_to).arg(s.seeders_total));
- 	
- 		m_leechers->setText(TQString("%1 (%2)")
--				.tqarg(s.leechers_connected_to).tqarg(s.leechers_total));
-+				.arg(s.leechers_connected_to).arg(s.leechers_total));
- 	
- 		float ratio = kt::ShareRatio(s);
- 		if(!maxRatio->hasFocus() && useLimit->isChecked())
- 			maxRatioUpdate();
- 		
--		m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").tqarg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").tqarg(KGlobal::locale()->formatNumber(ratio,2)));
-+		m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(KGlobal::locale()->formatNumber(ratio,2)));
- 	
- 		Uint32 secs = curr_tc->getRunningTimeUL(); 
- 		if (secs == 0)
-diff --git a/plugins/infowidget/statustabbase.ui b/plugins/infowidget/statustabbase.ui
-index f50e503..789c0e6 100644
---- a/plugins/infowidget/statustabbase.ui
-+++ b/plugins/infowidget/statustabbase.ui
-@@ -87,7 +87,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -107,7 +107,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -145,7 +145,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -165,7 +165,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -219,7 +219,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -239,7 +239,7 @@
-                             <property name="text">
-                                 <string></string>
-                             </property>
--                            <property name="tqalignment">
-+                            <property name="alignment">
-                                 <set>AlignVCenter|AlignRight</set>
-                             </property>
-                         </widget>
-@@ -573,7 +573,7 @@
-                                     <property name="text">
-                                         <string></string>
-                                     </property>
--                                    <property name="tqalignment">
-+                                    <property name="alignment">
-                                         <set>AlignVCenter|AlignRight</set>
-                                     </property>
-                                 </widget>
-diff --git a/plugins/ipfilter/antip2p.cpp b/plugins/ipfilter/antip2p.cpp
-index b3755ec..d37300e 100644
---- a/plugins/ipfilter/antip2p.cpp
-+++ b/plugins/ipfilter/antip2p.cpp
-@@ -67,19 +67,19 @@ namespace kt
- 	
- 		tmp = ip;
- 		tmp &= 0x000000FF;
--		out.prepend(TQString("%1").tqarg(tmp));
-+		out.prepend(TQString("%1").arg(tmp));
- 		ip >>= 8;
- 		tmp = ip;
- 		tmp &= 0x000000FF;
--		out.prepend(TQString("%1.").tqarg(tmp));
-+		out.prepend(TQString("%1.").arg(tmp));
- 		ip >>= 8;
- 		tmp = ip;
- 		tmp &= 0x000000FF;
--		out.prepend(TQString("%1.").tqarg(tmp));
-+		out.prepend(TQString("%1.").arg(tmp));
- 		ip >>= 8;
- 		tmp = ip;
- 		tmp &= 0x000000FF;
--		out.prepend(TQString("%1.").tqarg(tmp));
-+		out.prepend(TQString("%1.").arg(tmp));
- 	
- 		return out;
- 	}
-diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui
-index a77b639..2a1938c 100644
---- a/plugins/ipfilter/convert_dlg.ui
-+++ b/plugins/ipfilter/convert_dlg.ui
-@@ -46,7 +46,7 @@
-             <property name="scaledContents">
-                 <bool>false</bool>
-             </property>
--            <property name="tqalignment">
-+            <property name="alignment">
-                 <set>WordBreak|AlignVCenter</set>
-             </property>
-             <property name="indent">
-diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
-index d7f92d0..ba43ac9 100644
---- a/plugins/partfileimport/importdialog.cpp
-+++ b/plugins/partfileimport/importdialog.cpp
-@@ -97,7 +97,7 @@ namespace kt
- 		catch (Error & e)
- 		{
- 			delete dc;
--			KMessageBox::error(this,i18n("Cannot verify data : %1").tqarg(e.toString()),i18n("Error"));
-+			KMessageBox::error(this,i18n("Cannot verify data : %1").arg(e.toString()),i18n("Error"));
- 			reject();
- 			return;
- 		}
-@@ -204,7 +204,7 @@ namespace kt
- 			}
- 			catch (Error & e)
- 			{
--				KMessageBox::error(this,i18n("Cannot load the torrent file : %1").tqarg(e.toString()),
-+				KMessageBox::error(this,i18n("Cannot load the torrent file : %1").arg(e.toString()),
- 								   i18n("Error"));
- 				reject();
- 				return;
-@@ -240,7 +240,7 @@ namespace kt
- 			}
- 			catch (Error & e)
- 			{
--				KMessageBox::error(this,i18n("Cannot load the torrent file : %1").tqarg(e.toString()),
-+				KMessageBox::error(this,i18n("Cannot load the torrent file : %1").arg(e.toString()),
- 								   i18n("Error"));
- 				reject();
- 				return;
-@@ -254,7 +254,7 @@ namespace kt
- 		// first try to open it
- 		File fptr;
- 		if (!fptr.open(file,"wb"))
--			throw Error(i18n("Cannot open %1 : %2").tqarg(file).tqarg(fptr.errorString()));
-+			throw Error(i18n("Cannot open %1 : %2").arg(file).arg(fptr.errorString()));
- 		
- 		// write all chunks to the file
- 		for (Uint32 i = 0;i < chunks.getNumBits();i++)
-@@ -332,8 +332,8 @@ namespace kt
- 		out << "PRIORITY=0" << ::endl;
- 		out << "AUTOSTART=1" << ::endl;
- 		if (core->getGlobalMaxShareRatio() > 0)
--			out << TQString("MAX_RATIO=%1").tqarg(core->getGlobalMaxShareRatio(),0,'f',2) << ::endl;
--		out << TQString("IMPORTED=%1").tqarg(imported) << ::endl;
-+			out << TQString("MAX_RATIO=%1").arg(core->getGlobalMaxShareRatio(),0,'f',2) << ::endl;
-+		out << TQString("IMPORTED=%1").arg(imported) << ::endl;
- 		if (custom_output_name)
- 			out << "CUSTOM_OUTPUT_NAME=1" << endl;
- 	}
-diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
-index 57db6ee..4c11bb9 100644
---- a/plugins/rssfeed/rsslinkdownloader.cpp
-+++ b/plugins/rssfeed/rsslinkdownloader.cpp
-@@ -42,7 +42,7 @@ namespace kt
- 			if (!KURL(link).isValid())
- 			{
- 				// no valid URL, so just display an error message
--				KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink));
-+				KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
- 				TQTimer::singleShot(50,this,TQT_SLOT(suicide()));
- 			}
- 			else
-@@ -180,7 +180,7 @@ namespace kt
- 			else
- 				{
- 				//failed to download a selected article from a feed
--				KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink));
-+				KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
- 				}
- 				deleteLater();
- 			}
-diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/plugins/scanfolder/scanfolderprefpagewidget.cpp
-index af70fc6..5a96afd 100644
---- a/plugins/scanfolder/scanfolderprefpagewidget.cpp
-+++ b/plugins/scanfolder/scanfolderprefpagewidget.cpp
-@@ -73,7 +73,7 @@ namespace kt
- 		TQString message = i18n( "ScanFolder - Folder %1: Invalid URL or folder does not exist. Please, choose a valid directory." );
- 		if(!TQFile::exists(sfPath1) && usesf1)
- 		{
--			KMessageBox::sorry(0, message.tqarg( 1 ) );
-+			KMessageBox::sorry(0, message.arg( 1 ) );
- 			usesf1 = false;
- 		}
- 		else
-@@ -81,7 +81,7 @@ namespace kt
- 
- 		if(!TQFile::exists(sfPath2) && usesf2)
- 		{
--			KMessageBox::sorry(0, message.tqarg( 2 ) );
-+			KMessageBox::sorry(0, message.arg( 2 ) );
- 			usesf2 = false;
- 		}
- 		else
-@@ -89,7 +89,7 @@ namespace kt
- 
- 		if(!TQFile::exists(sfPath3) && usesf3)
- 		{
--			KMessageBox::sorry(0, message.tqarg( 3 ) );
-+			KMessageBox::sorry(0, message.arg( 3 ) );
- 			usesf3 = false;
- 		}
- 		else
-diff --git a/plugins/scheduler/bwscheduler.cpp b/plugins/scheduler/bwscheduler.cpp
-index a8b41af..56256a4 100644
---- a/plugins/scheduler/bwscheduler.cpp
-+++ b/plugins/scheduler/bwscheduler.cpp
-@@ -162,7 +162,7 @@ namespace kt
- 		
- 		TQDateTime now = TQDateTime::currentDateTime();
- 
--		TQString prefix = TQString("BWS: %1 :: ").tqarg(now.toString());
-+		TQString prefix = TQString("BWS: %1 :: ").arg(now.toString());
- 		
- 		int t1 = now.date().dayOfWeek();
- 		int t2 = now.time().hour();
-@@ -173,7 +173,7 @@ namespace kt
- 			case CAT_NORMAL:
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to NORMAL category" << endl;
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
--						.tqarg(m_core->getMaxUploadSpeed()).tqarg(m_core->getMaxDownloadSpeed()) << endl;
-+						.arg(m_core->getMaxUploadSpeed()).arg(m_core->getMaxDownloadSpeed()) << endl;
- 				if(!m_core)
- 					break;
- 				m_core->setPausedState(false);
-@@ -183,7 +183,7 @@ namespace kt
- 			case CAT_FIRST:
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to FIRST category" << endl;
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
--						.tqarg(m_schedule.getUpload(0)).tqarg(m_schedule.getDownload(0)) << endl;
-+						.arg(m_schedule.getUpload(0)).arg(m_schedule.getDownload(0)) << endl;
- 				if(!m_core)
- 					break;
- 				m_core->setPausedState(false);
-@@ -193,7 +193,7 @@ namespace kt
- 			case CAT_SECOND:
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to SECOND category" << endl;
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
--						.tqarg(m_schedule.getUpload(1)).tqarg(m_schedule.getDownload(1)) << endl;
-+						.arg(m_schedule.getUpload(1)).arg(m_schedule.getDownload(1)) << endl;
- 				if(!m_core)
- 					break;
- 				m_core->setPausedState(false);
-@@ -203,7 +203,7 @@ namespace kt
- 			case CAT_THIRD:
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to THIRD category" << endl;
- 				Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
--						.tqarg(m_schedule.getUpload(2)).tqarg(m_schedule.getDownload(2)) << endl;
-+						.arg(m_schedule.getUpload(2)).arg(m_schedule.getDownload(2)) << endl;
- 				if(!m_core)
- 					break;
- 				m_core->setPausedState(false);
-diff --git a/plugins/scheduler/bwspage.ui b/plugins/scheduler/bwspage.ui
-index 474969c..547bee1 100644
---- a/plugins/scheduler/bwspage.ui
-+++ b/plugins/scheduler/bwspage.ui
-@@ -625,7 +625,7 @@
-                     <property name="text">
-                         <string>* zero means no limit</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>AlignVCenter|AlignRight</set>
-                     </property>
-                 </widget>
-diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
-index b22e858..2f63f4e 100644
---- a/plugins/search/searchplugin.cpp
-+++ b/plugins/search/searchplugin.cpp
-@@ -108,7 +108,7 @@ namespace kt
- 			if(SearchPluginSettings::useDefaultBrowser())
- 				kapp->invokeBrowser(url.url());
- 			else
--				KRun::runCommand(TQString("%1 \"%2\"").tqarg(SearchPluginSettings::customBrowser()).tqarg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" );
-+				KRun::runCommand(TQString("%1 \"%2\"").arg(SearchPluginSettings::customBrowser()).arg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" );
- 			
- 			return;
- 		}
-diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
-index adf78ba..c3f1517 100644
---- a/plugins/search/searchprefpage.cpp
-+++ b/plugins/search/searchprefpage.cpp
-@@ -53,9 +53,9 @@ namespace kt
- 				" (capital letters) on the search engine you want to add. <br> "
- 				"Then copy the URL in the addressbar after the search is finished, and paste it here.<br><br>Searching for %1"
- 				" on Google for example, will result in http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. <br> "
--				"If you add this URL here, ktorrent can search using Google.").tqarg("FOOBAR").tqarg("FOOBAR");
-+				"If you add this URL here, ktorrent can search using Google.").arg("FOOBAR").arg("FOOBAR");
- 		TQString info_short = i18n("Use your web browser to search for the string %1 (capital letters) "
--				"on the search engine you want to add. Use the resulting URL below.").tqarg("FOOBAR");
-+				"on the search engine you want to add. Use the resulting URL below.").arg("FOOBAR");
- 		m_infoLabel->setText(info_short);
- 		TQToolTip::add(m_infoLabel,info);
- 		TQToolTip::add(m_engine_name,info);
-diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
-index abe1f39..67f6dfa 100644
---- a/plugins/search/searchwidget.cpp
-+++ b/plugins/search/searchwidget.cpp
-@@ -175,7 +175,7 @@ namespace kt
- 		s_url.replace("FOOBAR", KURL::encode_string(text), true);
- 		KURL url = KURL::fromPathOrURL(s_url);
- 	
--		statusBarMsg(i18n("Searching for %1...").tqarg(text));
-+		statusBarMsg(i18n("Searching for %1...").arg(text));
- 		//html_part->openURL(url);
-  		html_part->openURLRequest(url,KParts::URLArgs());
- 	}	
-diff --git a/plugins/stats/ChartDrawer.cc b/plugins/stats/ChartDrawer.cc
-index 4c7c1d3..6eb08b4 100644
---- a/plugins/stats/ChartDrawer.cc
-+++ b/plugins/stats/ChartDrawer.cc
-@@ -416,7 +416,7 @@ void ChartDrawer::MakeLegendTooltip()
- {
- 	TQToolTip::remove(this);
- 	
--	TQString helpstr(TQString("<b>%1:</b><br><br>").tqarg(i18n("Legend")));
-+	TQString helpstr(TQString("<b>%1:</b><br><br>").arg(i18n("Legend")));
- 	TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory();
- 	std::vector<TQImage> img;
- 	
-@@ -434,7 +434,7 @@ void ChartDrawer::MakeLegendTooltip()
- 		}
- 		
- 		factory->setImage(mEls[i].GetName().replace(' ', '_') + "-" + TQString::number(i), img[i]);
--		helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").tqarg(mEls[i].GetName().replace(" ", "_") + "-" + TQString::number(i)).tqarg( mEls[i].GetName() );	
-+		helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").arg(mEls[i].GetName().replace(" ", "_") + "-" + TQString::number(i)).arg( mEls[i].GetName() );	
- 	}
- 	
- 	TQToolTip::add(this, helpstr);
-diff --git a/plugins/stats/sprefwgt.ui b/plugins/stats/sprefwgt.ui
-index 62cb6d3..0ad1c7f 100644
---- a/plugins/stats/sprefwgt.ui
-+++ b/plugins/stats/sprefwgt.ui
-@@ -253,7 +253,7 @@
-                     <property name="text">
-                         <string>Gathering data about many connected peers can be CPU consuming.</string>
-                     </property>
--                    <property name="tqalignment">
-+                    <property name="alignment">
-                         <set>WordBreak|AlignVCenter</set>
-                     </property>
-                 </widget>
-diff --git a/plugins/upnp/soap.cpp b/plugins/upnp/soap.cpp
-index f80d5af..c44ab1e 100644
---- a/plugins/upnp/soap.cpp
-+++ b/plugins/upnp/soap.cpp
-@@ -29,7 +29,7 @@ namespace kt
- 				"<SOAP-ENV:Body>"
- 				"<m:%1 xmlns:m=\"%2\"/>"
- 				"</SOAP-ENV:Body></SOAP-ENV:Envelope>"
--				"\r\n").tqarg(action).tqarg(service);
-+				"\r\n").arg(action).arg(service);
- 		
- 		return comm;
- 	}
-@@ -39,7 +39,7 @@ namespace kt
- 		TQString comm = TQString("<?xml version=\"1.0\"?>\r\n"
- 				"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
- 				"<SOAP-ENV:Body>"
--				"<m:%1 xmlns:m=\"%2\">").tqarg(action).tqarg(service);
-+				"<m:%1 xmlns:m=\"%2\">").arg(action).arg(service);
- 		
- 		for (TQValueList<Arg>::const_iterator i = args.begin();i != args.end();i++)
- 		{
-@@ -47,7 +47,7 @@ namespace kt
- 			comm += "<" + a.element + ">" + a.value + "</" + a.element + ">";
- 		}
- 		
--		comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").tqarg(action);
-+		comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").arg(action);
- 		return comm;
- 	}
- }
-diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
-index e5593ea..05d47a4 100644
---- a/plugins/upnp/upnprouter.cpp
-+++ b/plugins/upnp/upnprouter.cpp
-@@ -113,7 +113,7 @@ namespace kt
- 	UPnPRouter::UPnPRouter(const TQString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose)
- 	{
- 		// make the tmp_file unique, current time * a random number should be enough
--		tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").tqarg(bt::GetCurrentTime() * rand());
-+		tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").arg(bt::GetCurrentTime() * rand());
- 	}
- 	
- 	
-@@ -227,7 +227,7 @@ namespace kt
- 		
- 		a.element = "NewPortMappingDescription";
- 		static Uint32 cnt = 0;
--		a.value = TQString("KTorrent UPNP %1").tqarg(cnt++);	// TODO: change this
-+		a.value = TQString("KTorrent UPNP %1").arg(cnt++);	// TODO: change this
- 		args.append(a);
- 		
- 		a.element = "NewLeaseDuration";
-@@ -335,7 +335,7 @@ namespace kt
- 				"Content-length: $CONTENT_LENGTH\r\n"
- 				"Content-Type: text/xml\r\n"
- 				"SOAPAction: \"%4\"\r\n"
--				"\r\n").tqarg(controlurl).tqarg(location.host()).tqarg(location.port()).tqarg(soapact);
-+				"\r\n").arg(controlurl).arg(location.host()).arg(location.port()).arg(soapact);
- 
- 		
- 		HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose);
-diff --git a/plugins/webinterface/httpclienthandler.cpp b/plugins/webinterface/httpclienthandler.cpp
-index 1ad2d8d..cba0372 100644
---- a/plugins/webinterface/httpclienthandler.cpp
-+++ b/plugins/webinterface/httpclienthandler.cpp
-@@ -171,7 +171,7 @@ namespace kt
- 	void HttpClientHandler::send500(HttpResponseHeader & hdr)
- 	{
- 	//	Out(SYS_WEB|LOG_DEBUG) << "Sending 500 " << endl;
--		TQString data = TQString(HTTP_500_ERROR).tqarg("An internal server error occured !");
-+		TQString data = TQString(HTTP_500_ERROR).arg("An internal server error occured !");
- 		hdr.setValue("Content-Length",TQString::number(data.length()));
- 
- 		TQTextStream os(client);
-@@ -199,7 +199,7 @@ namespace kt
- 		php = new PhpHandler(php_exe,php_iface);
- 		if (!php->executeScript(php_file,args))
- 		{
--			TQString data = TQString(HTTP_500_ERROR).tqarg("Failed to launch PHP executable !");
-+			TQString data = TQString(HTTP_500_ERROR).arg("Failed to launch PHP executable !");
- 			hdr.setResponseCode(500);
- 			hdr.setValue("Content-Length",TQString::number(data.utf8().length()));
- 			
-diff --git a/plugins/webinterface/httpresponseheader.cpp b/plugins/webinterface/httpresponseheader.cpp
-index 7b87892..3056f79 100644
---- a/plugins/webinterface/httpresponseheader.cpp
-+++ b/plugins/webinterface/httpresponseheader.cpp
-@@ -61,12 +61,12 @@ namespace kt
- 	TQString HttpResponseHeader::toString() const
- 	{
- 		TQString str;
--		str += TQString("HTTP/1.1 %1 %2\r\n").tqarg(response_code).tqarg(ResponseCodeToString(response_code));
-+		str += TQString("HTTP/1.1 %1 %2\r\n").arg(response_code).arg(ResponseCodeToString(response_code));
- 		
- 		TQMap<TQString,TQString>::const_iterator itr = fields.begin();
- 		while (itr != fields.end())
- 		{
--			str += TQString("%1: %2\r\n").tqarg(itr.key()).tqarg(itr.data());
-+			str += TQString("%1: %2\r\n").arg(itr.key()).arg(itr.data());
- 			itr++;
- 		}
- 		str += "\r\n";
-diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
-index 915e28f..4d582a7 100644
---- a/plugins/webinterface/httpserver.cpp
-+++ b/plugins/webinterface/httpserver.cpp
-@@ -237,12 +237,12 @@ namespace kt
- 	{
- 		if (!cookie)
- 			return now.toString("%1, dd %2 yyyy hh:mm:ss UTC")
--				.tqarg(days[now.date().dayOfWeek() - 1])
--				.tqarg(months[now.date().month() - 1]);
-+				.arg(days[now.date().dayOfWeek() - 1])
-+				.arg(months[now.date().month() - 1]);
- 		else
- 			return now.toString("%1, dd-%2-yyyy hh:mm:ss GMT")
--				.tqarg(days[now.date().dayOfWeek() - 1])
--				.tqarg(months[now.date().month() - 1]);
-+				.arg(days[now.date().dayOfWeek() - 1])
-+				.arg(months[now.date().month() - 1]);
- 	}
- 		
- 	void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info)
-@@ -253,7 +253,7 @@ namespace kt
- 		hdr.setValue("Connection","keep-alive");
- 		if (with_session_info && session.sessionId && session.logged_in)
- 		{
--			hdr.setValue("Set-Cookie",TQString("KT_SESSID=%1").tqarg(session.sessionId));
-+			hdr.setValue("Set-Cookie",TQString("KT_SESSID=%1").arg(session.sessionId));
- 		}
- 	}
- 	
-@@ -329,7 +329,7 @@ namespace kt
- 			{
- 				// clear cookie in case of login page
- 				TQDateTime dt = TQDateTime::currentDateTime().addDays(-1);
--				TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").tqarg(DateTimeToString(dt,true));
-+				TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").arg(DateTimeToString(dt,true));
- 				rhdr.setValue("Set-Cookie",cookie);
- 			}
- 			
-diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
-index 9b5ac85..d2c2f55 100644
---- a/plugins/webinterface/php_handler.cpp
-+++ b/plugins/webinterface/php_handler.cpp
-@@ -82,7 +82,7 @@ namespace kt
- 			
- 		for ( it = args.begin(); it != args.end(); ++it )
- 		{
--			ts << TQString("$_REQUEST['%1']=\"%2\";\n").tqarg(it.key()).tqarg(it.data());
-+			ts << TQString("$_REQUEST['%1']=\"%2\";\n").arg(it.key()).arg(it.data());
- 		}
- 		ts.writeRawBytes(php_s.data() + off,php_s.size() - off); // the rest of the script
- 		ts << flush;
-diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
-index e98a309..048310d 100644
---- a/plugins/webinterface/php_interface.cpp
-+++ b/plugins/webinterface/php_interface.cpp
-@@ -48,19 +48,19 @@ namespace kt
- 	{
- 		KLocale* loc = KGlobal::locale();
- 		if (bytes >= 1024 * 1024 * 1024)
--			return TQString("%1 GB").tqarg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
-+			return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
- 		else if (bytes >= 1024*1024)
--			return TQString("%1 MB").tqarg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
-+			return TQString("%1 MB").arg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
- 		else if (bytes >= 1024)
--			return TQString("%1 KB").tqarg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
-+			return TQString("%1 KB").arg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
- 		else
--			return TQString("%1 B").tqarg(bytes);
-+			return TQString("%1 B").arg(bytes);
- 	}
- 
- 	TQString KBytesPerSecToString2(double speed,int precision = 2)
- 	{
- 		KLocale* loc = KGlobal::locale();
--		return TQString("%1 KB/s").tqarg(loc->formatNumber(speed,precision));
-+		return TQString("%1 KB/s").arg(loc->formatNumber(speed,precision));
- 	}
- 
- 	/************************
-@@ -91,42 +91,42 @@ namespace kt
- 				out << ",\n";
- 			
- 			stats=(*i)->getStats();
--			out << TQString("\n%1 => array(").tqarg(k);
-+			out << TQString("\n%1 => array(").arg(k);
- 			
--			out << TQString("\"imported_bytes\" => %1,\n").tqarg(stats.imported_bytes);
--			out << TQString("\"bytes_downloaded\" => \"%1\",\n").tqarg(BytesToString2(stats.bytes_downloaded));
--			out << TQString("\"bytes_uploaded\" => \"%1\",\n").tqarg(BytesToString2(stats.bytes_uploaded));
--			out << TQString("\"bytes_left\" => %1,\n").tqarg(stats.bytes_left);
--			out << TQString("\"bytes_left_to_download\" => %1,\n").tqarg(stats.bytes_left_to_download);
--			out << TQString("\"total_bytes\" => \"%1\",\n").tqarg(BytesToString2(stats.total_bytes));
--			out << TQString("\"total_bytes_to_download\" => %1,\n").tqarg(stats.total_bytes_to_download);
--			out << TQString("\"download_rate\" => \"%1\",\n").tqarg(KBytesPerSecToString2(stats.download_rate / 1024.0));
--			out << TQString("\"upload_rate\" => \"%1\",\n").tqarg(KBytesPerSecToString2(stats.upload_rate / 1024.0));
--			out << TQString("\"num_peers\" => %1,\n").tqarg(stats.num_peers);
--			out << TQString("\"num_chunks_downloading\" => %1,\n").tqarg(stats.num_chunks_downloading);
--			out << TQString("\"total_chunks\" => %1,\n").tqarg(stats.total_chunks);
--			out << TQString("\"num_chunks_downloaded\" => %1,\n").tqarg(stats.num_chunks_downloaded);
--			out << TQString("\"num_chunks_excluded\" => %1,\n").tqarg(stats.num_chunks_excluded);
--			out << TQString("\"chunk_size\" => %1,\n").tqarg(stats.chunk_size);
--			out << TQString("\"seeders_total\" => %1,\n").tqarg(stats.seeders_total);
--			out << TQString("\"seeders_connected_to\" => %1,\n").tqarg(stats.seeders_connected_to);
--			out << TQString("\"leechers_total\" => %1,\n").tqarg(stats.leechers_total);
--			out << TQString("\"leechers_connected_to\" => %1,\n").tqarg(stats.leechers_connected_to);
--			out << TQString("\"status\" => %1,\n").tqarg(stats.status);
--			out << TQString("\"running\" => %1,\n").tqarg(stats.running);
--			out << TQString("\"trackerstatus\" => \"%1\",\n").tqarg(stats.trackerstatus.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
--			out << TQString("\"session_bytes_downloaded\" => %1,\n").tqarg(stats.session_bytes_downloaded);
--			out << TQString("\"session_bytes_uploaded\" => %1,\n").tqarg(stats.session_bytes_uploaded);
--			out << TQString("\"trk_bytes_downloaded\" => %1,\n").tqarg(stats.trk_bytes_downloaded);
--			out << TQString("\"trk_bytes_uploaded\" => %1,\n").tqarg(stats.trk_bytes_uploaded);
--			out << TQString("\"torrent_name\" => \"%1\",\n").tqarg(stats.torrent_name.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
--			out << TQString("\"output_path\" => \"%1\",\n").tqarg(stats.output_path.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
--			out << TQString("\"stopped_by_error\" => \"%1\",\n").tqarg(stats.stopped_by_error);
--			out << TQString("\"completed\" => \"%1\",\n").tqarg(stats.completed);
--			out << TQString("\"user_controlled\" => \"%1\",\n").tqarg(stats.user_controlled);
--			out << TQString("\"max_share_ratio\" => %1,\n").tqarg(stats.max_share_ratio);
--			out << TQString("\"priv_torrent\" => \"%1\",\n").tqarg(stats.priv_torrent);
--			out << TQString("\"num_files\" => \"%1\",\n").tqarg((*i)->getNumFiles());			
-+			out << TQString("\"imported_bytes\" => %1,\n").arg(stats.imported_bytes);
-+			out << TQString("\"bytes_downloaded\" => \"%1\",\n").arg(BytesToString2(stats.bytes_downloaded));
-+			out << TQString("\"bytes_uploaded\" => \"%1\",\n").arg(BytesToString2(stats.bytes_uploaded));
-+			out << TQString("\"bytes_left\" => %1,\n").arg(stats.bytes_left);
-+			out << TQString("\"bytes_left_to_download\" => %1,\n").arg(stats.bytes_left_to_download);
-+			out << TQString("\"total_bytes\" => \"%1\",\n").arg(BytesToString2(stats.total_bytes));
-+			out << TQString("\"total_bytes_to_download\" => %1,\n").arg(stats.total_bytes_to_download);
-+			out << TQString("\"download_rate\" => \"%1\",\n").arg(KBytesPerSecToString2(stats.download_rate / 1024.0));
-+			out << TQString("\"upload_rate\" => \"%1\",\n").arg(KBytesPerSecToString2(stats.upload_rate / 1024.0));
-+			out << TQString("\"num_peers\" => %1,\n").arg(stats.num_peers);
-+			out << TQString("\"num_chunks_downloading\" => %1,\n").arg(stats.num_chunks_downloading);
-+			out << TQString("\"total_chunks\" => %1,\n").arg(stats.total_chunks);
-+			out << TQString("\"num_chunks_downloaded\" => %1,\n").arg(stats.num_chunks_downloaded);
-+			out << TQString("\"num_chunks_excluded\" => %1,\n").arg(stats.num_chunks_excluded);
-+			out << TQString("\"chunk_size\" => %1,\n").arg(stats.chunk_size);
-+			out << TQString("\"seeders_total\" => %1,\n").arg(stats.seeders_total);
-+			out << TQString("\"seeders_connected_to\" => %1,\n").arg(stats.seeders_connected_to);
-+			out << TQString("\"leechers_total\" => %1,\n").arg(stats.leechers_total);
-+			out << TQString("\"leechers_connected_to\" => %1,\n").arg(stats.leechers_connected_to);
-+			out << TQString("\"status\" => %1,\n").arg(stats.status);
-+			out << TQString("\"running\" => %1,\n").arg(stats.running);
-+			out << TQString("\"trackerstatus\" => \"%1\",\n").arg(stats.trackerstatus.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
-+			out << TQString("\"session_bytes_downloaded\" => %1,\n").arg(stats.session_bytes_downloaded);
-+			out << TQString("\"session_bytes_uploaded\" => %1,\n").arg(stats.session_bytes_uploaded);
-+			out << TQString("\"trk_bytes_downloaded\" => %1,\n").arg(stats.trk_bytes_downloaded);
-+			out << TQString("\"trk_bytes_uploaded\" => %1,\n").arg(stats.trk_bytes_uploaded);
-+			out << TQString("\"torrent_name\" => \"%1\",\n").arg(stats.torrent_name.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
-+			out << TQString("\"output_path\" => \"%1\",\n").arg(stats.output_path.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
-+			out << TQString("\"stopped_by_error\" => \"%1\",\n").arg(stats.stopped_by_error);
-+			out << TQString("\"completed\" => \"%1\",\n").arg(stats.completed);
-+			out << TQString("\"user_controlled\" => \"%1\",\n").arg(stats.user_controlled);
-+			out << TQString("\"max_share_ratio\" => %1,\n").arg(stats.max_share_ratio);
-+			out << TQString("\"priv_torrent\" => \"%1\",\n").arg(stats.priv_torrent);
-+			out << TQString("\"num_files\" => \"%1\",\n").arg((*i)->getNumFiles());			
- 			out << TQString("\"files\" => array(");
- 			out << flush;
- 			if (stats.multi_file_torrent)
-@@ -138,11 +138,11 @@ namespace kt
- 						out << ",\n";
- 					
- 					TorrentFileInterface & file = (*i)->getTorrentFile(j);
--					out << TQString("\"%1\" => array(\n").tqarg(j);
--					out << TQString("\"name\" => \"%1\",\n").tqarg(file.getPath());
--					out << TQString("\"size\" => \"%1\",\n").tqarg(KIO::convertSize(file.getSize()));
--					out << TQString("\"perc_done\" => \"%1\",\n").tqarg(file.getDownloadPercentage());
--					out << TQString("\"status\" => \"%1\"\n").tqarg(file.getPriority());
-+					out << TQString("\"%1\" => array(\n").arg(j);
-+					out << TQString("\"name\" => \"%1\",\n").arg(file.getPath());
-+					out << TQString("\"size\" => \"%1\",\n").arg(KIO::convertSize(file.getSize()));
-+					out << TQString("\"perc_done\" => \"%1\",\n").arg(file.getDownloadPercentage());
-+					out << TQString("\"status\" => \"%1\"\n").arg(file.getPriority());
- 					out << TQString(")\n");
- 					out << flush;
- 				}
-@@ -166,16 +166,16 @@ namespace kt
- 		out << "function globalInfo()\n{\nreturn array(";
- 		CurrentStats stats=core->getStats();
- 	
--		out << TQString("\"download_speed\" => \"%1\",").tqarg(KBytesPerSecToString2(stats.download_speed / 1024.0));
--		out << TQString("\"upload_speed\" => \"%1\",").tqarg(KBytesPerSecToString2(stats.upload_speed / 1024.0));
--		out << TQString("\"bytes_downloaded\" => \"%1\",").tqarg(stats.bytes_downloaded);
--		out << TQString("\"bytes_uploaded\" => \"%1\",").tqarg(stats.bytes_uploaded);
--		out << TQString("\"max_download_speed\" => \"%1\",").tqarg(core->getMaxDownloadSpeed());
--		out << TQString("\"max_upload_speed\" => \"%1\",").tqarg(core->getMaxUploadSpeed());
--		out << TQString("\"max_downloads\" => \"%1\",").tqarg(Settings::maxDownloads());
--		out << TQString("\"max_seeds\"=> \"%1\",").tqarg(Settings::maxSeeds());
--		out << TQString("\"dht_support\" => \"%1\",").tqarg(Settings::dhtSupport());
--		out << TQString("\"use_encryption\" => \"%1\"").tqarg(Settings::useEncryption());
-+		out << TQString("\"download_speed\" => \"%1\",").arg(KBytesPerSecToString2(stats.download_speed / 1024.0));
-+		out << TQString("\"upload_speed\" => \"%1\",").arg(KBytesPerSecToString2(stats.upload_speed / 1024.0));
-+		out << TQString("\"bytes_downloaded\" => \"%1\",").arg(stats.bytes_downloaded);
-+		out << TQString("\"bytes_uploaded\" => \"%1\",").arg(stats.bytes_uploaded);
-+		out << TQString("\"max_download_speed\" => \"%1\",").arg(core->getMaxDownloadSpeed());
-+		out << TQString("\"max_upload_speed\" => \"%1\",").arg(core->getMaxUploadSpeed());
-+		out << TQString("\"max_downloads\" => \"%1\",").arg(Settings::maxDownloads());
-+		out << TQString("\"max_seeds\"=> \"%1\",").arg(Settings::maxSeeds());
-+		out << TQString("\"dht_support\" => \"%1\",").arg(Settings::dhtSupport());
-+		out << TQString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption());
- 		out << ");\n}\n";
- 	}
- 	
-diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp
-index 6f4baed..48ab0c7 100644
---- a/plugins/webinterface/webinterfaceprefwidget.cpp
-+++ b/plugins/webinterface/webinterfaceprefwidget.cpp
-@@ -113,23 +113,23 @@ void WebInterfacePrefWidget::changeLedState()
- {
-        TQFileInfo fi(phpExecutablePath->url());
-        if(fi.isExecutable() && (fi.isFile() || fi.isSymLink())){
--               TQToolTip::add( kled, i18n("%1 exists and it is executable").tqarg(phpExecutablePath->url()));
-+               TQToolTip::add( kled, i18n("%1 exists and it is executable").arg(phpExecutablePath->url()));
-                kled->setColor(green);
-        }
-        else if (!fi.exists()){
--               TQToolTip::add( kled, i18n("%1 does not exist").tqarg(phpExecutablePath->url()) );
-+               TQToolTip::add( kled, i18n("%1 does not exist").arg(phpExecutablePath->url()) );
-                kled->setColor(red);
-        }
-        else if (!fi.isExecutable()){
--               TQToolTip::add( kled, i18n("%1 is not executable").tqarg(phpExecutablePath->url()) );
-+               TQToolTip::add( kled, i18n("%1 is not executable").arg(phpExecutablePath->url()) );
-                kled->setColor(red);
-        }
-        else if (fi.isDir()){
--               TQToolTip::add( kled, i18n("%1 is a directory").tqarg(phpExecutablePath->url()) );
-+               TQToolTip::add( kled, i18n("%1 is a directory").arg(phpExecutablePath->url()) );
-                kled->setColor(red);
-        }
-        else{
--               TQToolTip::add( kled, i18n("%1 is not php executable path").tqarg(phpExecutablePath->url()) );
-+               TQToolTip::add( kled, i18n("%1 is not php executable path").arg(phpExecutablePath->url()) );
-                kled->setColor(red);
-        }
- }
-diff --git a/plugins/webinterface/www/default/wz_tooltip.js b/plugins/webinterface/www/default/wz_tooltip.js
-index 0405498..1329a1b 100644
---- a/plugins/webinterface/www/default/wz_tooltip.js
-+++ b/plugins/webinterface/www/default/wz_tooltip.js
-@@ -300,7 +300,7 @@ function tt_DeAlt(t_tag)
- 	{
- 		if(t_tag.alt) t_tag.alt = "";
- 		if(t_tag.title) t_tag.title = "";
--		var t_c = t_tag.tqchildren || t_tag.childNodes || null;
-+		var t_c = t_tag.children || t_tag.childNodes || null;
- 		if(t_c)
- 		{
- 			for(var t_i = t_c.length; t_i; )
-diff --git a/plugins/zeroconf/avahiservice.cpp b/plugins/zeroconf/avahiservice.cpp
-index a77d9ff..aebaa00 100644
---- a/plugins/zeroconf/avahiservice.cpp
-+++ b/plugins/zeroconf/avahiservice.cpp
-@@ -66,7 +66,7 @@ namespace kt
- 			}
- 		}
- 	
--		const char* name    = avahi_strdup(TQString("%1__%2%3").tqarg(service->id).tqarg((rand() % 26) + 65).tqarg((rand() % 26) + 65).ascii());
-+		const char* name    = avahi_strdup(TQString("%1__%2%3").arg(service->id).arg((rand() % 26) + 65).arg((rand() % 26) + 65).ascii());
- 		const char* type    = avahi_strdup("_bittorrent._tcp");
- 		const char* subtype = avahi_strdup(TQString("_" + service->infoHash + "._sub._bittorrent._tcp").ascii());
- 	
-@@ -75,7 +75,7 @@ namespace kt
- 				(AvahiPublishFlags)0, name, type, NULL, NULL, service->port, NULL)) 
- 		{
- 			if (avahi_client_errno(c) != -8) 
--				Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service (%i).").tqarg(avahi_client_errno(c)) << endl;
-+				Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service (%i).").arg(avahi_client_errno(c)) << endl;
- 			else
- 				publish_service(service, c);
- 			return;
-@@ -85,7 +85,7 @@ namespace kt
- 				service->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
- 				(AvahiPublishFlags)0, name, type, NULL, subtype)) 
- 		{
--			Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service subtype (%i).").tqarg( avahi_client_errno(c)) << endl;
-+			Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service subtype (%i).").arg( avahi_client_errno(c)) << endl;
- 			return;
- 		}
- 	
-diff --git a/utests/biginttest.cpp b/utests/biginttest.cpp
-index 36a896a..514663e 100644
---- a/utests/biginttest.cpp
-+++ b/utests/biginttest.cpp
-@@ -43,7 +43,7 @@ namespace utest
- 		b.toBuffer(buf,10);
- 		for (Uint32 i = 0;i < 10;i++)
- 		{
--			Out() << TQString("0x%1 ").tqarg(buf[i],0,16);
-+			Out() << TQString("0x%1 ").arg(buf[i],0,16);
- 		}
- 		Out() << endl;
- 	}
-@@ -67,7 +67,7 @@ namespace utest
- 		a.toBuffer(foobar,5);
- 		for (Uint32 i = 0;i < 5;i++)
- 		{
--			Out() << TQString("0x%1 ").tqarg(foobar[i],0,16);
-+			Out() << TQString("0x%1 ").arg(foobar[i],0,16);
- 		}
- 		Out() << endl;
- 		Out() << "Third test" << endl;
diff --git a/redhat/applications/ktorrent/bp002-0d48fca8.diff b/redhat/applications/ktorrent/bp002-0d48fca8.diff
deleted file mode 100644
index 673287017..000000000
--- a/redhat/applications/ktorrent/bp002-0d48fca8.diff
+++ /dev/null
@@ -1,1585 +0,0 @@
-commit 0d48fca8ae41ab963c780104fdeca45d7dad0a51
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497973 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui
-index 6aee5e0..d3359a2 100644
---- a/apps/ktorrent/addpeerwidgetbase.ui
-+++ b/apps/ktorrent/addpeerwidgetbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout10</cstring>
-+                <cstring>layout10</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -86,7 +86,7 @@
-         </spacer>
-         <widget class="TQLayoutWidget" row="2" column="0">
-             <property name="name">
--                <cstring>tqlayout11</cstring>
-+                <cstring>layout11</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui
-index 0b8f00a..8a54e29 100644
---- a/apps/ktorrent/advancedpref.ui
-+++ b/apps/ktorrent/advancedpref.ui
-@@ -32,7 +32,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout15</cstring>
-+                        <cstring>layout15</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -127,7 +127,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout25</cstring>
-+                        <cstring>layout25</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -179,7 +179,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -234,7 +234,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5_2</cstring>
-+                        <cstring>layout5_2</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -294,7 +294,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -359,7 +359,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -416,7 +416,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout10</cstring>
-+                        <cstring>layout10</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -483,7 +483,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout33</cstring>
-+                        <cstring>layout33</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -491,7 +491,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout32</cstring>
-+                                <cstring>layout32</cstring>
-                             </property>
-                             <grid>
-                                 <property name="name">
-@@ -572,7 +572,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui
-index 47f1f4c..378cbbc 100644
---- a/apps/ktorrent/downloadpref.ui
-+++ b/apps/ktorrent/downloadpref.ui
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout49</cstring>
-+                        <cstring>layout49</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -37,7 +37,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout42</cstring>
-+                                <cstring>layout42</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -45,7 +45,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout16</cstring>
-+                                        <cstring>layout16</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -106,7 +106,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout46</cstring>
-+                                <cstring>layout46</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -164,7 +164,7 @@
-                                 </widget>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout45</cstring>
-+                                        <cstring>layout45</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -214,7 +214,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout48</cstring>
-+                                <cstring>layout48</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -222,7 +222,7 @@
-                                 </property>
-                                 <widget class="TQLayoutWidget">
-                                     <property name="name">
--                                        <cstring>tqlayout14</cstring>
-+                                        <cstring>layout14</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -316,7 +316,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout42</cstring>
-+                        <cstring>layout42</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -356,7 +356,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget" row="0" column="0">
-                             <property name="name">
--                                <cstring>tqlayout18</cstring>
-+                                <cstring>layout18</cstring>
-                             </property>
-                             <hbox>
-                                 <property name="name">
-@@ -425,7 +425,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout41</cstring>
-+                        <cstring>layout41</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -546,7 +546,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout40</cstring>
-+                        <cstring>layout40</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
-index f289025..546d72c 100644
---- a/apps/ktorrent/fileselectdlgbase.ui
-+++ b/apps/ktorrent/fileselectdlgbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
-             <property name="name">
--                <cstring>tqlayout4</cstring>
-+                <cstring>layout4</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -44,7 +44,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -52,7 +52,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -246,7 +246,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout33</cstring>
-+                        <cstring>layout33</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -280,7 +280,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1">
-                     <property name="name">
--                        <cstring>tqlayout34</cstring>
-+                        <cstring>layout34</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
-index 0be4049..6084e66 100644
---- a/apps/ktorrent/filterbar.cpp
-+++ b/apps/ktorrent/filterbar.cpp
-@@ -42,30 +42,30 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
- 	TQVBoxLayout* foo = new TQVBoxLayout(this);
- 	foo->addSpacing(gap);
- 	
--	TQHBoxLayout* tqlayout = new TQHBoxLayout(foo);
--	tqlayout->addSpacing(gap);
-+	TQHBoxLayout* layout = new TQHBoxLayout(foo);
-+	layout->addSpacing(gap);
- 	
- 	m_close = new KToolBarButton("fileclose",0,this);
- 	connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide()));
--	tqlayout->addWidget(m_close);
-+	layout->addWidget(m_close);
- 	
- 	m_filter = new TQLabel(i18n("Find:"), this);
--	tqlayout->addWidget(m_filter);
--	tqlayout->addSpacing(KDialog::spacingHint());
-+	layout->addWidget(m_filter);
-+	layout->addSpacing(KDialog::spacingHint());
- 	
- 	m_filterInput = new KLineEdit(this);
--	tqlayout->addWidget(m_filterInput);
-+	layout->addWidget(m_filterInput);
- 	
- 	m_clear = new KPushButton(this);
- 	m_clear->setIconSet(SmallIcon("clear_left"));
- 	m_clear->setFlat(true);
--	tqlayout->addWidget(m_clear);
--	tqlayout->addSpacing(gap);
-+	layout->addWidget(m_clear);
-+	layout->addSpacing(gap);
- 	
- 	m_case_sensitive = new TQCheckBox(i18n("Case sensitive"),this);
- 	m_case_sensitive->setChecked(true);
--	tqlayout->addWidget(m_case_sensitive);
--	tqlayout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding));
-+	layout->addWidget(m_case_sensitive);
-+	layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding));
- 		
- 	connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)),
- 		this, TQT_SLOT(slotChangeFilter(const TQString&)));
-diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui
-index a1ba5e9..529686f 100644
---- a/apps/ktorrent/generalpref.ui
-+++ b/apps/ktorrent/generalpref.ui
-@@ -104,7 +104,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -174,7 +174,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -237,7 +237,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
-                     <property name="name">
--                        <cstring>tqlayout13</cstring>
-+                        <cstring>layout13</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -310,7 +310,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
-                     <property name="name">
--                        <cstring>tqlayout24</cstring>
-+                        <cstring>layout24</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -355,7 +355,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="1" rowspan="3" colspan="1">
-                     <property name="name">
--                        <cstring>tqlayout14</cstring>
-+                        <cstring>layout14</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
-index e29ffe7..7d8c383 100644
---- a/apps/ktorrent/ipfilterwidgetbase.ui
-+++ b/apps/ktorrent/ipfilterwidgetbase.ui
-@@ -82,7 +82,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -111,7 +111,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
-index 5c04732..447eaee 100644
---- a/apps/ktorrent/ktorrentview.cpp
-+++ b/apps/ktorrent/ktorrentview.cpp
-@@ -85,8 +85,8 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e)
- KTorrentView::KTorrentView(TQWidget *parent)
- 	: TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0)
- {
--	TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
--	tqlayout->setAutoAdd(true);
-+	TQVBoxLayout* layout = new TQVBoxLayout(this);
-+	layout->setAutoAdd(true);
- 	view = new TorrentView(this);
- 	filter_bar = new FilterBar(this);
- 	filter_bar->setHidden(true);
-diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
-index 4819657..100ab62 100644
---- a/apps/ktorrent/newui/button.cpp
-+++ b/apps/ktorrent/newui/button.cpp
-@@ -133,7 +133,7 @@ void Button::drawButton(TQPainter *p)
- 
-     tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
- 
--    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
-+    style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
-                         TQRect(0,0,pm.width(),pm.height()),
-                         colorGroup(), flags, TQStyleOption());
- 
-@@ -211,7 +211,7 @@ TQSize Button::sizeHint(const TQString &text) const
-         h = TQMAX( h, ih );
-     }
-     if ( isMenuButton() )
--        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-+        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
-     if ( pixmap() ) {
-         TQPixmap *pm = (TQPixmap *)pixmap();
-         w += pm->width();
-@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
-             h = TQMAX(h, sz.height());
-     }
- 
--    return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
-+    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
-             expandedTo(TQApplication::globalStrut()));
- }
- 
-diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h
-index d517cd7..8128fe6 100644
---- a/apps/ktorrent/newui/buttonbar.h
-+++ b/apps/ktorrent/newui/buttonbar.h
-@@ -32,7 +32,7 @@ namespace Ideal {
- class Button;
- class ButtonBar;
- 
--/**@short A tqlayout for a ButtonBar class.
-+/**@short A layout for a ButtonBar class.
- 
- Overrides minimumSize method to allow shrinking button bar buttons.*/
- class ButtonLayout: public TQBoxLayout{
-diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp
-index 7d3bff9..f96381b 100644
---- a/apps/ktorrent/pastedialog.cpp
-+++ b/apps/ktorrent/pastedialog.cpp
-@@ -33,7 +33,7 @@ PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name)
- 		:PasteDlgBase(parent, name)
- {
- 	m_core = core;
--	TQClipboard *cb = TQApplication::tqclipboard();
-+	TQClipboard *cb = TQApplication::clipboard();
- 	TQString text = cb->text(TQClipboard::Clipboard);
- 	KURL url = KURL::fromPathOrURL(text);
- 	if ( url.isValid() )
-diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui
-index 700d12d..9121734 100644
---- a/apps/ktorrent/pastedlgbase.ui
-+++ b/apps/ktorrent/pastedlgbase.ui
-@@ -38,7 +38,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout2</cstring>
-+                <cstring>layout2</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -75,7 +75,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout4</cstring>
-+                <cstring>layout4</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui
-index 7e4769f..00a194f 100644
---- a/apps/ktorrent/queuedlg.ui
-+++ b/apps/ktorrent/queuedlg.ui
-@@ -47,7 +47,7 @@
-                             </property>
-                             <widget class="TQLayoutWidget" row="0" column="0">
-                                 <property name="name">
--                                    <cstring>tqlayout25</cstring>
-+                                    <cstring>layout25</cstring>
-                                 </property>
-                                 <vbox>
-                                     <property name="name">
-@@ -121,7 +121,7 @@
-                             </widget>
-                             <widget class="TQLayoutWidget" row="0" column="1">
-                                 <property name="name">
--                                    <cstring>tqlayout26</cstring>
-+                                    <cstring>layout26</cstring>
-                                 </property>
-                                 <vbox>
-                                     <property name="name">
-@@ -263,7 +263,7 @@
-                             </property>
-                             <widget class="TQLayoutWidget" row="0" column="0">
-                                 <property name="name">
--                                    <cstring>tqlayout15</cstring>
-+                                    <cstring>layout15</cstring>
-                                 </property>
-                                 <vbox>
-                                     <property name="name">
-@@ -337,7 +337,7 @@
-                             </widget>
-                             <widget class="TQLayoutWidget" row="0" column="1">
-                                 <property name="name">
--                                    <cstring>tqlayout27</cstring>
-+                                    <cstring>layout27</cstring>
-                                 </property>
-                                 <vbox>
-                                     <property name="name">
-@@ -392,7 +392,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="1">
-             <property name="name">
--                <cstring>tqlayout7</cstring>
-+                <cstring>layout7</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -400,7 +400,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout49</cstring>
-+                        <cstring>layout49</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui
-index 189e551..18c76f1 100644
---- a/apps/ktorrent/scandlgbase.ui
-+++ b/apps/ktorrent/scandlgbase.ui
-@@ -40,7 +40,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout5</cstring>
-+                <cstring>layout5</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -48,7 +48,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -74,7 +74,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -148,7 +148,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout8</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui
-index 17dc49c..520a705 100644
---- a/apps/ktorrent/speedlimitsdlgbase.ui
-+++ b/apps/ktorrent/speedlimitsdlgbase.ui
-@@ -29,7 +29,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout8</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -37,7 +37,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -63,7 +63,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -83,7 +83,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout6</cstring>
-+                        <cstring>layout6</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -125,7 +125,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
-index d051a0e..a9199bc 100644
---- a/apps/ktorrent/torrentcreatordlgbase.ui
-+++ b/apps/ktorrent/torrentcreatordlgbase.ui
-@@ -24,7 +24,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout2</cstring>
-+                <cstring>layout2</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -66,7 +66,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -188,7 +188,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="5" column="0">
-             <property name="name">
--                <cstring>tqlayout9</cstring>
-+                <cstring>layout9</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -319,7 +319,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout9</cstring>
-+                        <cstring>layout9</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui
-index e46bbd1..ed2022c 100644
---- a/apps/ktupnptest/mainwidget.ui
-+++ b/apps/ktupnptest/mainwidget.ui
-@@ -23,7 +23,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/libktorrent/expandablewidget.cpp b/libktorrent/expandablewidget.cpp
-index a6ec44d..fe7a0df 100644
---- a/libktorrent/expandablewidget.cpp
-+++ b/libktorrent/expandablewidget.cpp
-@@ -53,7 +53,7 @@ namespace kt
- 		se->pos = pos;
- 		se->next = begin;
- 
--		// remove old top from tqlayout
-+		// remove old top from layout
- 		top_layout->remove(begin->w);
- 			
- 		// create new toplevel splitter
-@@ -84,7 +84,7 @@ namespace kt
- 		// make se new top of stack
- 		begin = se;
- 
--		// add toplevel splitter to tqlayout
-+		// add toplevel splitter to layout
- 		top_layout->add(s);
- 		
- 		// show s
-diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
-index 3823516..d7ce947 100644
---- a/libktorrent/labelview.cpp
-+++ b/libktorrent/labelview.cpp
-@@ -105,13 +105,13 @@ namespace kt
- 	
- 	class LabelViewBox : public TQWidget
- 	{
--		TQVBoxLayout* tqlayout;
-+		TQVBoxLayout* layout;
- 	public:
- 		LabelViewBox(TQWidget* parent) : TQWidget(parent)
- 		{
- 			setPaletteBackgroundColor(KGlobalSettings::baseColor());
--			tqlayout = new TQVBoxLayout(this);
--			tqlayout->setMargin(0);
-+			layout = new TQVBoxLayout(this);
-+			layout->setMargin(0);
- 		}
- 		
- 		virtual ~LabelViewBox()
-@@ -120,24 +120,24 @@ namespace kt
- 		void add(LabelViewItem* item)
- 		{
- 			item->reparent(this,TQPoint(0,0));
--			tqlayout->add(item);
-+			layout->add(item);
- 			item->show();
- 		}
- 		
- 		void remove(LabelViewItem* item)
- 		{
- 			item->hide();
--			tqlayout->remove(item);
-+			layout->remove(item);
- 			item->reparent(0,TQPoint(0,0));
- 		}
- 		
- 		void sorted(const std::list<LabelViewItem*> items)
- 		{
- 			for (LabelViewCItr i = items.begin();i != items.end();i++)
--				tqlayout->remove(*i);
-+				layout->remove(*i);
- 			
- 			for (LabelViewCItr i = items.begin();i != items.end();i++)
--				tqlayout->add(*i);
-+				layout->add(*i);
- 		}
- 	};
- 	
-diff --git a/libktorrent/labelviewitembase.ui b/libktorrent/labelviewitembase.ui
-index 861f703..fbce874 100644
---- a/libktorrent/labelviewitembase.ui
-+++ b/libktorrent/labelviewitembase.ui
-@@ -35,7 +35,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/libktorrent/pluginmanagerwidget.ui b/libktorrent/pluginmanagerwidget.ui
-index a43575b..6b077f5 100644
---- a/libktorrent/pluginmanagerwidget.ui
-+++ b/libktorrent/pluginmanagerwidget.ui
-@@ -34,7 +34,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp
-index 802fca6..e6a3387 100644
---- a/libktorrent/torrent/peerid.cpp
-+++ b/libktorrent/torrent/peerid.cpp
-@@ -174,7 +174,7 @@ namespace bt
- 			Map["TS"] = "Torrent Storm";
- 			Map["TT"] = "TuoTu";
- 			Map["UL"] = "uLeecher!";
--			Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is tqunicode for µ
-+			Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is unicode for µ
- 			Map["WT"] = "BitLet";
- 			Map["WY"] = "FireTorrent";
- 			Map["XL"] = "Xunlei";
-diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/plugins/infowidget/chunkdownloadviewbase.ui
-index ddac38e..a68b412 100644
---- a/plugins/infowidget/chunkdownloadviewbase.ui
-+++ b/plugins/infowidget/chunkdownloadviewbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout8</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout11</cstring>
-+                        <cstring>layout11</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -67,7 +67,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout14</cstring>
-+                        <cstring>layout14</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -105,7 +105,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout13</cstring>
-+                        <cstring>layout13</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -143,7 +143,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout38</cstring>
-+                        <cstring>layout38</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -181,7 +181,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout38_2</cstring>
-+                        <cstring>layout38_2</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -219,7 +219,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout24</cstring>
-+                        <cstring>layout24</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/plugins/infowidget/statustabbase.ui b/plugins/infowidget/statustabbase.ui
-index 789c0e6..fc6a187 100644
---- a/plugins/infowidget/statustabbase.ui
-+++ b/plugins/infowidget/statustabbase.ui
-@@ -41,7 +41,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout16</cstring>
-+                <cstring>layout16</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -49,7 +49,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout15</cstring>
-+                        <cstring>layout15</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -115,7 +115,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout14</cstring>
-+                        <cstring>layout14</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -181,7 +181,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout12</cstring>
-+                        <cstring>layout12</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -266,7 +266,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout17</cstring>
-+                <cstring>layout17</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -274,7 +274,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout23</cstring>
-+                        <cstring>layout23</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -282,7 +282,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout25</cstring>
-+                                <cstring>layout25</cstring>
-                             </property>
-                             <vbox>
-                                 <property name="name">
-@@ -431,7 +431,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout16</cstring>
-+                        <cstring>layout16</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -459,7 +459,7 @@
-                         </widget>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout15</cstring>
-+                                <cstring>layout15</cstring>
-                             </property>
-                             <grid>
-                                 <property name="name">
-@@ -497,7 +497,7 @@
-                                 </widget>
-                                 <widget class="TQLayoutWidget" row="2" column="1">
-                                     <property name="name">
--                                        <cstring>tqlayout11</cstring>
-+                                        <cstring>layout11</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-diff --git a/plugins/infowidget/trackerviewbase.ui b/plugins/infowidget/trackerviewbase.ui
-index ef49ec3..24d92c2 100644
---- a/plugins/infowidget/trackerviewbase.ui
-+++ b/plugins/infowidget/trackerviewbase.ui
-@@ -50,7 +50,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="2" column="1">
-             <property name="name">
--                <cstring>tqlayout8</cstring>
-+                <cstring>layout8</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -129,7 +129,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui
-index 2a1938c..23e59ef 100644
---- a/plugins/ipfilter/convert_dlg.ui
-+++ b/plugins/ipfilter/convert_dlg.ui
-@@ -82,7 +82,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="3" column="0">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/ipfilter/ipblockingpref.ui b/plugins/ipfilter/ipblockingpref.ui
-index a74fe6d..bd58d65 100644
---- a/plugins/ipfilter/ipblockingpref.ui
-+++ b/plugins/ipfilter/ipblockingpref.ui
-@@ -63,7 +63,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="0">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -92,7 +92,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="2" column="0">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/plugins/partfileimport/importdlgbase.ui b/plugins/partfileimport/importdlgbase.ui
-index f171831..29697e3 100644
---- a/plugins/partfileimport/importdlgbase.ui
-+++ b/plugins/partfileimport/importdlgbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout6</cstring>
-+                <cstring>layout6</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -29,7 +29,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -67,7 +67,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -102,7 +102,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/rssfeed/rssfeedwidget.ui b/plugins/rssfeed/rssfeedwidget.ui
-index 4a35633..62c2af8 100644
---- a/plugins/rssfeed/rssfeedwidget.ui
-+++ b/plugins/rssfeed/rssfeedwidget.ui
-@@ -48,7 +48,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget">
-                             <property name="name">
--                                <cstring>tqlayout2</cstring>
-+                                <cstring>layout2</cstring>
-                             </property>
-                             <grid>
-                                 <property name="name">
-@@ -194,7 +194,7 @@
-                                 </widget>
-                                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
-                                     <property name="name">
--                                        <cstring>tqlayout13</cstring>
-+                                        <cstring>layout13</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -277,7 +277,7 @@
-                                 </widget>
-                                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
-                                     <property name="name">
--                                        <cstring>tqlayout47</cstring>
-+                                        <cstring>layout47</cstring>
-                                     </property>
-                                     <hbox>
-                                         <property name="name">
-@@ -367,7 +367,7 @@
-                     </property>
-                     <widget class="TQLayoutWidget">
-                         <property name="name">
--                            <cstring>tqlayout28</cstring>
-+                            <cstring>layout28</cstring>
-                         </property>
-                         <vbox>
-                             <property name="name">
-@@ -476,7 +476,7 @@
-                     </widget>
-                     <widget class="TQLayoutWidget">
-                         <property name="name">
--                            <cstring>tqlayout14</cstring>
-+                            <cstring>layout14</cstring>
-                         </property>
-                         <vbox>
-                             <property name="name">
-@@ -484,7 +484,7 @@
-                             </property>
-                             <widget class="TQLayoutWidget">
-                                 <property name="name">
--                                    <cstring>tqlayout9</cstring>
-+                                    <cstring>layout9</cstring>
-                                 </property>
-                                 <hbox>
-                                     <property name="name">
-@@ -526,7 +526,7 @@
-                             </widget>
-                             <widget class="TQLayoutWidget">
-                                 <property name="name">
--                                    <cstring>tqlayout12</cstring>
-+                                    <cstring>layout12</cstring>
-                                 </property>
-                                 <hbox>
-                                     <property name="name">
-@@ -565,7 +565,7 @@
-                                     </widget>
-                                     <widget class="TQLayoutWidget">
-                                         <property name="name">
--                                            <cstring>tqlayout11</cstring>
-+                                            <cstring>layout11</cstring>
-                                         </property>
-                                         <vbox>
-                                             <property name="name">
-@@ -573,7 +573,7 @@
-                                             </property>
-                                             <widget class="TQLayoutWidget">
-                                                 <property name="name">
--                                                    <cstring>tqlayout28</cstring>
-+                                                    <cstring>layout28</cstring>
-                                                 </property>
-                                                 <hbox>
-                                                     <property name="name">
-@@ -648,7 +648,7 @@
-                                                     </property>
-                                                     <widget class="TQLayoutWidget">
-                                                         <property name="name">
--                                                            <cstring>tqlayout9</cstring>
-+                                                            <cstring>layout9</cstring>
-                                                         </property>
-                                                         <hbox>
-                                                             <property name="name">
-@@ -686,7 +686,7 @@
-                                                     </widget>
-                                                     <widget class="TQLayoutWidget">
-                                                         <property name="name">
--                                                            <cstring>tqlayout10</cstring>
-+                                                            <cstring>layout10</cstring>
-                                                         </property>
-                                                         <grid>
-                                                             <property name="name">
-@@ -792,7 +792,7 @@
-                             </widget>
-                             <widget class="TQLayoutWidget">
-                                 <property name="name">
--                                    <cstring>tqlayout33</cstring>
-+                                    <cstring>layout33</cstring>
-                                 </property>
-                                 <hbox>
-                                     <property name="name">
-@@ -880,7 +880,7 @@
-                                     </widget>
-                                     <widget class="TQLayoutWidget">
-                                         <property name="name">
--                                            <cstring>tqlayout13</cstring>
-+                                            <cstring>layout13</cstring>
-                                         </property>
-                                         <hbox>
-                                             <property name="name">
-diff --git a/plugins/scanfolder/sfprefwidgetbase.ui b/plugins/scanfolder/sfprefwidgetbase.ui
-index 3fd83e4..e9ddfdc 100644
---- a/plugins/scanfolder/sfprefwidgetbase.ui
-+++ b/plugins/scanfolder/sfprefwidgetbase.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout16</cstring>
-+                <cstring>layout16</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-diff --git a/plugins/scheduler/bwspage.ui b/plugins/scheduler/bwspage.ui
-index 547bee1..547de3f 100644
---- a/plugins/scheduler/bwspage.ui
-+++ b/plugins/scheduler/bwspage.ui
-@@ -36,7 +36,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="1">
-             <property name="name">
--                <cstring>tqlayout21</cstring>
-+                <cstring>layout21</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -411,7 +411,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="0">
-                     <property name="name">
--                        <cstring>tqlayout8</cstring>
-+                        <cstring>layout8</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -461,7 +461,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="3" column="0">
-                     <property name="name">
--                        <cstring>tqlayout9</cstring>
-+                        <cstring>layout9</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -511,7 +511,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="5" column="0">
-                     <property name="name">
--                        <cstring>tqlayout10</cstring>
-+                        <cstring>layout10</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -596,7 +596,7 @@
-         </widget>
-         <widget class="TQLayoutWidget" row="2" column="1">
-             <property name="name">
--                <cstring>tqlayout34</cstring>
-+                <cstring>layout34</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -650,7 +650,7 @@
-         </spacer>
-         <widget class="TQLayoutWidget" row="4" column="1">
-             <property name="name">
--                <cstring>tqlayout32</cstring>
-+                <cstring>layout32</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-@@ -658,7 +658,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout31</cstring>
-+                        <cstring>layout31</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-@@ -737,7 +737,7 @@
-                 </spacer>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout29</cstring>
-+                        <cstring>layout29</cstring>
-                     </property>
-                     <vbox>
-                         <property name="name">
-diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
-index bad55d6..d4b39e1 100644
---- a/plugins/search/htmlpart.cpp
-+++ b/plugins/search/htmlpart.cpp
-@@ -60,7 +60,7 @@ namespace kt
- 	void HTMLPart::copy()
- 	{
- 		TQString txt = selectedText();
--		TQClipboard *cb = TQApplication::tqclipboard();
-+		TQClipboard *cb = TQApplication::clipboard();
- 		// Copy text into the clipboard
- 		if (cb)
- 			cb->setText(txt,TQClipboard::Clipboard);
-diff --git a/plugins/search/searchpref.ui b/plugins/search/searchpref.ui
-index fb03f02..2baa1af 100644
---- a/plugins/search/searchpref.ui
-+++ b/plugins/search/searchpref.ui
-@@ -65,7 +65,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout29</cstring>
-+                        <cstring>layout29</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -129,7 +129,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout22</cstring>
-+                        <cstring>layout22</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -152,7 +152,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout23</cstring>
-+                        <cstring>layout23</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -235,7 +235,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
-index 67f6dfa..01c27f7 100644
---- a/plugins/search/searchwidget.cpp
-+++ b/plugins/search/searchwidget.cpp
-@@ -59,8 +59,8 @@ namespace kt
- 	
- 	SearchWidget::SearchWidget(SearchPlugin* sp) : html_part(0),sp(sp)
- 	{
--		TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
--		tqlayout->setAutoAdd(true);
-+		TQVBoxLayout* layout = new TQVBoxLayout(this);
-+		layout->setAutoAdd(true);
- 		sbar = new SearchBar(this);
- 		html_part = new HTMLPart(this);
- 	
-diff --git a/plugins/stats/StatsCon.cc b/plugins/stats/StatsCon.cc
-index 548b38a..568005d 100644
---- a/plugins/stats/StatsCon.cc
-+++ b/plugins/stats/StatsCon.cc
-@@ -26,16 +26,16 @@ StatsCon::StatsCon(TQWidget * p) :  StatsConWgt(p), pmPeersConCht(new ChartDrawe
- 				pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements()))
- {
- 	PeersConGbw->setColumnLayout(0, Qt::Vertical );
--	PeersConGbw->tqlayout()->setSpacing( 6 );
--	PeersConGbw->tqlayout()->setMargin( 11 );
-+	PeersConGbw->layout()->setSpacing( 6 );
-+	PeersConGbw->layout()->setMargin( 11 );
- 	
--	pmPeersConLay = new TQVBoxLayout(PeersConGbw -> tqlayout());
-+	pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout());
- 	
- 	DHTGbw->setColumnLayout(0, Qt::Vertical );
--	DHTGbw->tqlayout()->setSpacing( 6 );
--	DHTGbw->tqlayout()->setMargin( 11 );
-+	DHTGbw->layout()->setSpacing( 6 );
-+	DHTGbw->layout()->setMargin( 11 );
- 	
--	pmDHTLay = new TQVBoxLayout(DHTGbw -> tqlayout());
-+	pmDHTLay = new TQVBoxLayout(DHTGbw -> layout());
- 	
- 	//-------------
- 	
-diff --git a/plugins/stats/StatsSpd.cc b/plugins/stats/StatsSpd.cc
-index 0ea427a..c8cb157 100644
---- a/plugins/stats/StatsSpd.cc
-+++ b/plugins/stats/StatsSpd.cc
-@@ -29,22 +29,22 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p),
- {
- 
- 	DownSpeedGbw->setColumnLayout(0, Qt::Vertical );
--	DownSpeedGbw->tqlayout()->setSpacing( 6 );
--	DownSpeedGbw->tqlayout()->setMargin( 11 );
-+	DownSpeedGbw->layout()->setSpacing( 6 );
-+	DownSpeedGbw->layout()->setMargin( 11 );
- 	
--	pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> tqlayout());
-+	pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout());
- 	
- 	UpSpeedGbw->setColumnLayout(0, Qt::Vertical );
--	UpSpeedGbw->tqlayout()->setSpacing( 6 );
--	UpSpeedGbw->tqlayout()->setMargin( 11 );
-+	UpSpeedGbw->layout()->setSpacing( 6 );
-+	UpSpeedGbw->layout()->setMargin( 11 );
- 	
--	pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> tqlayout());
-+	pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout());
- 	
- 	PeersSpdGbw->setColumnLayout(0, Qt::Vertical );
--	PeersSpdGbw->tqlayout()->setSpacing( 6 );
--	PeersSpdGbw->tqlayout()->setMargin( 11 );
-+	PeersSpdGbw->layout()->setSpacing( 6 );
-+	PeersSpdGbw->layout()->setMargin( 11 );
- 	
--	pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> tqlayout());
-+	pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> layout());
- 
- 	//-----------------
- 	
-diff --git a/plugins/stats/sprefwgt.ui b/plugins/stats/sprefwgt.ui
-index 0ad1c7f..b6ce139 100644
---- a/plugins/stats/sprefwgt.ui
-+++ b/plugins/stats/sprefwgt.ui
-@@ -32,7 +32,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout2</cstring>
-+                        <cstring>layout2</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -78,7 +78,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -140,7 +140,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout11</cstring>
-+                        <cstring>layout11</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -197,7 +197,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout3</cstring>
-+                        <cstring>layout3</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -275,7 +275,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -314,7 +314,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -346,7 +346,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="0">
-                     <property name="name">
--                        <cstring>tqlayout5_2</cstring>
-+                        <cstring>layout5_2</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -378,7 +378,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="2" column="0">
-                     <property name="name">
--                        <cstring>tqlayout5_3</cstring>
-+                        <cstring>layout5_3</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -410,7 +410,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="0" column="1">
-                     <property name="name">
--                        <cstring>tqlayout5_5</cstring>
-+                        <cstring>layout5_5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -442,7 +442,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="1">
-                     <property name="name">
--                        <cstring>tqlayout5_4</cstring>
-+                        <cstring>layout5_4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-diff --git a/plugins/stats/statsconwgt.ui b/plugins/stats/statsconwgt.ui
-index c76e6eb..3565a3c 100644
---- a/plugins/stats/statsconwgt.ui
-+++ b/plugins/stats/statsconwgt.ui
-@@ -18,7 +18,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/stats/statsspdwgt.ui b/plugins/stats/statsspdwgt.ui
-index 25a3cd8..b04e19a 100644
---- a/plugins/stats/statsspdwgt.ui
-+++ b/plugins/stats/statsspdwgt.ui
-@@ -18,7 +18,7 @@
-         </property>
-         <widget class="TQLayoutWidget" row="0" column="0">
-             <property name="name">
--                <cstring>tqlayout5</cstring>
-+                <cstring>layout5</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui
-index 3dc7944..d06576a 100644
---- a/plugins/upnp/upnpwidget.ui
-+++ b/plugins/upnp/upnpwidget.ui
-@@ -21,7 +21,7 @@
-         </property>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout1</cstring>
-+                <cstring>layout1</cstring>
-             </property>
-             <vbox>
-                 <property name="name">
-@@ -77,7 +77,7 @@
-         </widget>
-         <widget class="TQLayoutWidget">
-             <property name="name">
--                <cstring>tqlayout3</cstring>
-+                <cstring>layout3</cstring>
-             </property>
-             <hbox>
-                 <property name="name">
-diff --git a/plugins/webinterface/webinterfacepref.ui b/plugins/webinterface/webinterfacepref.ui
-index a36f7f8..4927673 100644
---- a/plugins/webinterface/webinterfacepref.ui
-+++ b/plugins/webinterface/webinterfacepref.ui
-@@ -46,7 +46,7 @@
-                 </property>
-                 <widget class="TQLayoutWidget" row="0" column="0">
-                     <property name="name">
--                        <cstring>tqlayout5</cstring>
-+                        <cstring>layout5</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -128,7 +128,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="1" column="0">
-                     <property name="name">
--                        <cstring>tqlayout4</cstring>
-+                        <cstring>layout4</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
-@@ -151,7 +151,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="3" column="0">
-                     <property name="name">
--                        <cstring>tqlayout6</cstring>
-+                        <cstring>layout6</cstring>
-                     </property>
-                     <grid>
-                         <property name="name">
-@@ -159,7 +159,7 @@
-                         </property>
-                         <widget class="TQLayoutWidget" row="0" column="0">
-                             <property name="name">
--                                <cstring>tqlayout5</cstring>
-+                                <cstring>layout5</cstring>
-                             </property>
-                             <hbox>
-                                 <property name="name">
-@@ -192,7 +192,7 @@
-                 </widget>
-                 <widget class="TQLayoutWidget" row="2" column="0">
-                     <property name="name">
--                        <cstring>tqlayout7</cstring>
-+                        <cstring>layout7</cstring>
-                     </property>
-                     <hbox>
-                         <property name="name">
diff --git a/redhat/applications/ktorrent/bp003-c3480dfe.diff b/redhat/applications/ktorrent/bp003-c3480dfe.diff
deleted file mode 100644
index ccb27d0db..000000000
--- a/redhat/applications/ktorrent/bp003-c3480dfe.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit c3480dfed56038a7e8c11e2afbc454f59ab44843
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324748239 -0600
-
-    Rename a few stragglers
-
-diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
-index 100ab62..845df4b 100644
---- a/apps/ktorrent/newui/button.cpp
-+++ b/apps/ktorrent/newui/button.cpp
-@@ -131,7 +131,7 @@ void Button::drawButton(TQPainter *p)
-     pm.fill(eraseColor());
-     TQPainter p2(&pm);
- 
--    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
-+    style().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
- 
-     style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
-                         TQRect(0,0,pm.width(),pm.height()),
diff --git a/redhat/applications/ktorrent/bp004-445a5152.diff b/redhat/applications/ktorrent/bp004-445a5152.diff
deleted file mode 100644
index aedb19cc1..000000000
--- a/redhat/applications/ktorrent/bp004-445a5152.diff
+++ /dev/null
@@ -1,123 +0,0 @@
-commit 445a515241430cef8e8458d782649fa0e8593a4c
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332214882 -0500
-
-    Fix inadvertent "TQ" changes.
-
-diff --git a/apps/ktorrent/groups/queueddownloadsgroup.h b/apps/ktorrent/groups/queueddownloadsgroup.h
-index 3e436a5..019a69c 100644
---- a/apps/ktorrent/groups/queueddownloadsgroup.h
-+++ b/apps/ktorrent/groups/queueddownloadsgroup.h
-@@ -17,8 +17,8 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
-  ***************************************************************************/
--#ifndef KTQUEUEDDOWNLOADSGROUP_H
--#define KTQUEUEDDOWNLOADSGROUP_H
-+#ifndef KQUEUEDDOWNLOADSGROUP_H
-+#define KQUEUEDDOWNLOADSGROUP_H
- 
- #include <group.h>
- 
-diff --git a/apps/ktorrent/groups/queueduploadsgroup.h b/apps/ktorrent/groups/queueduploadsgroup.h
-index 675da62..601e02f 100644
---- a/apps/ktorrent/groups/queueduploadsgroup.h
-+++ b/apps/ktorrent/groups/queueduploadsgroup.h
-@@ -17,8 +17,8 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
-  ***************************************************************************/
--#ifndef KTQUEUEDUPLOADSGROUP_H
--#define KTQUEUEDUPLOADSGROUP_H
-+#ifndef KQUEUEDUPLOADSGROUP_H
-+#define KQUEUEDUPLOADSGROUP_H
- 
- #include <group.h>
- 
-diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
-index a9392bd..ae37665 100644
---- a/apps/ktorrent/ktorrentviewitem.cpp
-+++ b/apps/ktorrent/ktorrentviewitem.cpp
-@@ -72,7 +72,7 @@ static TQColor StatusToColor(TorrentStatus s,const TQColorGroup & cg)
- 			return TQt::red;
- 		case kt::NOT_STARTED :
- 		case kt::STOPPED:
--		case kt::TQUEUED:
-+		case kt::QUEUED:
- 		case kt::DOWNLOAD_COMPLETE :
- 		case kt::SEEDING_COMPLETE :
- 		default:
-diff --git a/apps/ktorrent/queuedialog.h b/apps/ktorrent/queuedialog.h
-index d025fbf..a6900e4 100644
---- a/apps/ktorrent/queuedialog.h
-+++ b/apps/ktorrent/queuedialog.h
-@@ -17,8 +17,8 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
-  ***************************************************************************/
--#ifndef TQUEUEDIALOG_H
--#define TQUEUEDIALOG_H
-+#ifndef QUEUEDIALOG_H
-+#define QUEUEDIALOG_H
- 
- #include "queuedlg.h"
- #include <interfaces/torrentinterface.h>
-diff --git a/libktorrent/interfaces/torrentinterface.h b/libktorrent/interfaces/torrentinterface.h
-index 8b21854..e76e00e 100644
---- a/libktorrent/interfaces/torrentinterface.h
-+++ b/libktorrent/interfaces/torrentinterface.h
-@@ -55,7 +55,7 @@ namespace kt
- 		STOPPED,
- 		ALLOCATING_DISKSPACE,
- 		ERROR,
--		TQUEUED,
-+		QUEUED,
- 		CHECKING_DATA,
-   		NO_SPACE_LEFT
- 	};
-diff --git a/libktorrent/torrent/queuemanager.h b/libktorrent/torrent/queuemanager.h
-index 26b1012..e49ad44 100644
---- a/libktorrent/torrent/queuemanager.h
-+++ b/libktorrent/torrent/queuemanager.h
-@@ -18,8 +18,8 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
-  ***************************************************************************/
--#ifndef TQUEUEMANAGER_H
--#define TQUEUEMANAGER_H
-+#ifndef QUEUEMANAGER_H
-+#define QUEUEMANAGER_H
- 
- #include <set>
- #include <tqobject.h>
-diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
-index 3e22ec1..3cedfe9 100644
---- a/libktorrent/torrent/torrentcontrol.cpp
-+++ b/libktorrent/torrent/torrentcontrol.cpp
-@@ -932,7 +932,7 @@ namespace bt
- 		else if (!stats.started)
- 			stats.status = kt::NOT_STARTED;
- 		else if(!stats.running && !stats.user_controlled)
--			stats.status = kt::TQUEUED;
-+			stats.status = kt::QUEUED;
- 		else if (!stats.running && stats.completed && (overMaxRatio() || overMaxSeedTime()))
- 			stats.status = kt::SEEDING_COMPLETE;
- 		else if (!stats.running && stats.completed)
-@@ -1301,7 +1301,7 @@ namespace bt
- 		istats.priority = p;
- 		stats.user_controlled = p == 0 ? true : false;
- 		if(p)
--			stats.status = kt::TQUEUED;
-+			stats.status = kt::QUEUED;
- 		else
- 			updateStatusMsg();
- 		
-@@ -1378,7 +1378,7 @@ namespace bt
- 				return i18n("Error: ") + getShortErrorMessage(); 
- 			case kt::ALLOCATING_DISKSPACE:
- 				return i18n("Allocating diskspace");
--			case kt::TQUEUED:
-+			case kt::QUEUED:
- 				return i18n("Queued");
- 			case kt::CHECKING_DATA:
- 				return i18n("Checking data");
diff --git a/redhat/applications/ktorrent/bp005-03d0c794.diff b/redhat/applications/ktorrent/bp005-03d0c794.diff
deleted file mode 100644
index 6f7cdc217..000000000
--- a/redhat/applications/ktorrent/bp005-03d0c794.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 03d0c794dc3a15e414c627f47a31718c39a49197
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332214935 -0500
-
-    Fix configure output message to clarify that missing avahi support
-    is caused by missing avahi-tqt package as well as avahi-client.
-
-diff --git a/configure.in b/configure.in
-index 29436e8..ca0b183 100644
---- a/configure.in
-+++ b/configure.in
-@@ -403,7 +403,8 @@ if test x$missing_avahi_warning = xyes; then
-         echo ""
-         echo "----------------------------------------------------------"
-         echo "KTorrent WARNING:"
--        echo "Cannot find avahi-client with version 0.6.10 or later."
-+        echo "Cannot find avahi-client with version 0.6.10 or later or"
-+        echo "cannot find avahi-tqt."
- 		echo "The zeroconf plugin will not be installed because of this."
-         echo "----------------------------------------------------------"
-         echo ""
-diff --git a/configure.in.bot b/configure.in.bot
-index b3f5186..15c2c8c 100644
---- a/configure.in.bot
-+++ b/configure.in.bot
-@@ -12,7 +12,8 @@ if test x$missing_avahi_warning = xyes; then
-         echo ""
-         echo "----------------------------------------------------------"
-         echo "KTorrent WARNING:"
--        echo "Cannot find avahi-client with version 0.6.10 or later."
-+        echo "Cannot find avahi-client with version 0.6.10 or later or"
-+        echo "cannot find avahi-tqt."
- 		echo "The zeroconf plugin will not be installed because of this."
-         echo "----------------------------------------------------------"
-         echo ""
diff --git a/redhat/applications/ktorrent/bp006-5af9907f.diff b/redhat/applications/ktorrent/bp006-5af9907f.diff
deleted file mode 100644
index 537fb7afc..000000000
--- a/redhat/applications/ktorrent/bp006-5af9907f.diff
+++ /dev/null
@@ -1,139176 +0,0 @@
-commit 5af9907fee05f882f8d2422e47198ebf61d97bb7
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332388548 -0500
-
-    Update ktorrent package to 2.2.8 and fix internal geoip database.
-    This resolves bug report 363.
-
-diff --git a/ChangeLog b/ChangeLog
-index 56b8346..2156d72 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+Changes in 2.2.8 :
-+- Backported some security fixes for the webinterface from KDE4 version
-+
-+Changes in 2.2.7 :
-+- Fix crash when loading articles in RSS plugin fails (161475)
-+- Fix SIGBUS caused crash on sparc
-+- Backported fix from KDE4 version for an infinite recursive loop in the QM
-+
- Changes in 2.2.6 :
- - Some OpenBSD compile fixes
- - Fix lock file not working on NFS home directories by moving it to /tmp
-diff --git a/Makefile.am b/Makefile.am
-index 3bb652a..a4871db 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = translations libktorrent plugins apps scripts
-+SUBDIRS = libktorrent plugins apps scripts translations
- 
- # $(UTESTS_DIR)
- 
-diff --git a/acinclude.m4 b/acinclude.m4
-index af86ec0..8573f9b 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -4649,18 +4649,20 @@ fi
- 
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
--  KDE_CHECK_PYTHON_INTERN("2.5",
--    [KDE_CHECK_PYTHON_INTERN("2.4",
--     [KDE_CHECK_PYTHON_INTERN("2.3", 
--       [KDE_CHECK_PYTHON_INTERN("2.2", 
--         [KDE_CHECK_PYTHON_INTERN("2.1", 
--           [KDE_CHECK_PYTHON_INTERN("2.0", 
--             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
--           ])
--         ])
--       ])
--     ])
--  ])
-+  KDE_CHECK_PYTHON_INTERN("2.6",
-+    [KDE_CHECK_PYTHON_INTERN("2.5",
-+      [KDE_CHECK_PYTHON_INTERN("2.4",
-+        [KDE_CHECK_PYTHON_INTERN("2.3", 
-+          [KDE_CHECK_PYTHON_INTERN("2.2", 
-+            [KDE_CHECK_PYTHON_INTERN("2.1", 
-+              [KDE_CHECK_PYTHON_INTERN("2.0", 
-+                [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-+              ])
-+            ])
-+          ])
-+        ])
-+      ])
-+    ])
- ])
- 
- AC_DEFUN([KDE_CHECK_STL],
-diff --git a/aclocal.m4 b/aclocal.m4
-index 51718e4..67cfa4e 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006  Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +11,9901 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf.  If you want to use that,
--you should regenerate the build system entirely.], [63])])
- 
--# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
--# 
--# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+dnl    This file is part of the KDE libraries/packages
-+dnl    Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-+dnl              (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-+
-+dnl    This file is free software; you can redistribute it and/or
-+dnl    modify it under the terms of the GNU Library General Public
-+dnl    License as published by the Free Software Foundation; either
-+dnl    version 2 of the License, or (at your option) any later version.
-+
-+dnl    This library is distributed in the hope that it will be useful,
-+dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl    Library General Public License for more details.
-+
-+dnl    You should have received a copy of the GNU Library General Public License
-+dnl    along with this library; see the file COPYING.LIB.  If not, write to
-+dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+dnl    Boston, MA 02110-1301, USA.
-+
-+dnl IMPORTANT NOTE:
-+dnl Please do not modify this file unless you expect your modifications to be
-+dnl carried into every other module in the repository. 
-+dnl
-+dnl Single-module modifications are best placed in configure.in for kdelibs
-+dnl and kdebase or configure.in.in if present.
-+
-+# KDE_PATH_X_DIRECT
-+dnl Internal subroutine of AC_PATH_X.
-+dnl Set ac_x_includes and/or ac_x_libraries.
-+AC_DEFUN([KDE_PATH_X_DIRECT],
-+[
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+if test "$ac_x_includes" = NO; then
-+  # Guess where to find include files, by looking for this one X11 .h file.
-+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+
-+  # First, try using that file with no special directory specified.
-+AC_TRY_CPP([#include <$x_direct_test_include>],
-+[# We can compile using X headers with no special include directory.
-+ac_x_includes=],
-+[# Look for the header file in a standard set of common directories.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+  for ac_dir in               \
-+    /usr/X11/include          \
-+    /usr/X11R6/include        \
-+    /usr/X11R5/include        \
-+    /usr/X11R4/include        \
-+                              \
-+    /usr/include/X11          \
-+    /usr/include/X11R6        \
-+    /usr/include/X11R5        \
-+    /usr/include/X11R4        \
-+                              \
-+    /usr/local/X11/include    \
-+    /usr/local/X11R6/include  \
-+    /usr/local/X11R5/include  \
-+    /usr/local/X11R4/include  \
-+                              \
-+    /usr/local/include/X11    \
-+    /usr/local/include/X11R6  \
-+    /usr/local/include/X11R5  \
-+    /usr/local/include/X11R4  \
-+                              \
-+    /usr/X386/include         \
-+    /usr/x386/include         \
-+    /usr/XFree86/include/X11  \
-+                              \
-+    /usr/include              \
-+    /usr/local/include        \
-+    /usr/unsupported/include  \
-+    /usr/athena/include       \
-+    /usr/local/x11r5/include  \
-+    /usr/lpp/Xamples/include  \
-+                              \
-+    /usr/openwin/include      \
-+    /usr/openwin/share/include \
-+    ; \
-+  do
-+    if test -r "$ac_dir/$x_direct_test_include"; then
-+      ac_x_includes=$ac_dir
-+      break
-+    fi
-+  done])
-+fi # $ac_x_includes = NO
-+
-+if test "$ac_x_libraries" = NO; then
-+  # Check for the libraries.
-+
-+  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-+  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+
-+  # See if we find them without any special options.
-+  # Don't add to $LIBS permanently.
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-l$x_direct_test_library $LIBS"
-+AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
-+[LIBS="$ac_save_LIBS"
-+# We can link X programs with no special library path.
-+ac_x_libraries=],
-+[LIBS="$ac_save_LIBS"
-+# First see if replacing the include by lib works.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-+    /usr/X11/lib${kdelibsuff}           \
-+    /usr/X11R6/lib${kdelibsuff}         \
-+    /usr/X11R5/lib${kdelibsuff}         \
-+    /usr/X11R4/lib${kdelibsuff}         \
-+                                        \
-+    /usr/lib${kdelibsuff}/X11           \
-+    /usr/lib${kdelibsuff}/X11R6         \
-+    /usr/lib${kdelibsuff}/X11R5         \
-+    /usr/lib${kdelibsuff}/X11R4         \
-+                                        \
-+    /usr/local/X11/lib${kdelibsuff}     \
-+    /usr/local/X11R6/lib${kdelibsuff}   \
-+    /usr/local/X11R5/lib${kdelibsuff}   \
-+    /usr/local/X11R4/lib${kdelibsuff}   \
-+                                        \
-+    /usr/local/lib${kdelibsuff}/X11     \
-+    /usr/local/lib${kdelibsuff}/X11R6   \
-+    /usr/local/lib${kdelibsuff}/X11R5   \
-+    /usr/local/lib${kdelibsuff}/X11R4   \
-+                                        \
-+    /usr/X386/lib${kdelibsuff}          \
-+    /usr/x386/lib${kdelibsuff}          \
-+    /usr/XFree86/lib${kdelibsuff}/X11   \
-+                                        \
-+    /usr/lib${kdelibsuff}               \
-+    /usr/local/lib${kdelibsuff}         \
-+    /usr/unsupported/lib${kdelibsuff}   \
-+    /usr/athena/lib${kdelibsuff}        \
-+    /usr/local/x11r5/lib${kdelibsuff}   \
-+    /usr/lpp/Xamples/lib${kdelibsuff}   \
-+    /lib/usr/lib${kdelibsuff}/X11       \
-+                                        \
-+    /usr/openwin/lib${kdelibsuff}       \
-+    /usr/openwin/share/lib${kdelibsuff} \
-+    ; \
-+do
-+dnl Don't even attempt the hair of trying to link an X program!
-+  for ac_extension in a so sl; do
-+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done])
-+fi # $ac_x_libraries = NO
-+])
-+
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find a file (or one of more files in a list of dirs)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_FIND_FILE],
-+[
-+$3=NO
-+for i in $2;
-+do
-+  for j in $1;
-+  do
-+    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&AC_FD_CC
-+      $3=$i
-+      break 2
-+    fi
-+  done
-+done
-+])
-+
-+dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-+dnl	if-not-found, test-parameter, prepend-path)
-+dnl
-+dnl Look for program-name in list-of-dirs+$PATH.
-+dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-+dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-+dnl test-parameter: if set, the program is executed with this arg,
-+dnl                 and only a successful exit code is required.
-+AC_DEFUN([KDE_FIND_PATH],
-+[
-+   AC_MSG_CHECKING([for $1])
-+   if test -n "$$2"; then
-+        kde_cv_path="$$2";
-+   else
-+        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-+
-+        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-+        [
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z "$6"; then  dnl Append dirs in PATH (default)
-+	  dirs="$3 $dirs"
-+        else  dnl Prepend dirs in PATH (if 6th arg is set)
-+	  dirs="$dirs $3"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/$1"; then
-+	    if test -n "$5"
-+	    then
-+              evalstr="$dir/$1 $5 2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/$1"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/$1"
-+                break
-+	    fi
-+          fi
-+        done
-+
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-+
-+        ])
-+
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-+
-+   fi
-+
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-+      AC_MSG_RESULT(not found)
-+      $4
-+   else
-+      AC_MSG_RESULT($kde_cv_path)
-+      $2=$kde_cv_path
-+
-+   fi
-+])
-+
-+AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-+[
-+    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running moc binary.
-+configure tried to run $ac_cv_path_moc and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable MOC to the right one before running
-+configure.
-+])
-+])
-+
-+AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-+[
-+    AC_MSG_WARN([No Qt ui compiler (uic) found!
-+Please check whether you installed Qt correctly.
-+You need to have a running uic binary.
-+configure tried to run $ac_cv_path_uic and the test didn't
-+succeed. If configure shouldn't have tried this one, set
-+the environment variable UIC to the right one before running
-+configure.
-+])
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_UIC_FLAG],
-+[
-+    AC_MSG_CHECKING([whether uic supports -$1 ])
-+    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-+    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
-+    [
-+        cat >conftest.ui <<EOT
-+        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-+EOT
-+        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
-+        if AC_TRY_EVAL(ac_uic_testrun); then
-+            eval "kde_cv_prog_uic_$kde_cache=yes"
-+        else
-+            eval "kde_cv_prog_uic_$kde_cache=no"
-+        fi
-+        rm -f conftest*
-+    ])
-+
-+    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-+        AC_MSG_RESULT([yes])
-+        :
-+        $3
-+    else
-+        AC_MSG_RESULT([no])
-+        :
-+        $4
-+    fi
-+])
-+
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find the meta object compiler and the ui compiler in the PATH,
-+dnl in $QTDIR/bin, and some more usual places
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_PATH_QT_MOC_UIC],
-+[
-+   AC_REQUIRE([KDE_CHECK_PERL])
-+   qt_bindirs=""
-+   for dir in $kde_qt_dirs; do
-+      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-+   done
-+   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-+   if test ! "$ac_qt_bindir" = "NO"; then
-+      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-+   fi
-+
-+   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-+   if test -z "$UIC_NOT_NEEDED"; then
-+     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
-+     if test -z "$UIC_PATH" ; then
-+       KDE_UIC_ERROR_MESSAGE
-+       exit 1
-+     else
-+       UIC=$UIC_PATH
-+
-+       if test $kde_qtver = 3; then
-+         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
-+         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-+
-+         if test x$ac_uic_supports_libpath = xyes; then
-+             UIC="$UIC -L \$(kde_widgetdir)"
-+         fi
-+         if test x$ac_uic_supports_nounload = xyes; then
-+             UIC="$UIC -nounload"
-+         fi
-+       fi
-+     fi
-+   else
-+     UIC="echo uic not available: "
-+   fi
-+
-+   AC_SUBST(MOC)
-+   AC_SUBST(UIC)
-+
-+   UIC_TR="i18n"
-+   if test $kde_qtver = 3; then
-+     UIC_TR="tr2i18n"
-+   fi
-+
-+   AC_SUBST(UIC_TR)
-+])
-+
-+AC_DEFUN([KDE_1_CHECK_PATHS],
-+[
-+  KDE_1_CHECK_PATH_HEADERS
-+
-+  KDE_TEST_RPATH=
-+
-+  if test -n "$USE_RPATH"; then
-+
-+     if test -n "$kde_libraries"; then
-+       KDE_TEST_RPATH="-R $kde_libraries"
-+     fi
-+
-+     if test -n "$qt_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-+     fi
-+
-+     if test -n "$x_libraries"; then
-+       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-+     fi
-+
-+     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-+  fi
-+
-+AC_MSG_CHECKING([for KDE libraries installed])
-+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  AC_MSG_RESULT(yes)
-+else
-+  AC_MSG_ERROR([your system fails at linking a small KDE application!
-+Check, if your compiler is installed correctly and if you have used the
-+same compiler to compile Qt and kdelibs as you did use now.
-+For more details about this problem, look at the end of config.log.])
-+fi
-+
-+if eval `KDEDIR= ./conftest 2>&5`; then
-+  kde_result=done
-+else
-+  kde_result=problems
-+fi
-+
-+KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-+kde_have_all_paths=yes
-+
-+KDE_SET_PATHS($kde_result)
-+
-+])
-+
-+AC_DEFUN([KDE_SET_PATHS],
-+[
-+  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-+	kde_htmldir=\"$kde_htmldir\" \
-+	kde_appsdir=\"$kde_appsdir\" \
-+	kde_icondir=\"$kde_icondir\" \
-+	kde_sounddir=\"$kde_sounddir\" \
-+	kde_datadir=\"$kde_datadir\" \
-+	kde_locale=\"$kde_locale\" \
-+	kde_cgidir=\"$kde_cgidir\" \
-+	kde_confdir=\"$kde_confdir\" \
-+	kde_kcfgdir=\"$kde_kcfgdir\" \
-+	kde_mimedir=\"$kde_mimedir\" \
-+	kde_toolbardir=\"$kde_toolbardir\" \
-+	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-+	kde_templatesdir=\"$kde_templatesdir\" \
-+	kde_bindir=\"$kde_bindir\" \
-+	kde_servicesdir=\"$kde_servicesdir\" \
-+	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-+	kde_moduledir=\"$kde_moduledir\" \
-+	kde_styledir=\"$kde_styledir\" \
-+	kde_widgetdir=\"$kde_widgetdir\" \
-+	xdg_appsdir=\"$xdg_appsdir\" \
-+	xdg_menudir=\"$xdg_menudir\" \
-+	xdg_directorydir=\"$xdg_directorydir\" \
-+	kde_result=$1"
-+])
-+
-+AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-+[
-+if test "$1" = "default"; then
-+
-+  if test -z "$kde_htmldir"; then
-+    kde_htmldir='\${datadir}/doc/HTML'
-+  fi
-+  if test -z "$kde_appsdir"; then
-+    kde_appsdir='\${datadir}/applnk'
-+  fi
-+  if test -z "$kde_icondir"; then
-+    kde_icondir='\${datadir}/icons'
-+  fi
-+  if test -z "$kde_sounddir"; then
-+    kde_sounddir='\${datadir}/sounds'
-+  fi
-+  if test -z "$kde_datadir"; then
-+    kde_datadir='\${datadir}/apps'
-+  fi
-+  if test -z "$kde_locale"; then
-+    kde_locale='\${datadir}/locale'
-+  fi
-+  if test -z "$kde_cgidir"; then
-+    kde_cgidir='\${exec_prefix}/cgi-bin'
-+  fi
-+  if test -z "$kde_confdir"; then
-+    kde_confdir='\${datadir}/config'
-+  fi
-+  if test -z "$kde_kcfgdir"; then
-+    kde_kcfgdir='\${datadir}/config.kcfg'
-+  fi
-+  if test -z "$kde_mimedir"; then
-+    kde_mimedir='\${datadir}/mimelnk'
-+  fi
-+  if test -z "$kde_toolbardir"; then
-+    kde_toolbardir='\${datadir}/toolbar'
-+  fi
-+  if test -z "$kde_wallpaperdir"; then
-+    kde_wallpaperdir='\${datadir}/wallpapers'
-+  fi
-+  if test -z "$kde_templatesdir"; then
-+    kde_templatesdir='\${datadir}/templates'
-+  fi
-+  if test -z "$kde_bindir"; then
-+    kde_bindir='\${exec_prefix}/bin'
-+  fi
-+  if test -z "$kde_servicesdir"; then
-+    kde_servicesdir='\${datadir}/services'
-+  fi
-+  if test -z "$kde_servicetypesdir"; then
-+    kde_servicetypesdir='\${datadir}/servicetypes'
-+  fi
-+  if test -z "$kde_moduledir"; then
-+    if test "$kde_qtver" = "2"; then
-+      kde_moduledir='\${libdir}/kde2'
-+    else
-+      kde_moduledir='\${libdir}/kde3'
-+    fi
-+  fi
-+  if test -z "$kde_styledir"; then
-+    kde_styledir='\${libdir}/kde3/plugins/styles'
-+  fi
-+  if test -z "$kde_widgetdir"; then
-+    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+  fi
-+  if test -z "$xdg_appsdir"; then
-+    xdg_appsdir='\${datadir}/applications/kde'
-+  fi
-+  if test -z "$xdg_menudir"; then
-+    xdg_menudir='\${sysconfdir}/xdg/menus'
-+  fi
-+  if test -z "$xdg_directorydir"; then
-+    xdg_directorydir='\${datadir}/desktop-directories'
-+  fi
-+
-+  KDE_SET_PATHS(defaults)
-+
-+else
-+
-+  if test $kde_qtver = 1; then
-+     AC_MSG_RESULT([compiling])
-+     KDE_1_CHECK_PATHS
-+  else
-+     AC_MSG_ERROR([path checking not yet supported for KDE 2])
-+  fi
-+
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-+[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-+   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-+   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-+   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-+   test -z "$kde_kcfgdir" ||
-+   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-+   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-+   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-+   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-+   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-+   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-+   test "x$kde_have_all_paths" != "xyes"; then
-+     kde_have_all_paths=no
-+  fi
-+])
-+
-+AC_DEFUN([KDE_MISSING_PROG_ERROR],
-+[
-+    AC_MSG_ERROR([The important program $1 was not found!
-+Please check whether you installed KDE correctly.
-+])
-+])
-+
-+AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-+[
-+    AC_MSG_ERROR([The important program $1 was not found!
-+Please check whether you installed aRts correctly or use
-+--without-arts to compile without aRts support (this will remove functionality).
-+])
-+])
-+
-+AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
-+[
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-+    if test -n "$KDEDIRS"; then
-+       kde_save_IFS=$IFS
-+       IFS=:
-+       for dir in $KDEDIRS; do
-+            kde_default_bindirs="$dir/bin $kde_default_bindirs "
-+       done
-+       IFS=$kde_save_IFS
-+    fi
-+])
-+
-+AC_DEFUN([KDE_SUBST_PROGRAMS],
-+[
-+    AC_ARG_WITH(arts,
-+        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
-+        [build_arts=$withval],
-+        [build_arts=yes]
-+    )
-+    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
-+    if test "$build_arts" = "no"; then
-+        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
-+    fi
-+
-+        KDE_SET_DEFAULT_BINDIRS
-+        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
-+        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-+        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-+        if test "$build_arts" '!=' "no"; then
-+          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-+          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
-+        fi
-+        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-+
-+        kde32ornewer=1
-+        kde33ornewer=1
-+        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-+            kde32ornewer=
-+            kde33ornewer=
-+        else
-+            if test "$kde_qtver" = "3"; then
-+              if test "$kde_qtsubver" -le 1; then
-+                kde32ornewer=
-+              fi
-+              if test "$kde_qtsubver" -le 2; then
-+                kde33ornewer=
-+              fi
-+              if test "$KDECONFIG" != "compiled"; then
-+                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-+                  kde33ornewer=
-+                fi
-+              fi
-+            fi
-+        fi
-+
-+        if test -n "$kde32ornewer"; then
-+            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
-+            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-+        fi
-+        if test -n "$kde33ornewer"; then
-+            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
-+            AC_SUBST(MAKEKDEWIDGETS)
-+        fi
-+        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-+
-+        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-+            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
-+	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-+		KDE_XSL_STYLESHEET=""
-+	    else
-+                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-+	    fi
-+        fi
-+
-+        DCOP_DEPENDENCIES='$(DCOPIDL)'
-+        if test -n "$kde32ornewer"; then
-+            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-+            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-+            AC_SUBST(KCONFIG_COMPILER)
-+            AC_SUBST(KCFG_DEPENDENCIES)
-+            AC_SUBST(DCOPIDLNG)
-+        fi
-+        AC_SUBST(DCOPIDL)
-+        AC_SUBST(DCOPIDL2CPP)
-+        AC_SUBST(DCOP_DEPENDENCIES)
-+        AC_SUBST(MCOPIDL)
-+        AC_SUBST(ARTSCCONFIG)
-+	AC_SUBST(MEINPROC)
-+ 	AC_SUBST(KDE_XSL_STYLESHEET)
-+	AC_SUBST(XMLLINT)
-+])dnl
-+
-+AC_DEFUN([AC_CREATE_KFSSTND],
-+[
-+AC_REQUIRE([AC_CHECK_RPATH])
-+
-+AC_MSG_CHECKING([for KDE paths])
-+kde_result=""
-+kde_cached_paths=yes
-+AC_CACHE_VAL(kde_cv_all_paths,
-+[
-+  KDE_SET_DEFAULT_PATHS($1)
-+  kde_cached_paths=no
-+])
-+eval "$kde_cv_all_paths"
-+KDE_CHECK_PATHS_FOR_COMPLETENESS
-+if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-+  # wrong values were cached, may be, we can set better ones
-+  kde_result=
-+  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-+  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-+  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-+  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-+  kde_have_all_paths=
-+  kde_styledir=
-+  kde_widgetdir=
-+  xdg_appsdir = xdg_menudir= xdg_directorydir= 
-+  KDE_SET_DEFAULT_PATHS($1)
-+  eval "$kde_cv_all_paths"
-+  KDE_CHECK_PATHS_FOR_COMPLETENESS
-+  kde_result="$kde_result (cache overridden)"
-+fi
-+if test "$kde_have_all_paths" = "no"; then
-+  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-+Since it had compiled and linked before, it must be a strange problem on your system.
-+Look at config.log for details. If you are not able to fix this, look at
-+http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-+(If you're using an egcs version on Linux, you may update binutils!)
-+])
-+else
-+  rm -f conftest*
-+  AC_MSG_RESULT($kde_result)
-+fi
-+
-+bindir=$kde_bindir
-+
-+KDE_SUBST_PROGRAMS
-+
-+])
-+
-+AC_DEFUN([AC_SUBST_KFSSTND],
-+[
-+AC_SUBST(kde_htmldir)
-+AC_SUBST(kde_appsdir)
-+AC_SUBST(kde_icondir)
-+AC_SUBST(kde_sounddir)
-+AC_SUBST(kde_datadir)
-+AC_SUBST(kde_locale)
-+AC_SUBST(kde_confdir)
-+AC_SUBST(kde_kcfgdir)
-+AC_SUBST(kde_mimedir)
-+AC_SUBST(kde_wallpaperdir)
-+AC_SUBST(kde_bindir)
-+dnl X Desktop Group standards
-+AC_SUBST(xdg_appsdir)
-+AC_SUBST(xdg_menudir)
-+AC_SUBST(xdg_directorydir)
-+dnl for KDE 2
-+AC_SUBST(kde_templatesdir)
-+AC_SUBST(kde_servicesdir)
-+AC_SUBST(kde_servicetypesdir)
-+AC_SUBST(kde_moduledir)
-+AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-+AC_SUBST(kde_styledir)
-+AC_SUBST(kde_widgetdir)
-+if test "$kde_qtver" = 1; then
-+  kde_minidir="$kde_icondir/mini"
-+else
-+# for KDE 1 - this breaks KDE2 apps using minidir, but
-+# that's the plan ;-/
-+  kde_minidir="/dev/null"
-+fi
-+dnl AC_SUBST(kde_minidir)
-+dnl AC_SUBST(kde_cgidir)
-+dnl AC_SUBST(kde_toolbardir)
-+])
-+
-+AC_DEFUN([KDE_MISC_TESTS],
-+[
-+   dnl Checks for libraries.
-+   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
-+   AC_SUBST(LIBUTIL)
-+   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
-+   AC_SUBST(LIBCOMPAT)
-+   kde_have_crypt=
-+   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-+      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-+        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-+You should install libcrypt from another source or configure with PAM
-+support])
-+	kde_have_crypt=no
-+      ]))
-+   AC_SUBST(LIBCRYPT)
-+   if test $kde_have_crypt = yes; then
-+      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-+   fi
-+   AC_CHECK_SOCKLEN_T
-+   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-+   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-+        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-+   fi
-+   AC_CHECK_FUNC(inet_ntoa)
-+   if test $ac_cv_func_inet_ntoa = no; then
-+     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-+   fi
-+   AC_CHECK_FUNC(connect)
-+   if test $ac_cv_func_connect = no; then
-+      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-+        $X_EXTRA_LIBS)
-+   fi
-+
-+   AC_CHECK_FUNC(remove)
-+   if test $ac_cv_func_remove = no; then
-+      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-+   fi
-+
-+   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+   AC_CHECK_FUNC(shmat, ,
-+     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-+   
-+   # more headers that need to be explicitly included on darwin
-+   AC_CHECK_HEADERS(sys/types.h stdint.h)
-+
-+   # sys/bitypes.h is needed for uint32_t and friends on Tru64
-+   AC_CHECK_HEADERS(sys/bitypes.h)
-+
-+   # darwin requires a poll emulation library
-+   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-+
-+   # for some image handling on Mac OS X
-+   AC_CHECK_HEADERS(Carbon/Carbon.h)
-+
-+   # CoreAudio framework
-+   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
-+     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-+     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
-+   ])
-+
-+   AC_CHECK_RES_INIT
-+   AC_SUBST(LIB_POLL)
-+   AC_SUBST(FRAMEWORK_COREAUDIO)
-+   LIBSOCKET="$X_EXTRA_LIBS"
-+   AC_SUBST(LIBSOCKET)
-+   AC_SUBST(X_EXTRA_LIBS)
-+   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-+   AC_SUBST(LIBUCB)
-+
-+   case $host in  dnl this *is* LynxOS specific
-+   *-*-lynxos* )
-+        AC_MSG_CHECKING([LynxOS header file wrappers])
-+        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-+        AC_MSG_RESULT(disabled)
-+        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-+         ;;
-+    esac
-+
-+   KDE_CHECK_TYPES
-+   KDE_CHECK_LIBDL
-+   KDE_CHECK_STRLCPY
-+   KDE_CHECK_PIE_SUPPORT
-+
-+# darwin needs this to initialize the environment
-+AC_CHECK_HEADERS(crt_externs.h)
-+AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
-+ 
-+AH_VERBATIM(_DARWIN_ENVIRON,
-+[
-+#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif
-+])
-+
-+AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-+[
-+/*
-+ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
-+ * that defines bzero.
-+ */
-+
-+#if defined(_AIX)
-+#include <strings.h>
-+#endif
-+])
-+
-+AC_CHECK_FUNCS([vsnprintf snprintf])
-+
-+AH_VERBATIM(_TRU64,[
-+/*
-+ * On HP-UX, the declaration of vsnprintf() is needed every time !
-+ */
-+
-+#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-+#if __STDC__
-+#include <stdarg.h>
-+#include <stdlib.h>
-+#else
-+#include <varargs.h>
-+#endif
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+int snprintf(char *str, size_t n, char const *fmt, ...);
-+#endif
-+])
-+
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Find the header files and libraries for X-Windows. Extended the
-+dnl macro AC_PATH_X
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([K_PATH_X],
-+[
-+AC_REQUIRE([KDE_MISC_TESTS])dnl
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_ARG_ENABLE(
-+  embedded,
-+  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
-+  kde_use_qt_emb=$enableval,
-+  kde_use_qt_emb=no
-+)
-+
-+AC_ARG_ENABLE(
-+  qtopia,
-+  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
-+  kde_use_qt_emb_palm=$enableval,
-+  kde_use_qt_emb_palm=no
-+)
-+
-+AC_ARG_ENABLE(
-+  mac,
-+  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
-+  kde_use_qt_mac=$enableval,
-+  kde_use_qt_mac=no
-+)
-+
-+# used to disable x11-specific stuff on special platforms
-+AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
-+
-+if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-+
-+AC_MSG_CHECKING(for X)
-+
-+AC_CACHE_VAL(kde_cv_have_x,
-+[# One or both of the vars are not set, and there is no cached value.
-+if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-+   kde_x_includes=NO
-+else
-+   kde_x_includes=$x_includes
-+fi
-+if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-+   kde_x_libraries=NO
-+else
-+   kde_x_libraries=$x_libraries
-+fi
-+
-+# below we use the standard autoconf calls
-+ac_x_libraries=$kde_x_libraries
-+ac_x_includes=$kde_x_includes
-+
-+KDE_PATH_X_DIRECT
-+dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-+dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-+dnl location. The correct location is /usr/lib32 or an undefined value
-+dnl (the linker is smart enough to pick the correct default library).
-+dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-+dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-+dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-+dnl x_includes should be left alone.
-+case "$host" in
-+mips-sgi-irix6*)
-+  ;;
-+*-*-solaris*)
-+  ;;
-+*)
-+  _AC_PATH_X_XMKMF
-+  if test -z "$ac_x_includes"; then
-+    ac_x_includes="."
-+  fi
-+  if test -z "$ac_x_libraries"; then
-+    ac_x_libraries="/usr/lib${kdelibsuff}"
-+  fi
-+esac
-+#from now on we use our own again
-+
-+# when the user already gave --x-includes, we ignore
-+# what the standard autoconf macros told us.
-+if test "$kde_x_includes" = NO; then
-+  kde_x_includes=$ac_x_includes
-+fi
-+
-+# for --x-libraries too
-+if test "$kde_x_libraries" = NO; then
-+  kde_x_libraries=$ac_x_libraries
-+fi
-+
-+if test "$kde_x_includes" = NO; then
-+  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-+fi
-+
-+if test "$kde_x_libraries" = NO; then
-+  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-+fi
-+
-+# Record where we found X for the cache.
-+kde_cv_have_x="have_x=yes \
-+         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-+])dnl
-+
-+eval "$kde_cv_have_x"
-+
-+if test "$have_x" != yes; then
-+  AC_MSG_RESULT($have_x)
-+  no_x=yes
-+else
-+  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-+fi
-+
-+if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-+  X_INCLUDES=""
-+  x_includes="."; dnl better than nothing :-
-+ else
-+  x_includes=$kde_x_includes
-+  X_INCLUDES="-I$x_includes"
-+fi
-+
-+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
-+  X_LDFLAGS=""
-+  x_libraries="/usr/lib"; dnl better than nothing :-
-+ else
-+  x_libraries=$kde_x_libraries
-+  X_LDFLAGS="-L$x_libraries"
-+fi
-+all_includes="$X_INCLUDES"
-+all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
-+
-+# Check for libraries that X11R6 Xt/Xaw programs need.
-+ac_save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+# check for ICE first), but we must link in the order -lSM -lICE or
-+# we get undefined symbols.  So assume we have SM if we have ICE.
-+# These have to be linked with before -lX11, unlike the other
-+# libraries we check for below, so use a different variable.
-+#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-+AC_CHECK_LIB(ICE, IceConnectionNumber,
-+  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-+LDFLAGS="$ac_save_LDFLAGS"
-+
-+LIB_X11='-lX11 $(LIBSOCKET)'
-+
-+AC_MSG_CHECKING(for libXext)
-+AC_CACHE_VAL(kde_cv_have_libXext,
-+[
-+kde_ldflags_safe="$LDFLAGS"
-+kde_libs_safe="$LIBS"
-+
-+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-+LIBS="-lXext -lX11 $LIBSOCKET"
-+
-+AC_TRY_LINK([
-+#include <stdio.h>
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+],
-+[
-+printf("hello Xext\n");
-+],
-+kde_cv_have_libXext=yes,
-+kde_cv_have_libXext=no
-+)
-+
-+LDFLAGS=$kde_ldflags_safe
-+LIBS=$kde_libs_safe
-+])
-+
-+AC_MSG_RESULT($kde_cv_have_libXext)
-+
-+if test "$kde_cv_have_libXext" = "no"; then
-+  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-+can't find it itself, we stop here assuming that make wouldn't find
-+them either.])
-+fi
-+
-+LIB_XEXT="-lXext"
-+QTE_NORTTI=""
-+
-+elif test "$kde_use_qt_emb" = "yes"; then
-+  dnl We're using QT Embedded
-+  CPPFLAGS=-DQWS
-+  CXXFLAGS="$CXXFLAGS -fno-rtti"
-+  QTE_NORTTI="-fno-rtti -DQWS"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+elif test "$kde_use_qt_mac" = "yes"; then
-+  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
-+  dnl be included to get the information) --Sam
-+  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-+  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-+  X_PRE_LIBS=""
-+  LIB_X11=""
-+  LIB_XEXT=""
-+  LIB_XRENDER=""
-+  LIBSM=""
-+  X_INCLUDES=""
-+  X_LDFLAGS=""
-+  x_includes=""
-+  x_libraries=""
-+fi
-+AC_SUBST(X_PRE_LIBS)
-+AC_SUBST(LIB_X11)
-+AC_SUBST(LIB_XRENDER)
-+AC_SUBST(LIBSM)
-+AC_SUBST(X_INCLUDES)
-+AC_SUBST(X_LDFLAGS)
-+AC_SUBST(x_includes)
-+AC_SUBST(x_libraries)
-+AC_SUBST(QTE_NORTTI)
-+AC_SUBST(LIB_XEXT)
-+
-+])
-+
-+AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-+[
-+AC_REQUIRE([KDE_USE_QT])
-+cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qglobal.h>
-+#include <qapplication.h>
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qevent.h>
-+#include <qstring.h>
-+#include <qstyle.h>
-+EOF
-+
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+#if QT_VERSION < 210
-+#error 1
-+#endif
-+EOF
-+fi
-+fi
-+
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+#include <qcursor.h>
-+#include <qstylefactory.h>
-+#include <private/qucomextra_p.h>
-+EOF
-+fi
-+
-+echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-+cat >> conftest.$ac_ext <<EOF
-+#error 1
-+#endif
-+
-+int main() {
-+EOF
-+if test "$kde_qtver" = "2"; then
-+cat >> conftest.$ac_ext <<EOF
-+    QStringList *t = new QStringList();
-+    Q_UNUSED(t);
-+EOF
-+if test $kde_qtsubver -gt 0; then
-+cat >> conftest.$ac_ext <<EOF
-+    QString s;
-+    s.setLatin1("Elvis is alive", 14);
-+EOF
-+fi
-+fi
-+if test "$kde_qtver" = "3"; then
-+cat >> conftest.$ac_ext <<EOF
-+    (void)QStyleFactory::create(QString::null);
-+    QCursor c(Qt::WhatsThisCursor);
-+EOF
-+fi
-+cat >> conftest.$ac_ext <<EOF
-+    return 0;
-+}
-+EOF
-+])
-+
-+AC_DEFUN([KDE_USE_QT],
-+[
-+if test -z "$1"; then
-+  # Current default Qt version: 3.3
-+  kde_qtver=3
-+  kde_qtsubver=3
-+else
-+  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-+  # following is the check if subversion isnt found in passed argument
-+  if test "$kde_qtsubver" = "$1"; then
-+    kde_qtsubver=1
-+  fi
-+  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-+  if test "$kde_qtver" = "1"; then
-+    kde_qtsubver=42
-+  fi
-+fi
-+
-+if test -z "$2"; then
-+  if test "$kde_qtver" = "2"; then
-+    if test $kde_qtsubver -gt 0; then
-+      kde_qt_minversion=">= Qt 2.2.2"
-+    else
-+      kde_qt_minversion=">= Qt 2.0.2"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "3"; then
-+    if test $kde_qtsubver -gt 0; then
-+	 if test $kde_qtsubver -gt 1; then
-+	    if test $kde_qtsubver -gt 2; then
-+		kde_qt_minversion=">= Qt 3.3 and < 4.0"
-+	    else
-+	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
-+	    fi
-+	 else
-+            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
-+         fi
-+    else
-+      kde_qt_minversion=">= Qt 3.0 and < 4.0"
-+    fi
-+  fi
-+  if test "$kde_qtver" = "1"; then
-+    kde_qt_minversion=">= 1.42 and < 2.0"
-+  fi
-+else
-+   kde_qt_minversion="$2"
-+fi
-+
-+if test -z "$3"; then
-+   if test $kde_qtver = 3; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
-+       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-+       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
-+     else
-+       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
-+     fi
-+   fi
-+   if test $kde_qtver = 2; then
-+     if test $kde_qtsubver -gt 0; then
-+       kde_qt_verstring="QT_VERSION >= 222"
-+     else
-+       kde_qt_verstring="QT_VERSION >= 200"
-+     fi
-+   fi
-+   if test $kde_qtver = 1; then
-+    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-+   fi
-+else
-+   kde_qt_verstring="$3"
-+fi
-+
-+if test $kde_qtver = 4; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-+fi
-+if test $kde_qtver = 3; then
-+  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
-+  if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+  if test "$PKG_CONFIG" != "no" ; then
-+    if $PKG_CONFIG --exists qt-mt ; then
-+       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
-+    fi
-+  fi
-+fi
-+if test $kde_qtver = 2; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-+fi
-+if test $kde_qtver = 1; then
-+   kde_qt_dirs="$QTDIR /usr/lib/qt"
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_QT_DIRECT],
-+[
-+AC_REQUIRE([KDE_USE_QT])
-+AC_MSG_CHECKING([if Qt compiles without flags])
-+AC_CACHE_VAL(kde_cv_qt_direct,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-+ac_LIBRARY_PATH="$LIBRARY_PATH"
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_includes"
-+LDFLAGS="$LDFLAGS $X_LDFLAGS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBQT $LIBSOCKET"
-+fi
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH=
-+export LIBRARY_PATH
-+
-+KDE_PRINT_QT_PROGRAM
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  kde_cv_qt_direct="yes"
-+else
-+  kde_cv_qt_direct="no"
-+  echo "configure: failed program was:" >&AC_FD_CC
-+  cat conftest.$ac_ext >&AC_FD_CC
-+fi
-+
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-+export LD_LIBRARY_PATH
-+LIBRARY_PATH="$ac_LIBRARY_PATH"
-+export LIBRARY_PATH
-+AC_LANG_RESTORE
-+])
-+
-+if test "$kde_cv_qt_direct" = "yes"; then
-+  AC_MSG_RESULT(yes)
-+  $1
-+else
-+  AC_MSG_RESULT(no)
-+  $2
-+fi
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Try to find the Qt headers and libraries.
-+dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-+dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_PATH_QT_1_3],
-+[
-+AC_REQUIRE([K_PATH_X])
-+AC_REQUIRE([KDE_USE_QT])
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Add configure flag to enable linking to MT version of Qt library.
-+dnl ------------------------------------------------------------------------
-+
-+AC_ARG_ENABLE(
-+  mt,
-+  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
-+  kde_use_qt_mt=$enableval,
-+  [
-+    if test $kde_qtver = 3; then
-+      kde_use_qt_mt=yes
-+    else
-+      kde_use_qt_mt=no
-+    fi
-+  ]
-+)
-+
-+USING_QT_MT=""
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we not get --disable-qt-mt then adjust some vars for the host.
-+dnl ------------------------------------------------------------------------
-+
-+KDE_MT_LDFLAGS=
-+KDE_MT_LIBS=
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+  KDE_CHECK_THREADING
-+  if test "x$kde_use_threading" = "xyes"; then
-+    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-+    KDE_MT_LDFLAGS="$USE_THREADS"
-+    KDE_MT_LIBS="$LIBPTHREAD"
-+  else
-+    kde_use_qt_mt=no
-+  fi
-+fi
-+AC_SUBST(KDE_MT_LDFLAGS)
-+AC_SUBST(KDE_MT_LIBS)
-+
-+kde_qt_was_given=yes
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-+dnl ------------------------------------------------------------------------
-+if test -z "$LIBQT_GLOB"; then
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    LIBQT_GLOB="libqte.*"
-+  else
-+    LIBQT_GLOB="libqt.*"
-+  fi
-+fi
-+
-+dnl ------------------------------------------------------------
-+dnl If we got --enable-embedded then adjust the Qt library name.
-+dnl ------------------------------------------------------------
-+if test "x$kde_use_qt_emb" = "xyes"; then
-+  qtlib="qte"
-+else
-+  qtlib="qt"
-+fi
-+
-+kde_int_qt="-l$qtlib"
-+
-+if test -z "$LIBQPE"; then
-+dnl ------------------------------------------------------------
-+dnl If we got --enable-palmtop then add -lqpe to the link line
-+dnl ------------------------------------------------------------
-+  if test "x$kde_use_qt_emb" = "xyes"; then
-+    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-+      LIB_QPE="-lqpe"
-+    else
-+      LIB_QPE=""
-+    fi
-+  else
-+    LIB_QPE=""
-+  fi
-+fi
-+
-+dnl ------------------------------------------------------------------------
-+dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-+dnl ------------------------------------------------------------------------
-+
-+if test "x$kde_use_qt_mt" = "xyes"; then
-+  LIBQT="-l$qtlib-mt"
-+  kde_int_qt="-l$qtlib-mt"
-+  LIBQT_GLOB="lib$qtlib-mt.*"
-+  USING_QT_MT="using -mt"
-+else
-+  LIBQT="-l$qtlib"
-+fi
-+
-+if test $kde_qtver != 1; then
-+
-+  AC_REQUIRE([AC_FIND_PNG])
-+  AC_REQUIRE([AC_FIND_JPEG])
-+  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-+fi
-+
-+if test $kde_qtver = 3; then
-+  AC_REQUIRE([KDE_CHECK_LIBDL])
-+  LIBQT="$LIBQT $LIBDL"
-+fi
-+
-+AC_MSG_CHECKING([for Qt])
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-+fi
-+ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-+qt_libraries=""
-+qt_includes=""
-+AC_ARG_WITH(qt-dir,
-+    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-+    [  ac_qt_includes="$withval"/include
-+       ac_qt_libraries="$withval"/lib${kdelibsuff}
-+       ac_qt_bindir="$withval"/bin
-+    ])
-+
-+AC_ARG_WITH(qt-includes,
-+    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-+    [
-+       ac_qt_includes="$withval"
-+    ])
-+
-+kde_qt_libs_given=no
-+
-+AC_ARG_WITH(qt-libraries,
-+    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-+    [  ac_qt_libraries="$withval"
-+       kde_qt_libs_given=yes
-+    ])
-+
-+AC_CACHE_VAL(ac_cv_have_qt,
-+[#try to guess Qt locations
-+
-+qt_incdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_incdirs="$qt_incdirs $dir/include $dir"
-+done
-+if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+fi
-+if test "$PKG_CONFIG" != "no" ; then
-+  if $PKG_CONFIG --exists qt-mt ; then
-+      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
-+  fi
-+fi
-+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-+if test ! "$ac_qt_includes" = "NO"; then
-+   qt_incdirs="$ac_qt_includes $qt_incdirs"
-+fi
-+
-+if test "$kde_qtver" != "1"; then
-+  kde_qt_header=qstyle.h
-+else
-+  kde_qt_header=qglobal.h
-+fi
-+
-+AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-+ac_qt_includes="$qt_incdir"
-+
-+qt_libdirs=""
-+for dir in $kde_qt_dirs; do
-+   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
-+done
-+if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+fi
-+if test "$PKG_CONFIG" != "no" ; then
-+  if $PKG_CONFIG --exists qt-mt ; then
-+      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
-+  fi
-+fi
-+qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-+if test ! "$ac_qt_libraries" = "NO"; then
-+  qt_libdir=$ac_qt_libraries
-+else
-+  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-+  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-+  qt_libdir=NONE
-+  for dir in $qt_libdirs; do
-+    try="ls -1 $dir/${LIBQT_GLOB}"
-+    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-+  done
-+fi
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-+    break
-+  fi
-+done
-+
-+ac_qt_libraries="$qt_libdir"
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+
-+ac_cxxflags_safe="$CXXFLAGS"
-+ac_ldflags_safe="$LDFLAGS"
-+ac_libs_safe="$LIBS"
-+
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-+
-+KDE_PRINT_QT_PROGRAM
-+
-+if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+  rm -f conftest*
-+else
-+  echo "configure: failed program was:" >&AC_FD_CC
-+  cat conftest.$ac_ext >&AC_FD_CC
-+  ac_qt_libraries="NO"
-+fi
-+rm -f conftest*
-+CXXFLAGS="$ac_cxxflags_safe"
-+LDFLAGS="$ac_ldflags_safe"
-+LIBS="$ac_libs_safe"
-+
-+AC_LANG_RESTORE
-+if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-+  ac_cv_have_qt="have_qt=no"
-+  ac_qt_notfound=""
-+  missing_qt_mt=""
-+  if test "$ac_qt_includes" = NO; then
-+    if test "$ac_qt_libraries" = NO; then
-+      ac_qt_notfound="(headers and libraries)";
-+    else
-+      ac_qt_notfound="(headers)";
-+    fi
-+  else
-+    if test "x$kde_use_qt_mt" = "xyes"; then
-+       missing_qt_mt="
-+Make sure that you have compiled Qt with thread support!"
-+       ac_qt_notfound="(library $qtlib-mt)";
-+    else
-+       ac_qt_notfound="(library $qtlib)";
-+    fi
-+  fi
-+
-+  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-+For more details about this problem, look at the end of config.log.$missing_qt_mt])
-+else
-+  have_qt="yes"
-+fi
-+])
-+
-+eval "$ac_cv_have_qt"
-+
-+if test "$have_qt" != yes; then
-+  AC_MSG_RESULT([$have_qt]);
-+else
-+  ac_cv_have_qt="have_qt=yes \
-+    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-+  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-+
-+  qt_libraries="$ac_qt_libraries"
-+  qt_includes="$ac_qt_includes"
-+fi
-+
-+if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-+     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-+fi
-+
-+AC_SUBST(qt_libraries)
-+AC_SUBST(qt_includes)
-+
-+if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-+ QT_INCLUDES=""
-+else
-+ QT_INCLUDES="-I$qt_includes"
-+ all_includes="$QT_INCLUDES $all_includes"
-+fi
-+
-+if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-+ QT_LDFLAGS=""
-+else
-+ QT_LDFLAGS="-L$qt_libraries"
-+ all_libraries="$QT_LDFLAGS $all_libraries"
-+fi
-+test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-+
-+AC_SUBST(QT_INCLUDES)
-+AC_SUBST(QT_LDFLAGS)
-+AC_PATH_QT_MOC_UIC
-+
-+KDE_CHECK_QT_JPEG
-+
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-+else
-+LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-+fi
-+test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-+for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-+  if test -e "$a"; then
-+     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-+     break
-+  fi
-+done
-+
-+AC_SUBST(LIB_QT)
-+AC_SUBST(LIB_QPE)
-+
-+AC_SUBST(kde_qtver)
-+])
-+
-+AC_DEFUN([AC_PATH_QT],
-+[
-+AC_PATH_QT_1_3
-+])
-+
-+AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-+[
-+AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-+
-+if test x$ac_uic_supports_libpath = xyes; then
-+
-+AC_MSG_CHECKING([if UIC has KDE plugins available])
-+AC_CACHE_VAL(kde_cv_uic_plugins,
-+[
-+cat > actest.ui << EOF
-+<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-+<class>NewConnectionDialog</class>
-+<widget class="QDialog">
-+   <widget class="KLineEdit">
-+        <property name="name">
-+           <cstring>testInput</cstring>
-+        </property>
-+   </widget>
-+</widget>
-+</UI>
-+EOF
-+       
-+
-+
-+kde_cv_uic_plugins=no
-+kde_line="$UIC_PATH -L $kde_widgetdir"
-+if test x$ac_uic_supports_nounload = xyes; then
-+   kde_line="$kde_line -nounload"
-+fi
-+kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-+if AC_TRY_EVAL(kde_line); then
-+	# if you're trying to debug this check and think it's incorrect,
-+	# better check your installation. The check _is_ correct - your
-+	# installation is not.
-+	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-+		kde_cv_uic_plugins=yes
-+	fi
-+fi
-+rm -f actest.ui actest.cpp
-+])
-+
-+AC_MSG_RESULT([$kde_cv_uic_plugins])
-+if test "$kde_cv_uic_plugins" != yes; then
-+	AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
-+_same Qt version_, compiled with the _same compiler_ and the same Qt
-+configuration settings.
-+])
-+fi
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_FINAL],
-+[
-+  AC_ARG_ENABLE(final,
-+	AC_HELP_STRING([--enable-final],
-+		       [build size optimized apps (experimental - needs lots of memory)]),
-+	kde_use_final=$enableval, kde_use_final=no)
-+
-+  if test "x$kde_use_final" = "xyes"; then
-+      KDE_USE_FINAL_TRUE=""
-+      KDE_USE_FINAL_FALSE="#"
-+   else
-+      KDE_USE_FINAL_TRUE="#"
-+      KDE_USE_FINAL_FALSE=""
-+  fi
-+  AC_SUBST(KDE_USE_FINAL_TRUE)
-+  AC_SUBST(KDE_USE_FINAL_FALSE)
-+])
-+
-+AC_DEFUN([KDE_CHECK_CLOSURE],
-+[
-+  AC_ARG_ENABLE(closure,
-+		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
-+  	kde_use_closure=$enableval, kde_use_closure=no)
-+
-+  KDE_NO_UNDEFINED=""
-+  if test "x$kde_use_closure" = "xyes"; then
-+       KDE_USE_CLOSURE_TRUE=""
-+       KDE_USE_CLOSURE_FALSE="#"
-+#       CXXFLAGS="$CXXFLAGS $REPO"
-+  else
-+       KDE_USE_CLOSURE_TRUE="#"
-+       KDE_USE_CLOSURE_FALSE=""
-+       KDE_NO_UNDEFINED=""
-+       case $host in 
-+         *-*-linux-gnu)
-+           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-+                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-+		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-+		[KDE_NO_UNDEFINED=""])],
-+	    [KDE_NO_UNDEFINED=""])
-+           ;;
-+       esac
-+  fi
-+  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-+  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-+  AC_SUBST(KDE_NO_UNDEFINED)
-+])
-+
-+dnl Check if the linker supports --enable-new-dtags and --as-needed
-+AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
-+[
-+  AC_ARG_ENABLE(new_ldflags,
-+		AC_HELP_STRING([--enable-new-ldflags],
-+		[enable the new linker flags]),
-+	kde_use_new_ldflags=$enableval, 
-+	kde_use_new_ldflags=no)
-+
-+  LDFLAGS_AS_NEEDED=""
-+  LDFLAGS_NEW_DTAGS=""
-+  if test "x$kde_use_new_ldflags" = "xyes"; then
-+       LDFLAGS_NEW_DTAGS=""
-+       KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
-+		[LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
-+
-+       KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
-+		[LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
-+  fi
-+  AC_SUBST(LDFLAGS_AS_NEEDED)
-+  AC_SUBST(LDFLAGS_NEW_DTAGS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_NMCHECK],
-+[
-+  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
-+	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-+
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
-+  AC_SUBST(KDE_USE_NMCHECK_TRUE)
-+  AC_SUBST(KDE_USE_NMCHECK_FALSE)
-+])
-+
-+AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-+savex=$exec_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+tmp=$$2
-+while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-+exec_prefix=$savex
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Now, the same with KDE
-+dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-+dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_BASE_PATH_KDE],
-+[
-+AC_REQUIRE([KDE_CHECK_STL])
-+AC_REQUIRE([AC_PATH_QT])dnl
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_CHECK_RPATH
-+AC_MSG_CHECKING([for KDE])
-+
-+if test "${prefix}" != NONE; then
-+  kde_includes=${includedir}
-+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-+
-+  kde_libraries=${libdir}
-+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-+
-+else
-+  ac_kde_includes=
-+  ac_kde_libraries=
-+  kde_libraries=""
-+  kde_includes=""
-+fi
-+
-+AC_CACHE_VAL(ac_cv_have_kde,
-+[#try to guess kde locations
-+
-+if test "$kde_qtver" = 1; then
-+  kde_check_header="ksock.h"
-+  kde_check_lib="libkdecore.la"
-+else
-+  kde_check_header="ksharedptr.h"
-+  kde_check_lib="libkio.la"
-+fi
-+
-+if test -z "$1"; then
-+
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-+kde_incdirs="$ac_kde_includes $kde_incdirs"
-+AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-+ac_kde_includes="$kde_incdir"
-+
-+if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-+  AC_MSG_ERROR([
-+in the prefix, you've chosen, are no KDE headers installed. This will fail.
-+So, check this please and use another prefix!])
-+fi
-+
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-+kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-+AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-+ac_kde_libraries="$kde_libdir"
-+
-+kde_widgetdir=NO
-+dnl this might be somewhere else
-+AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-+
-+if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-+AC_MSG_ERROR([
-+in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-+So, check this please and use another prefix!])
-+fi
-+
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+AC_MSG_ERROR([
-+I can't find the designer plugins. These are required and should have been installed
-+by kdelibs])
-+fi
-+
-+if test -n "$kde_widgetdir"; then
-+    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+fi
-+
-+
-+if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-+  ac_cv_have_kde="have_kde=no"
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+fi
-+
-+else dnl test -z $1, e.g. from kdelibs
-+
-+  ac_cv_have_kde="have_kde=no"
-+
-+fi
-+])dnl
-+
-+eval "$ac_cv_have_kde"
-+
-+if test "$have_kde" != "yes"; then
-+ if test "${prefix}" = NONE; then
-+  ac_kde_prefix="$ac_default_prefix"
-+ else
-+  ac_kde_prefix="$prefix"
-+ fi
-+ if test "$exec_prefix" = NONE; then
-+  ac_kde_exec_prefix="$ac_kde_prefix"
-+  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
-+ else
-+  ac_kde_exec_prefix="$exec_prefix"
-+  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
-+ fi
-+
-+ kde_libraries="${libdir}"
-+ kde_includes="${includedir}"
-+
-+else
-+  ac_cv_have_kde="have_kde=yes \
-+    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-+  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-+
-+  kde_libraries="$ac_kde_libraries"
-+  kde_includes="$ac_kde_includes"
-+fi
-+AC_SUBST(kde_libraries)
-+AC_SUBST(kde_includes)
-+
-+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
-+ KDE_INCLUDES=""
-+else
-+ KDE_INCLUDES="-I$kde_includes"
-+ all_includes="$KDE_INCLUDES $all_includes"
-+fi
-+
-+KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-+ 
-+KDE_LDFLAGS="-L$kde_libraries"
-+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
-+ all_libraries="$KDE_LDFLAGS $all_libraries"
-+fi
-+
-+AC_SUBST(KDE_LDFLAGS)
-+AC_SUBST(KDE_INCLUDES)
-+
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+all_libraries="$all_libraries $USER_LDFLAGS"
-+all_includes="$all_includes $USER_INCLUDES"
-+AC_SUBST(all_includes)
-+AC_SUBST(all_libraries)
-+
-+if test -z "$1"; then
-+KDE_CHECK_UIC_PLUGINS
-+fi
-+
-+ac_kde_libraries="$kde_libdir"
-+
-+AC_SUBST(AUTODIRS)
-+
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-+[
-+AC_MSG_CHECKING(for extra includes)
-+AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
-+  kde_use_extra_includes="$withval",
-+  kde_use_extra_includes=NONE
-+)
-+kde_extra_includes=
-+if test -n "$kde_use_extra_includes" && \
-+   test "$kde_use_extra_includes" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_includes; do
-+     kde_extra_includes="$kde_extra_includes $dir"
-+     USER_INCLUDES="$USER_INCLUDES -I$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_includes="added"
-+else
-+   kde_use_extra_includes="no"
-+fi
-+AC_SUBST(USER_INCLUDES)
-+
-+AC_MSG_RESULT($kde_use_extra_includes)
-+
-+kde_extra_libs=
-+AC_MSG_CHECKING(for extra libs)
-+AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
-+  kde_use_extra_libs=$withval,
-+  kde_use_extra_libs=NONE
-+)
-+if test -n "$kde_use_extra_libs" && \
-+   test "$kde_use_extra_libs" != "NONE"; then
-+
-+   ac_save_ifs=$IFS
-+   IFS=':'
-+   for dir in $kde_use_extra_libs; do
-+     kde_extra_libs="$kde_extra_libs $dir"
-+     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-+     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+   done
-+   IFS=$ac_save_ifs
-+   kde_use_extra_libs="added"
-+else
-+   kde_use_extra_libs="no"
-+fi
-+
-+AC_SUBST(USER_LDFLAGS)
-+
-+AC_MSG_RESULT($kde_use_extra_libs)
-+
-+])
-+
-+AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-+[
-+    AC_MSG_CHECKING([for KDE headers installed])
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include "confdefs.h"
-+#include <kapp.h>
-+
-+int main() {
-+    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-+    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-+    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-+    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-+    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-+    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-+    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-+    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-+    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-+    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-+    printf("kde_wallpaperdir=\\"%s\\"\n",
-+	KApplication::kde_wallpaperdir().data());
-+    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-+    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-+    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-+    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-+    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-+    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-+    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-+    return 0;
-+    }
-+EOF
-+
-+ ac_save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS="$all_includes $CPPFLAGS"
-+ if AC_TRY_EVAL(ac_compile); then
-+   AC_MSG_RESULT(yes)
-+ else
-+   AC_MSG_ERROR([your system is not able to compile a small KDE application!
-+Check, if you installed the KDE header files correctly.
-+For more details about this problem, look at the end of config.log.])
-+  fi
-+  CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([KDE_CHECK_KDEQTADDON],
-+[
-+AC_MSG_CHECKING(for kde-qt-addon)
-+AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-+[
-+ kde_ldflags_safe="$LDFLAGS"
-+ kde_libs_safe="$LIBS"
-+ kde_cxxflags_safe="$CXXFLAGS"
-+
-+ LIBS="-lkde-qt-addon $LIBQT $LIBS"
-+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
-+ LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-+
-+ AC_TRY_LINK([
-+   #include <qdom.h>
-+ ],
-+ [
-+   QDomDocument doc;
-+ ],
-+  kde_cv_have_kdeqtaddon=yes,
-+  kde_cv_have_kdeqtaddon=no
-+ )
-+
-+ LDFLAGS=$kde_ldflags_safe
-+ LIBS=$kde_libs_safe
-+ CXXFLAGS=$kde_cxxflags_safe
-+])
-+
-+AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-+
-+if test "$kde_cv_have_kdeqtaddon" = "no"; then
-+  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-+It is a separate package (and CVS module) named kde-qt-addon.])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-+[
-+   AC_REQUIRE([KDE_MISC_TESTS])
-+   AC_REQUIRE([KDE_CHECK_LIBDL])
-+   AC_REQUIRE([K_PATH_X])
-+
-+if test $kde_qtver = 3; then
-+   case $host in 
-+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
-+               *) lib_kded="" ;;
-+       esac
-+   AC_SUBST(LIB_KDED, $lib_kded)
-+   AC_SUBST(LIB_KDECORE, "-lkdecore")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui")
-+   AC_SUBST(LIB_KIO, "-lkio")
-+   AC_SUBST(LIB_KJS, "-lkjs")
-+   AC_SUBST(LIB_SMB, "-lsmb")
-+   AC_SUBST(LIB_KAB, "-lkab")
-+   AC_SUBST(LIB_KABC, "-lkabc")
-+   AC_SUBST(LIB_KHTML, "-lkhtml")
-+   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KPARTS, "-lkparts")
-+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+   AC_SUBST(LIB_KUTILS, "-lkutils")
-+   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-+   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
-+   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-+   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-+   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
-+# these are for backward compatibility
-+   AC_SUBST(LIB_KSYCOCA, "-lkio")
-+   AC_SUBST(LIB_KFILE, "-lkio")
-+elif test $kde_qtver = 2; then
-+   AC_SUBST(LIB_KDECORE, "-lkdecore")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui")
-+   AC_SUBST(LIB_KIO, "-lkio")
-+   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
-+   AC_SUBST(LIB_SMB, "-lsmb")
-+   AC_SUBST(LIB_KFILE, "-lkfile")
-+   AC_SUBST(LIB_KAB, "-lkab")
-+   AC_SUBST(LIB_KHTML, "-lkhtml")
-+   AC_SUBST(LIB_KSPELL, "-lkspell")
-+   AC_SUBST(LIB_KPARTS, "-lkparts")
-+   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-+else
-+   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-+   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
-+fi
-+])
-+
-+AC_DEFUN([AC_PATH_KDE],
-+[
-+  AC_BASE_PATH_KDE
-+  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
-+  [
-+  if test "$enableval" = "no";
-+    then ac_use_path_checking="default"
-+    else ac_use_path_checking=""
-+  fi
-+  ],
-+  [
-+  if test "$kde_qtver" = 1;
-+    then ac_use_path_checking=""
-+    else ac_use_path_checking="default"
-+  fi
-+  ]
-+  )
-+
-+  AC_CREATE_KFSSTND($ac_use_path_checking)
-+
-+  AC_SUBST_KFSSTND
-+  KDE_CREATE_LIBS_ALIASES
-+])
-+
-+dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-+AC_DEFUN([KDE_CHECK_FUNC_EXT],
-+[
-+AC_MSG_CHECKING(for $1)
-+AC_CACHE_VAL(kde_cv_func_$1,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+save_CXXFLAGS="$CXXFLAGS"
-+kde_safe_LIBS="$LIBS"
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+if test "$GXX" = "yes"; then
-+CXXFLAGS="$CXXFLAGS -pedantic-errors"
-+fi
-+AC_TRY_COMPILE([
-+$2
-+],
-+[
-+$3
-+],
-+kde_cv_func_$1=yes,
-+kde_cv_func_$1=no)
-+CXXFLAGS="$save_CXXFLAGS"
-+LIBS="$kde_safe_LIBS"
-+AC_LANG_RESTORE
-+])
-+
-+AC_MSG_RESULT($kde_cv_func_$1)
-+
-+AC_MSG_CHECKING([if $1 needs custom prototype])
-+AC_CACHE_VAL(kde_cv_proto_$1,
-+[
-+if test "x$kde_cv_func_$1" = xyes; then
-+  kde_cv_proto_$1=no
-+else
-+  case "$1" in
-+	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-+		kde_cv_proto_$1="yes - in libkdefakes"
-+		;;
-+	*)
-+		kde_cv_proto_$1=unknown
-+		;;
-+  esac
-+fi
-+
-+if test "x$kde_cv_proto_$1" = xunknown; then
-+
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+  kde_safe_libs=$LIBS
-+  LIBS="$LIBS $X_EXTRA_LIBS"
-+  AC_TRY_LINK([
-+$2
-+
-+extern "C" $4;
-+],
-+[
-+$3
-+],
-+[ kde_cv_func_$1=yes
-+  kde_cv_proto_$1=yes ],
-+  [kde_cv_proto_$1="$1 unavailable"]
-+)
-+LIBS=$kde_safe_libs
-+AC_LANG_RESTORE
-+fi
-+])
-+AC_MSG_RESULT($kde_cv_proto_$1)
-+
-+if test "x$kde_cv_func_$1" = xyes; then
-+  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
-+  $6
-+fi
-+if test "x$kde_cv_proto_$1" = xno; then
-+  AC_DEFINE(HAVE_$5_PROTO, 1,
-+  [Define if you have the $1 prototype])
-+fi
-+
-+AH_VERBATIM([_HAVE_$5_PROTO],
-+[
-+#if !defined(HAVE_$5_PROTO)
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+$4;
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+])
-+])
-+
-+AC_DEFUN([AC_CHECK_SETENV],
-+[
-+	KDE_CHECK_FUNC_EXT(setenv, [
-+#include <stdlib.h>
-+], 
-+		[setenv("VAR", "VALUE", 1);],
-+	        [int setenv (const char *, const char *, int)],
-+		[SETENV])
-+])
-+
-+AC_DEFUN([AC_CHECK_UNSETENV],
-+[
-+	KDE_CHECK_FUNC_EXT(unsetenv, [
-+#include <stdlib.h>
-+], 
-+		[unsetenv("VAR");],
-+	        [void unsetenv (const char *)],
-+		[UNSETENV])
-+])
-+
-+AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(getdomainname, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <netdb.h>
-+], 
-+		[
-+char buffer[200];
-+getdomainname(buffer, 200);
-+], 	
-+	        [#include <sys/types.h>
-+		int getdomainname (char *, size_t)],
-+		[GETDOMAINNAME])
-+])
-+
-+AC_DEFUN([AC_CHECK_GETHOSTNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(gethostname, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+], 
-+		[
-+char buffer[200];
-+gethostname(buffer, 200);
-+], 	
-+	        [int gethostname (char *, unsigned int)],
-+		[GETHOSTNAME])
-+])
-+
-+AC_DEFUN([AC_CHECK_USLEEP],
-+[
-+	KDE_CHECK_FUNC_EXT(usleep, [
-+#include <unistd.h>
-+], 
-+		[
-+usleep(200);
-+], 	
-+	        [int usleep (unsigned int)],
-+		[USLEEP])
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_RANDOM],
-+[
-+	KDE_CHECK_FUNC_EXT(random, [
-+#include <stdlib.h>
-+], 
-+		[
-+random();
-+], 	
-+	        [long int random(void)],
-+		[RANDOM])
-+
-+	KDE_CHECK_FUNC_EXT(srandom, [
-+#include <stdlib.h>
-+], 
-+		[
-+srandom(27);
-+], 	
-+	        [void srandom(unsigned int)],
-+		[SRANDOM])
-+
-+])
-+
-+AC_DEFUN([AC_CHECK_INITGROUPS],
-+[
-+	KDE_CHECK_FUNC_EXT(initgroups, [
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <grp.h>
-+],
-+	[
-+char buffer[200];
-+initgroups(buffer, 27);
-+],
-+	[int initgroups(const char *, gid_t)],
-+	[INITGROUPS])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKSTEMPS],
-+[
-+	KDE_CHECK_FUNC_EXT(mkstemps, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkstemps("/tmp/aaaXXXXXX", 6);
-+],
-+	[int mkstemps(char *, int)],
-+	[MKSTEMPS])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKSTEMP],
-+[
-+	KDE_CHECK_FUNC_EXT(mkstemp, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkstemp("/tmp/aaaXXXXXX");
-+],
-+	[int mkstemp(char *)],
-+	[MKSTEMP])
-+])
-+
-+AC_DEFUN([AC_CHECK_MKDTEMP],
-+[
-+	KDE_CHECK_FUNC_EXT(mkdtemp, [
-+#include <stdlib.h>
-+#include <unistd.h>
-+],
-+	[
-+mkdtemp("/tmp/aaaXXXXXX");
-+],
-+	[char *mkdtemp(char *)],
-+	[MKDTEMP])
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_RES_INIT],
-+[
-+  AC_MSG_CHECKING([if res_init needs -lresolv])
-+  kde_libs_safe="$LIBS"
-+  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-+  AC_TRY_LINK(
-+    [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+    ],
-+    [
-+      res_init(); 
-+    ],
-+    [
-+      LIBRESOLV="-lresolv"
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-+    ],
-+    [ AC_MSG_RESULT(no) ]
-+  )
-+  LIBS=$kde_libs_safe
-+  AC_SUBST(LIBRESOLV)
-+
-+  KDE_CHECK_FUNC_EXT(res_init,
-+    [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+    ],
-+    [res_init()],
-+    [int res_init(void)],
-+    [RES_INIT])
-+])
-+
-+AC_DEFUN([AC_CHECK_STRLCPY],
-+[
-+	KDE_CHECK_FUNC_EXT(strlcpy, [
-+#include <string.h>
-+],
-+[ char buf[20];
-+  strlcpy(buf, "KDE function test", sizeof(buf));
-+],
-+ 	[unsigned long strlcpy(char*, const char*, unsigned long)],
-+	[STRLCPY])
-+])
-+
-+AC_DEFUN([AC_CHECK_STRLCAT],
-+[
-+	KDE_CHECK_FUNC_EXT(strlcat, [
-+#include <string.h>
-+],
-+[ char buf[20];
-+  buf[0]='\0';
-+  strlcat(buf, "KDE function test", sizeof(buf));
-+],
-+ 	[unsigned long strlcat(char*, const char*, unsigned long)],
-+	[STRLCAT])
-+])
-+
-+AC_DEFUN([AC_CHECK_RES_QUERY],
-+[
-+	KDE_CHECK_FUNC_EXT(res_query, [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+#include <netdb.h>
-+],
-+[
-+res_query(NULL, 0, 0, NULL, 0);
-+],
-+	[int res_query(const char *, int, int, unsigned char *, int)],
-+	[RES_QUERY])
-+])
-+
-+AC_DEFUN([AC_CHECK_DN_SKIPNAME],
-+[
-+	KDE_CHECK_FUNC_EXT(dn_skipname, [
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-+],
-+[
-+dn_skipname (NULL, NULL);
-+],
-+	[int dn_skipname (unsigned char *, unsigned char *)],
-+	[DN_SKIPNAME])
-+])
-+
-+
-+AC_DEFUN([AC_FIND_GIF],
-+   [AC_MSG_CHECKING([for giflib])
-+AC_CACHE_VAL(ac_cv_lib_gif,
-+[ac_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-+else
-+LIBS="$all_libraries -lgif"
-+fi
-+AC_TRY_LINK(dnl
-+[
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+int GifLastError(void);
-+#ifdef __cplusplus
-+}
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+],
-+            [return GifLastError();],
-+            eval "ac_cv_lib_gif=yes",
-+            eval "ac_cv_lib_gif=no")
-+LIBS="$ac_save_LIBS"
-+])dnl
-+if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-+else
-+  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
-+fi
-+])
-+
-+AC_DEFUN([KDE_FIND_JPEG_HELPER],
-+[
-+AC_MSG_CHECKING([for libjpeg$2])
-+AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-+[
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(
-+[
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+void jpeg_CreateDecompress();
-+#ifdef __cplusplus
-+}
-+#endif
-+],
-+[jpeg_CreateDecompress();],
-+            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
-+            eval "ac_cv_lib_jpeg_$1=no")
-+LIBS="$ac_save_LIBS"
-+CFLAGS="$ac_save_CFLAGS"
-+])
-+
-+if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
-+  LIBJPEG="$ac_cv_lib_jpeg_$1"
-+  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-+else
-+  AC_MSG_RESULT(no)
-+  $3
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_JPEG],
-+[
-+dnl first look for libraries
-+KDE_FIND_JPEG_HELPER(6b, 6b,
-+   KDE_FIND_JPEG_HELPER(normal, [],
-+    [
-+       LIBJPEG=
-+    ]
-+   )
-+)
-+
-+dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-+dnl requires system dependent includes loaded before it)
-+jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-+AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-+test "x$jpeg_incdir" = xNO && jpeg_incdir=
-+
-+dnl if headers _and_ libraries are missing, this is no error, and we
-+dnl continue with a warning (the user will get no jpeg support in khtml)
-+dnl if only one is missing, it means a configuration error, but we still
-+dnl only warn
-+if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-+else
-+  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-+    AC_MSG_WARN([
-+There is an installation error in jpeg support. You seem to have only one
-+of either the headers _or_ the libraries installed. You may need to either
-+provide correct --with-extra-... options, or the development package of
-+libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-+Disabling JPEG support.
-+])
-+  else
-+    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
-+  fi
-+  jpeg_incdir=
-+  LIBJPEG=
-+fi
-+
-+AC_SUBST(LIBJPEG)
-+AH_VERBATIM(_AC_CHECK_JPEG,
-+[/*
-+ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
-+ * headers and I'm too lazy to write a configure test as long as only
-+ * unixware is related
-+ */
-+#ifdef _UNIXWARE
-+#define HAVE_BOOLEAN
-+#endif
-+])
-+])
-+
-+AC_DEFUN([KDE_CHECK_QT_JPEG],
-+[
-+if test -n "$LIBJPEG"; then
-+AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-+AC_CACHE_VAL(kde_cv_qt_jpeg,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-+LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(
-+[#include <qapplication.h>],
-+            [
-+            int argc;
-+            char** argv;
-+            QApplication app(argc, argv);],
-+            eval "kde_cv_qt_jpeg=no",
-+            eval "kde_cv_qt_jpeg=yes")
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+fi
-+])
-+
-+if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-+  AC_MSG_RESULT(yes)
-+  LIBJPEG_QT='$(LIBJPEG)'
-+else
-+  AC_MSG_RESULT(no)
-+  LIBJPEG_QT=
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_ZLIB],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_MSG_CHECKING([for libz])
-+AC_CACHE_VAL(ac_cv_lib_z,
-+[
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(dnl
-+[
-+#include<zlib.h>
-+#include<string.h>
-+],
-+[
-+  char buf[42];
-+  gzFile f = (gzFile) 0;
-+  /* this would segfault.. but we only link, don't run */
-+  (void) gzgets(f, buf, sizeof(buf));
-+
-+  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
-+],
-+            eval "ac_cv_lib_z='-lz'",
-+            eval "ac_cv_lib_z=no")
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if test ! "$ac_cv_lib_z" = no; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-+  LIBZ="$ac_cv_lib_z"
-+  AC_MSG_RESULT($ac_cv_lib_z)
-+else
-+  AC_MSG_ERROR(not found. 
-+          Possibly configure picks up an outdated version
-+          installed by XFree86. Remove it from your system.
-+
-+          Check your installation and look into config.log)
-+  LIBZ=""
-+fi
-+AC_SUBST(LIBZ)
-+])
-+
-+AC_DEFUN([KDE_TRY_TIFFLIB],
-+[
-+AC_MSG_CHECKING([for libtiff $1])
-+
-+AC_CACHE_VAL(kde_cv_libtiff_$1,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+else
-+LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-+fi
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+[
-+#include<tiffio.h>
-+],
-+    [return (TIFFOpen( "", "r") == 0); ],
-+[
-+    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-+], [
-+    kde_cv_libtiff_$1=no
-+])
-+
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])
-+
-+if test "$kde_cv_libtiff_$1" = "no"; then
-+    AC_MSG_RESULT(no)
-+    LIBTIFF=""
-+    $3
-+else
-+    LIBTIFF="$kde_cv_libtiff_$1"
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
-+    $2
-+fi
-+
-+])
-+
-+AC_DEFUN([AC_FIND_TIFF],
-+[
-+AC_REQUIRE([K_PATH_X])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_REQUIRE([AC_FIND_JPEG])
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+KDE_TRY_TIFFLIB(tiff, [],
-+   KDE_TRY_TIFFLIB(tiff34))
-+
-+AC_SUBST(LIBTIFF)
-+])
-+
-+AC_DEFUN([KDE_FIND_LIBEXR],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_CACHE_VAL(ac_cv_libexr,
-+[
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  AC_MSG_CHECKING([for OpenEXR libraries])
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     AC_MSG_RESULT(no)
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     if ! $PKG_CONFIG --exists OpenEXR ; then
-+        AC_MSG_RESULT(no)
-+        EXRSTATUS=no
-+     else
-+        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
-+           AC_MSG_RESULT(no)
-+           EXRSTATUS=old
-+        else
-+           kde_save_LIBS="$LIBS"
-+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
-+           AC_LANG_SAVE
-+           AC_LANG_CPLUSPLUS
-+           kde_save_CXXFLAGS="$CXXFLAGS"
-+           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
-+           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
-+
-+           AC_TRY_LINK(dnl
-+               [
-+               #include <ImfRgbaFile.h>
-+               ],
-+               [
-+               using namespace Imf;
-+               RgbaInputFile file ("dummy");
-+               return 0;
-+               ],
-+               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
-+               eval "ac_cv_libexr=no"
-+           )
-+           LIBS="$kde_save_LIBS"
-+           CXXFLAGS="$kde_save_CXXFLAGS"
-+           AC_LANG_RESTORE
-+           ])dnl
-+           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
-+               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
-+               LIB_EXR="$ac_cv_libexr"
-+               AC_MSG_RESULT($ac_cv_libexr)
-+           else
-+               AC_MSG_RESULT(no)
-+               LIB_EXR=""
-+           fi
-+        fi
-+     fi
-+  fi
-+  AC_SUBST(LIB_EXR)
-+  AC_SUBST(EXR_FLAGS)
-+])
-+
-+
-+
-+AC_DEFUN([AC_FIND_PNG],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_ZLIB])
-+AC_MSG_CHECKING([for libpng])
-+AC_CACHE_VAL(ac_cv_lib_png,
-+[
-+kde_save_LIBS="$LIBS"
-+if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+else
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+fi
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+    [
-+    #include<png.h>
-+    ],
-+    [
-+    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-+		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-+    return( png_ptr != 0 );
-+    ],
-+    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-+    eval "ac_cv_lib_png=no"
-+)
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-+  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-+  LIBPNG="$ac_cv_lib_png"
-+  AC_SUBST(LIBPNG)
-+  AC_MSG_RESULT($ac_cv_lib_png)
-+else
-+  AC_MSG_RESULT(no)
-+  LIBPNG=""
-+  AC_SUBST(LIBPNG)
-+fi
-+])
-+
-+
-+AC_DEFUN([AC_FIND_JASPER],
-+[
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_REQUIRE([AC_FIND_JPEG])
-+AC_MSG_CHECKING([for jasper])
-+AC_CACHE_VAL(ac_cv_jasper,
-+[
-+kde_save_LIBS="$LIBS"
-+LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-+kde_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-+
-+AC_TRY_LINK(dnl
-+    [
-+    #include<jasper/jasper.h>
-+    ],
-+    [
-+    return( jas_init() );
-+    ],
-+    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
-+    eval "ac_cv_jasper=no"
-+)
-+LIBS="$kde_save_LIBS"
-+CFLAGS="$kde_save_CFLAGS"
-+])dnl
-+if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-+  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
-+  LIB_JASPER="$ac_cv_jasper"
-+  AC_MSG_RESULT($ac_cv_jasper)
-+else
-+  AC_MSG_RESULT(no)
-+  LIB_JASPER=""
-+fi
-+AC_SUBST(LIB_JASPER)
-+])
-+
-+AC_DEFUN([AC_CHECK_BOOL],
-+[
-+  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-+])
-+
-+AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-+[
-+AC_MSG_CHECKING(if you need GNU extensions)
-+AC_CACHE_VAL(ac_cv_gnu_extensions,
-+[
-+cat > conftest.c << EOF
-+#include <features.h>
-+
-+#ifdef __GNU_LIBRARY__
-+yes
-+#endif
-+EOF
-+
-+if (eval "$ac_cpp conftest.c") 2>&5 |
-+  egrep "yes" >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  ac_cv_gnu_extensions=yes
-+else
-+  ac_cv_gnu_extensions=no
-+fi
-+])
-+
-+AC_MSG_RESULT($ac_cv_gnu_extensions)
-+if test "$ac_cv_gnu_extensions" = "yes"; then
-+  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-+[
-+AC_MSG_CHECKING([whether $CXX supports -$1])
-+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-+AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -$1"
-+  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
-+  CXXFLAGS="$save_CXXFLAGS"
-+  AC_LANG_RESTORE
-+])
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-+ AC_MSG_RESULT(yes)
-+ :
-+ $2
-+else
-+ AC_MSG_RESULT(no)
-+ :
-+ $3
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_C_COMPILER_FLAG],
-+[
-+AC_MSG_CHECKING([whether $CC supports -$1])
-+kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-+AC_CACHE_VAL(kde_cv_prog_cc_$kde_cache,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_C
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -$1"
-+  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cc_$kde_cache=yes"], [])
-+  CFLAGS="$save_CFLAGS"
-+  AC_LANG_RESTORE
-+])
-+if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
-+ AC_MSG_RESULT(yes)
-+ :
-+ $2
-+else
-+ AC_MSG_RESULT(no)
-+ :
-+ $3
-+fi
-+])
-+
-+
-+dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-+dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-+dnl it's all white-space separated
-+AC_DEFUN([AC_REMOVE_FORBIDDEN],
-+[ __val=$$1
-+  __forbid=" $2 "
-+  if test -n "$__val"; then
-+    __new=""
-+    ac_save_IFS=$IFS
-+    IFS=" 	"
-+    for i in $__val; do
-+      case "$__forbid" in
-+        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
-+	*) # Careful to not add spaces, where there were none, because otherwise
-+	   # libtool gets confused, if we change e.g. CXX
-+	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-+      esac
-+    done
-+    IFS=$ac_save_IFS
-+    $1=$__new
-+  fi
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
-+[
-+  AC_MSG_CHECKING([whether $CC is blacklisted])
-+
-+  dnl In theory we have tu run this test against $CC and $CXX
-+  dnl in C and in C++ mode, because its perfectly legal for
-+  dnl the user to mix compiler versions, since C has a defined
-+  dnl ABI. 
-+  dnl 
-+  dnl For now, we assume the user is not on crack.
-+
-+  AC_TRY_COMPILE([
-+#ifdef __GNUC__
-+#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-+choke me
-+#endif
-+#endif
-+], ,
-+  kde_bad_compiler=no, 
-+  kde_bad_compiler=yes
-+)
-+
-+  AC_MSG_RESULT($kde_bad_compiler)
-+
-+if test "$kde_bad_compiler" = "yes"; then
-+  AC_MSG_ERROR([
-+
-+This particular compiler version is blacklisted because it
-+is known to miscompile KDE. Please use a newer version, or
-+if that is not yet available, choose an older version. 
-+
-+Please do not report a bug or bother us reporting this
-+configure error. We know about it, and we introduced
-+it by intention to avoid untraceable bugs or crashes in KDE.
-+
-+])
-+fi
-+
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
-+[
-+  AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
-+    kde_cv_opt_noinline_match,
-+  [
-+  kde_cv_opt_noinline_match=irrelevant
-+  dnl if we don't use both -O2 and -fno-inline, this check is moot
-+  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
-+     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
-+
-+    ac_cflags_save="$CFLAGS"
-+    CFLAGS="$CFLAGS -D_USE_GNU"
-+
-+    AC_TRY_LINK([
-+  #include <string.h>
-+], [  const char *pt, *et;
-+  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
-+],
-+    kde_cv_opt_noinline_match=yes,
-+    kde_cv_opt_noinline_match=no
-+    )
-+
-+    CFLAGS="$ac_cflags_save"
-+  fi
-+  ])
-+])
-+
-+
-+dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-+AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-+[dnl
-+if test "x$kde_use_qt_emb" != "xyes"; then
-+ AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
-+ AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-+else
-+ AC_REMOVE_FORBIDDEN(CXX, [-rpath])
-+ AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-+fi
-+])
-+
-+AC_DEFUN([AC_CHECK_COMPILERS],
-+[
-+  AC_ARG_ENABLE(debug,
-+	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-+  [
-+    case $enableval in
-+      yes)
-+        kde_use_debug_code="yes"
-+        kde_use_debug_define=no
-+        ;;
-+      full)
-+        kde_use_debug_code="full"
-+        kde_use_debug_define=no
-+        ;;
-+      *)
-+        kde_use_debug_code="no"
-+        kde_use_debug_define=yes
-+        ;;
-+    esac
-+  ], 
-+    [kde_use_debug_code="no"
-+      kde_use_debug_define=no
-+  ])
-+
-+  dnl Just for configure --help
-+  AC_ARG_ENABLE(dummyoption,
-+	        AC_HELP_STRING([--disable-debug],
-+	  		       [disables debug output and debug symbols [default=no]]),
-+		[],[])
-+
-+  AC_ARG_ENABLE(strict,
-+		AC_HELP_STRING([--enable-strict],
-+			      [compiles with strict compiler options (may not work!)]),
-+   [
-+    if test $enableval = "no"; then
-+         kde_use_strict_options="no"
-+       else
-+         kde_use_strict_options="yes"
-+    fi
-+   ], [kde_use_strict_options="no"])
-+
-+  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
-+   [
-+    if test $enableval = "no"; then
-+         kde_use_warnings="no"
-+       else
-+         kde_use_warnings="yes"
-+    fi
-+   ], [kde_use_warnings="yes"])
-+
-+  dnl enable warnings for debug build
-+  if test "$kde_use_debug_code" != "no"; then
-+    kde_use_warnings=yes
-+  fi
-+
-+  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
-+    [kde_use_profiling=$enableval],
-+    [kde_use_profiling="no"]
-+  )
-+
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+
-+  AC_PROG_CC 
-+
-+  AC_PROG_CPP
-+
-+  if test "$GCC" = "yes"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test $kde_use_debug_code = "full"; then
-+        CFLAGS="-g3 -fno-inline $CFLAGS"
-+      else
-+        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
-+      fi
-+    else
-+      CFLAGS="-O2 $CFLAGS"
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CFLAGS="-DNDEBUG $CFLAGS"
-+  fi
-+
-+
-+  case "$host" in
-+  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-+  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-+  esac
-+
-+  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-+     LDFLAGS=""
-+  fi
-+
-+  CXXFLAGS=" $CXXFLAGS"
-+
-+  AC_PROG_CXX
-+
-+  KDE_CHECK_FOR_BAD_COMPILER
-+
-+  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-+    if test "$kde_use_debug_code" != "no"; then
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-+      else
-+        if test "$kde_use_debug_code" = "full"; then
-+          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-+        else
-+          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
-+        fi
-+      fi
-+      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-+
-+      dnl convenience compiler flags
-+      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
-+      AC_SUBST(WOVERLOADED_VIRTUAL)
-+    else
-+      if test "$CXX" = "KCC"; then
-+        CXXFLAGS="+K3 $CXXFLAGS"
-+      else
-+        CXXFLAGS="-O2 $CXXFLAGS"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$kde_use_debug_define" = "yes"; then
-+    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-+  fi  
-+
-+  if test "$kde_use_profiling" = "yes"; then
-+    KDE_CHECK_COMPILER_FLAG(pg,
-+    [
-+      CFLAGS="-pg $CFLAGS"
-+      CXXFLAGS="-pg $CXXFLAGS"
-+    ])
-+  fi
-+
-+  if test "$kde_use_warnings" = "yes"; then
-+      if test "$GCC" = "yes"; then
-+        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
-+        case $host in
-+          *-*-linux-gnu)	
-+            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-+            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
-+            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
-+            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-+          ;;
-+        esac
-+        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
-+        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
-+        dnl ### FIXME: revert for KDE 4
-+        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
-+     fi
-+  fi
-+
-+  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-+    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-+  fi
-+
-+  AC_ARG_ENABLE(pch,
-+     AC_HELP_STRING([--enable-pch],
-+                    [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
-+    [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
-+ 
-+  HAVE_GCC_VISIBILITY=0
-+  AC_SUBST([HAVE_GCC_VISIBILITY])
-+
-+  if test "$GXX" = "yes"; then
-+    gcc_no_reorder_blocks=NO
-+    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
-+    if test $kde_use_debug_code != "no" && \
-+       test $kde_use_debug_code != "full" && \
-+       test "YES" = "$gcc_no_reorder_blocks" ; then
-+          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
-+          CFLAGS="$CFLAGS -fno-reorder-blocks"
-+    fi
-+    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-+    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-+    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-+    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-+    ENABLE_PERMISSIVE_FLAG="-fpermissive"
-+
-+    if test "$kde_use_pch" = "yes"; then
-+        AC_MSG_CHECKING(whether gcc supports precompiling c header files)
-+        echo >conftest.h
-+        if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
-+            kde_gcc_supports_pch=yes
-+            AC_MSG_RESULT(yes)
-+        else
-+            kde_gcc_supports_pch=no
-+            AC_MSG_RESULT(no)
-+        fi
-+        if test "$kde_gcc_supports_pch" = "yes"; then
-+            AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
-+            if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
-+                kde_gcc_supports_pch=yes
-+                AC_MSG_RESULT(yes)
-+            else
-+                kde_gcc_supports_pch=no
-+                AC_MSG_RESULT(no)
-+            fi
-+        fi
-+        rm -f conftest.h conftest.h.gch
-+    fi
-+
-+    KDE_CHECK_FOR_OPT_NOINLINE_MATCH
-+    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
-+       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-+    fi
-+  fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-+  if test "$CXX" = "KCC"; then
-+    dnl unfortunately we currently cannot disable exception support in KCC
-+    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-+    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
-+    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
-+
-+    if test "$kde_use_pch" = "yes"; then
-+      dnl TODO: support --pch-dir!
-+      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
-+      dnl the below works (but the dir must exist), but it's
-+      dnl useless for a whole package.
-+      dnl The are precompiled headers for each source file, so when compiling
-+      dnl from scratch, it doesn't make a difference, and they take up
-+      dnl around ~5Mb _per_ sourcefile.
-+      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
-+      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
-+    fi
-+    dnl this flag controls inlining. by default KCC inlines in optimisation mode
-+    dnl all implementations that are defined inside the class {} declaration. 
-+    dnl because of templates-compatibility with broken gcc compilers, this
-+    dnl can cause excessive inlining. This flag limits it to a sane level
-+    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
-+    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
-+    dnl Some source files are shared between multiple executables
-+    dnl (or libraries) and some of those need template instantiations.
-+    dnl In that case KCC needs to compile those sources with
-+    dnl --one_instantiation_per_object.  To make it easy for us we compile
-+    dnl _all_ objects with that flag (--one_per is a shorthand).
-+    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
-+  fi
-+  AC_SUBST(USE_EXCEPTIONS)
-+  dnl obsolete macro - provided to keep things going
-+  USE_RTTI=
-+  AC_SUBST(USE_RTTI)
-+
-+  case "$host" in
-+      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-+      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-+      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-+      *-*-solaris*) 
-+        if test "$GXX" = yes; then
-+          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-+          if test ! -f $libstdcpp; then
-+             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
-+          fi
-+        fi
-+        ;;
-+  esac
-+
-+  AC_VALIDIFY_CXXFLAGS
-+
-+  AC_PROG_CXXCPP
-+
-+  if test "$GCC" = yes; then
-+     NOOPT_CFLAGS=-O0
-+  fi
-+  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-+
-+  AC_ARG_ENABLE(coverage,
-+    AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
-+      if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker="-lgcc"
-+      elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
-+        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-+        ac_coverage_linker=""
-+      else
-+        AC_MSG_ERROR([coverage with your compiler is not supported])
-+      fi
-+      CFLAGS="$CFLAGS $ac_coverage_compiler"
-+      CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
-+      LDFLAGS="$LDFLAGS $ac_coverage_linker"
-+    ])
-+
-+  AC_SUBST(NOOPT_CXXFLAGS)
-+  AC_SUBST(NOOPT_CFLAGS)
-+  AC_SUBST(ENABLE_PERMISSIVE_FLAG)
-+
-+  KDE_CHECK_NEW_LDFLAGS
-+  KDE_CHECK_FINAL
-+  KDE_CHECK_CLOSURE
-+  KDE_CHECK_NMCHECK
-+
-+  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-+])
-+
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+	  #include <string>
-+          int some_function( void ) __attribute__ ((visibility("default")));
-+          int some_function( void )
-+          {
-+	    std::string s("blafasel");
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
-+
-+AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
-+[
-+  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-+
-+  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+
-+  if test "x$GXX" = "xyes"; then
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    AC_EGREP_CPP(
-+       [GCC visibility push],
-+       [ #include <exception> 
-+       ], 
-+    [
-+      AC_MSG_RESULT(yes)
-+      kde_stdc_visibility_patched=yes ],
-+    [ 
-+      AC_MSG_RESULT(no)
-+      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
-+                   visibility support. Disabling -fvisibility=hidden])
-+
-+      kde_stdc_visibility_patched=no ])
-+
-+    AC_LANG_RESTORE
-+
-+    kde_have_gcc_visibility=no
-+    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-+    [
-+      kde_have_gcc_visibility=yes
-+      dnl the whole toolchain is just a mess, gcc is just too buggy
-+      dnl to handle STL with visibility enabled. Lets reconsider 
-+      dnl when gcc 4.2 is out or when things get fixed in the compiler.
-+      dnl Contact mueller@kde.org for details.
-+      AC_ARG_ENABLE(gcc-hidden-visibility,
-+        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
-+          [kde_have_gcc_visibility=$enableval],
-+          [kde_have_gcc_visibility=no])
-+
-+      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-+        [
-+          AC_LANG_SAVE
-+          AC_LANG_CPLUSPLUS
-+
-+          safe_CXXFLAGS=$CXXFLAGS
-+          CXXFLAGS="$CXXFLAGS $all_includes"
-+
-+          AC_TRY_COMPILE(
-+          [
-+#include <qglobal.h>
-+#if Q_EXPORT - 0 != 0
-+/* if this compiles, then Q_EXPORT is undefined */
-+/* if Q_EXPORT is nonempty, this will break compilation */
-+#endif
-+          ], [/* elvis is alive */],
-+          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-+
-+          CXXFLAGS=$safe_CXXFLAGS
-+          AC_LANG_RESTORE
-+        ]
-+      )
-+
-+      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
-+        HAVE_GCC_VISIBILITY=1
-+        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-+      fi
-+    ])
-+  fi
-+])
-+
-+AC_DEFUN([KDE_ADD_DEPENDENCIES],
-+[
-+   [A]M_DEPENDENCIES(CC)
-+   [A]M_DEPENDENCIES(CXX)
-+])
-+
-+dnl just a wrapper to clean up configure.in
-+AC_DEFUN([KDE_PROG_LIBTOOL],
-+[
-+AC_REQUIRE([AC_CHECK_COMPILERS])
-+AC_REQUIRE([AC_ENABLE_SHARED])
-+AC_REQUIRE([AC_ENABLE_STATIC])
-+
-+AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+AC_OBJEXT
-+AC_EXEEXT
-+
-+AM_PROG_LIBTOOL
-+AC_LIBTOOL_CXX
-+
-+LIBTOOL_SHELL="/bin/sh ./libtool"
-+#  LIBTOOL="$LIBTOOL --silent"
-+KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-+AC_SUBST(KDE_PLUGIN)
-+
-+# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
-+KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
-+AC_SUBST(KDE_CHECK_PLUGIN)
-+
-+# we patch configure quite some so we better keep that consistent for incremental runs 
-+AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIB64],
-+[
-+    AC_ARG_ENABLE(libsuffix,
-+        AC_HELP_STRING([--enable-libsuffix],
-+            [/lib directory suffix (64,32,none,auto[=default])]),
-+            kdelibsuff=$enableval, kdelibsuff="auto")
-+    
-+    if test "$kdelibsuff" = "auto"; then
-+    
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-+ return 0;
-+}
-+EOF
-+        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
-+    s,.*/lib\([[^\/]]*\)/.*,\1, 
-+    p 
-+}'`
-+	rm -rf conftest.*
-+    fi	
-+	
-+    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-+       kdelibsuff=
-+    fi
-+    if test -z "$kdelibsuff"; then
-+        AC_MSG_RESULT([not using lib directory suffix])
-+        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
-+    else
-+        if test "$libdir" = '${exec_prefix}/lib'; then
-+            libdir="$libdir${kdelibsuff}"
-+            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
-+        fi
-+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
-+        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
-+    fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_TYPES],
-+[  AC_CHECK_SIZEOF(int, 4)dnl
-+   AC_CHECK_SIZEOF(short)dnl
-+  AC_CHECK_SIZEOF(long, 4)dnl
-+  AC_CHECK_SIZEOF(char *, 4)dnl
-+])dnl
-+
-+dnl Not used - kept for compat only?
-+AC_DEFUN([KDE_DO_IT_ALL],
-+[
-+AC_CANONICAL_SYSTEM
-+AC_ARG_PROGRAM
-+AM_INIT_AUTOMAKE($1, $2)
-+AM_DISABLE_LIBRARIES
-+AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-+AC_CHECK_COMPILERS
-+KDE_PROG_LIBTOOL
-+AM_KDE_WITH_NLS
-+AC_PATH_KDE
-+])
-+
-+AC_DEFUN([AC_CHECK_RPATH],
-+[
-+AC_MSG_CHECKING(for rpath)
-+AC_ARG_ENABLE(rpath,
-+      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
-+      USE_RPATH=$enableval, USE_RPATH=yes)
-+
-+if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-+
-+  KDE_RPATH="-R \$(libdir)"
-+
-+  if test "$kde_libraries" != "$libdir"; then
-+      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
-+  fi
-+
-+  if test -n "$qt_libraries"; then
-+    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-+  fi
-+  dnl $x_libraries is set to /usr/lib in case
-+  if test -n "$X_LDFLAGS"; then
-+    X_RPATH="-R \$(x_libraries)"
-+    KDE_RPATH="$KDE_RPATH $X_RPATH"
-+  fi
-+  if test -n "$KDE_EXTRA_RPATH"; then
-+    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-+  fi
-+fi
-+AC_SUBST(KDE_EXTRA_RPATH)
-+AC_SUBST(KDE_RPATH)
-+AC_SUBST(X_RPATH)
-+AC_MSG_RESULT($USE_RPATH)
-+])
-+
-+dnl Check for the type of the third argument of getsockname
-+AC_DEFUN([AC_CHECK_SOCKLEN_T],
-+[
-+   AC_MSG_CHECKING(for socklen_t)
-+   AC_CACHE_VAL(kde_cv_socklen_t,
-+   [
-+      AC_LANG_PUSH(C++)
-+      kde_cv_socklen_t=no
-+      AC_TRY_COMPILE([
-+         #include <sys/types.h>
-+         #include <sys/socket.h>
-+      ],
-+      [
-+         socklen_t len;
-+         getpeername(0,0,&len);
-+      ],
-+      [
-+         kde_cv_socklen_t=yes
-+         kde_cv_socklen_t_equiv=socklen_t
-+      ])
-+      AC_LANG_POP(C++)
-+   ])
-+   AC_MSG_RESULT($kde_cv_socklen_t)
-+   if test $kde_cv_socklen_t = no; then
-+      AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
-+      AC_CACHE_VAL(kde_cv_socklen_t_equiv,
-+      [
-+         kde_cv_socklen_t_equiv=int
-+         AC_LANG_PUSH(C++)
-+         for t in int size_t unsigned long "unsigned long"; do
-+            AC_TRY_COMPILE([
-+               #include <sys/types.h>
-+               #include <sys/socket.h>
-+            ],
-+            [
-+               $t len;
-+               getpeername(0,0,&len);
-+            ],
-+            [
-+               kde_cv_socklen_t_equiv="$t"
-+               break
-+            ])
-+         done
-+         AC_LANG_POP(C++)
-+      ])
-+      AC_MSG_RESULT($kde_cv_socklen_t_equiv)
-+   fi
-+   AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
-+                     [type to use in place of socklen_t if not defined])
-+   AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
-+                     [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
-+])
-+
-+dnl This is a merge of some macros out of the gettext aclocal.m4
-+dnl since we don't need anything, I took the things we need
-+dnl the copyright for them is:
-+dnl >
-+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-+dnl This Makefile.in is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+dnl >
-+dnl for this file it is relicensed under LGPL
-+
-+AC_DEFUN([AM_KDE_WITH_NLS],
-+  [
-+    dnl If we use NLS figure out what method
-+
-+    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-+        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-+    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-+        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-+        GMSGFMT=":"
-+      fi
-+      MSGFMT=$GMSGFMT
-+      AC_SUBST(GMSGFMT)
-+      AC_SUBST(MSGFMT)
-+
-+      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-+	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+
-+      dnl Test whether we really found GNU xgettext.
-+      if test "$XGETTEXT" != ":"; then
-+	dnl If it is no GNU xgettext we define it as : so that the
-+	dnl Makefiles still can work.
-+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+	  : ;
-+	else
-+	  AC_MSG_RESULT(
-+	    [found xgettext programs is not GNU xgettext; ignore it])
-+	  XGETTEXT=":"
-+	fi
-+      fi
-+     AC_SUBST(XGETTEXT)
-+
-+  ])
-+
-+# Search path for a program which passes the given test.
-+# Ulrich Drepper <drepper@cygnus.com>, 1996.
-+
-+# serial 1
-+# Stephan Kulow: I appended a _KDE against name conflicts
-+
-+dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test -n "[$]$1"; then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
-+
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# serial 1
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+  [if test $ac_cv_header_locale_h = yes; then
-+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+    if test $am_cv_val_LC_MESSAGES = yes; then
-+      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
-+    fi
-+  fi])
-+
-+dnl From Jim Meyering.
-+dnl FIXME: migrate into libit.
-+
-+AC_DEFUN([AM_FUNC_OBSTACK],
-+[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
-+ [AC_TRY_LINK([#include "obstack.h"],
-+	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-+	      am_cv_func_obstack=yes,
-+	      am_cv_func_obstack=no)])
-+ if test $am_cv_func_obstack = yes; then
-+   AC_DEFINE(HAVE_OBSTACK)
-+ else
-+   LIBOBJS="$LIBOBJS obstack.o"
-+ fi
-+])
-+
-+dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-+dnl FIXME: Migrate into libit
-+
-+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-+[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-+ [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-+              am_cv_lib_error_at_line=yes,
-+	      am_cv_lib_error_at_line=no)])
-+ if test $am_cv_lib_error_at_line = no; then
-+   LIBOBJS="$LIBOBJS error.o"
-+ fi
-+ AC_SUBST(LIBOBJS)dnl
-+])
-+
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# serial 1
-+# Stephan Kulow: I put a KDE in it to avoid name conflicts
-+
-+AC_DEFUN([AM_KDE_GNU_GETTEXT],
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-+   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-+__argz_count __argz_stringify __argz_next])
-+
-+   AC_MSG_CHECKING(for stpcpy)
-+   AC_CACHE_VAL(kde_cv_func_stpcpy,
-+   [
-+   kde_safe_cxxflags=$CXXFLAGS
-+   CXXFLAGS="-Werror"
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   AC_TRY_COMPILE([
-+   #include <string.h>
-+   ],
-+   [
-+   char buffer[200];
-+   stpcpy(buffer, buffer);
-+   ],
-+   kde_cv_func_stpcpy=yes,
-+   kde_cv_func_stpcpy=no)
-+   AC_LANG_RESTORE
-+   CXXFLAGS=$kde_safe_cxxflags
-+   ])
-+   AC_MSG_RESULT($kde_cv_func_stpcpy)
-+   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-+     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-+   fi
-+
-+   AM_LC_MESSAGES
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+  ])
-+
-+AC_DEFUN([AC_HAVE_XPM],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
-+ test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-+
-+ AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
-+	xpm_test=$withval, xpm_test="yes")
-+ if test "x$xpm_test" = xno; then
-+   ac_cv_have_xpm=no
-+ else
-+   AC_MSG_CHECKING(for XPM)
-+   AC_CACHE_VAL(ac_cv_have_xpm,
-+   [
-+    ac_save_ldflags="$LDFLAGS"
-+    ac_save_cflags="$CFLAGS"
-+    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-+      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-+    else
-+      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-+    fi
-+    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-+    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-+    AC_TRY_LINK([#include <X11/xpm.h>],[],
-+	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-+    LDFLAGS="$ac_save_ldflags"
-+    CFLAGS="$ac_save_cflags"
-+   ])dnl
-+
-+  if test "$ac_cv_have_xpm" = no; then
-+    AC_MSG_RESULT(no)
-+    XPM_LDFLAGS=""
-+    XPMINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
-+    if test "$XPM_LDFLAGS" = ""; then
-+       XPMLIB='-lXpm $(LIB_X11)'
-+    else
-+       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
-+    fi
-+    if test "$XPM_INCLUDE" = ""; then
-+       XPMINC=""
-+    else
-+       XPMINC="-I$XPM_INCLUDE"
-+    fi
-+    AC_MSG_RESULT(yes)
-+    $1
-+  fi
-+ fi
-+ AC_SUBST(XPMINC)
-+ AC_SUBST(XPMLIB)
-+])
-+
-+AC_DEFUN([AC_HAVE_DPMS],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
-+ test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
-+ DPMS_LIB=
-+
-+ AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
-+	dpms_test=$withval, dpms_test="yes")
-+ if test "x$dpms_test" = xno; then
-+   ac_cv_have_dpms=no
-+ else
-+   AC_MSG_CHECKING(for DPMS)
-+   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
-+   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
-+   AC_CACHE_VAL(ac_cv_have_dpms,
-+   [
-+    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
-+      AC_MSG_RESULT(no)
-+      ac_cv_have_dpms="no"
-+    else
-+      ac_save_ldflags="$LDFLAGS"
-+      ac_save_cflags="$CFLAGS"
-+      ac_save_libs="$LIBS"
-+      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
-+      LIBS="-lX11 -lXext $LIBSOCKET"
-+      CFLAGS="$CFLAGS $X_INCLUDES"
-+      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+      AC_TRY_LINK([
-+	  #include <X11/Xproto.h>
-+	  #include <X11/X.h>
-+	  #include <X11/Xlib.h>
-+	  #include <X11/extensions/dpms.h>
-+	  int foo_test_dpms()
-+	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-+	  ac_cv_have_dpms="yes", [
-+              LIBS="-lXdpms $LIBS"
-+              AC_TRY_LINK([
-+	          #include <X11/Xproto.h>
-+        	  #include <X11/X.h>
-+        	  #include <X11/Xlib.h>
-+        	  #include <X11/extensions/dpms.h>
-+        	  int foo_test_dpms()
-+        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-+        	  [
-+                  ac_cv_have_dpms="-lXdpms"
-+                  ],ac_cv_have_dpms="no")
-+              ])
-+      LDFLAGS="$ac_save_ldflags"
-+      CFLAGS="$ac_save_cflags"
-+      LIBS="$ac_save_libs"
-+    fi
-+   ])dnl
-+
-+  if test "$ac_cv_have_dpms" = no; then
-+    AC_MSG_RESULT(no)
-+    DPMS_LDFLAGS=""
-+    DPMSINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
-+    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-+       DPMS_LIB="-lXdpms"
-+    fi
-+    if test "$DPMS_LDFLAGS" = ""; then
-+       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-+    else
-+       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-+    fi
-+    if test "$DPMS_INCLUDE" = ""; then
-+       DPMSINC=""
-+    else
-+       DPMSINC="-I$DPMS_INCLUDE"
-+    fi
-+    AC_MSG_RESULT(yes)
-+    $1
-+  fi
-+ fi
-+ ac_save_cflags="$CFLAGS"
-+ CFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-+ AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
-+   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
-+ AC_CHECK_DECL(DPMSCapable,
-+   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
-+   [#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>])
-+ AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
-+   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
-+ AC_CHECK_DECL(DPMSInfo,
-+   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
-+   [#include <X11/Xlib.h>
-+   #include <X11/extensions/dpms.h>])
-+ CFLAGS="$ac_save_cflags"
-+ AC_SUBST(DPMSINC)
-+ AC_SUBST(DPMSLIB)
-+])
-+
-+AC_DEFUN([AC_HAVE_GL],
-+ [AC_REQUIRE_CPP()dnl
-+  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+ AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-+	gl_test=$withval, gl_test="yes")
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+   # GL and Qt Embedded is a no-go for now.
-+   ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+   ac_cv_have_gl=no
-+ else
-+   AC_MSG_CHECKING(for GL)
-+   AC_CACHE_VAL(ac_cv_have_gl,
-+   [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_save_ldflags=$LDFLAGS
-+    ac_save_cxxflags=$CXXFLAGS
-+    ac_save_libs=$LIBS
-+    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+    LIBS="$LIBS -lGL -lGLU"
-+    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+    CXXFLAGS="$CFLAGS $X_INCLUDES"
-+    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+    AC_TRY_LINK([#include <GL/gl.h>
-+#include <GL/glu.h>
-+], [],
-+	ac_cv_have_gl="yes", ac_cv_have_gl="no")
-+    AC_LANG_RESTORE
-+    LDFLAGS=$ac_save_ldflags
-+    CXXFLAGS=$ac_save_cxxflags
-+    LIBS=$ac_save_libs
-+   ])dnl
-+
-+  if test "$ac_cv_have_gl" = "no"; then
-+    AC_MSG_RESULT(no)
-+    GL_LDFLAGS=""
-+    GLINC=""
-+    $2
-+  else
-+    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-+    if test "$GL_LDFLAGS" = ""; then
-+       GLLIB='-lGLU -lGL $(LIB_X11)'
-+    else
-+       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+    fi
-+    if test "$GL_INCLUDE" = ""; then
-+       GLINC=""
-+    else
-+       GLINC="-I$GL_INCLUDE"
-+    fi
-+    AC_MSG_RESULT($ac_cv_have_gl)
-+    $1
-+  fi
-+ fi
-+ AC_SUBST(GLINC)
-+ AC_SUBST(GLLIB)
-+])
-+
-+
-+ dnl shadow password and PAM magic - maintained by ossi@kde.org
-+
-+AC_DEFUN([KDE_PAM], [
-+  AC_REQUIRE([KDE_CHECK_LIBDL])
-+
-+  want_pam=
-+  AC_ARG_WITH(pam,
-+    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-+    [ if test "x$withval" = "xyes"; then
-+        want_pam=yes
-+        pam_service=kde
-+      elif test "x$withval" = "xno"; then
-+        want_pam=no
-+      else
-+        want_pam=yes
-+        pam_service=$withval
-+      fi
-+    ], [ pam_service=kde ])
-+
-+  use_pam=
-+  PAMLIBS=
-+  if test "x$want_pam" != xno; then
-+    AC_CHECK_LIB(pam, pam_start, [
-+      AC_CHECK_HEADER(security/pam_appl.h,
-+        [ pam_header=security/pam_appl.h ],
-+        [ AC_CHECK_HEADER(pam/pam_appl.h,
-+            [ pam_header=pam/pam_appl.h ],
-+            [
-+    AC_MSG_WARN([PAM detected, but no headers found!
-+Make sure you have the necessary development packages installed.])
-+            ]
-+          )
-+        ]
-+      )
-+    ], , $LIBDL)
-+    if test -z "$pam_header"; then
-+      if test "x$want_pam" = xyes; then
-+        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
-+      fi
-+    else
-+      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-+      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-+      use_pam=yes
-+
-+      dnl darwin claims to be something special
-+      if test "$pam_header" = "pam/pam_appl.h"; then
-+        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
-+      fi
-+
-+      dnl test whether struct pam_message is const (Linux) or not (Sun)
-+      AC_MSG_CHECKING(for const pam_message)
-+      AC_EGREP_HEADER([struct pam_message], $pam_header,
-+        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
-+                          [AC_MSG_RESULT([const: Linux-type PAM])],
-+                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
-+                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
-+                          )],
-+        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
-+    fi
-+  fi
-+
-+  AC_SUBST(PAMLIBS)
-+])
-+
-+dnl DEF_PAM_SERVICE(arg name, full name, define name)
-+AC_DEFUN([DEF_PAM_SERVICE], [
-+  AC_ARG_WITH($1-pam,
-+    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
-+    [ if test "x$use_pam" = xyes; then
-+        $3_PAM_SERVICE=$withval
-+      else
-+        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-+You may want to enforce it by using --with-pam.])
-+      fi
-+    ], 
-+    [ if test "x$use_pam" = xyes; then
-+        $3_PAM_SERVICE="$pam_service"
-+      fi
-+    ])
-+    if test -n "$$3_PAM_SERVICE"; then
-+      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-+      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
-+    fi
-+    AC_SUBST($3_PAM_SERVICE)
-+])
-+
-+AC_DEFUN([KDE_SHADOWPASSWD], [
-+  AC_REQUIRE([KDE_PAM])
-+
-+  AC_CHECK_LIB(shadow, getspent,
-+    [ LIBSHADOW="-lshadow"
-+      ac_use_shadow=yes
-+    ],
-+    [ dnl for UnixWare
-+      AC_CHECK_LIB(gen, getspent, 
-+        [ LIBGEN="-lgen"
-+          ac_use_shadow=yes
-+        ], 
-+        [ AC_CHECK_FUNC(getspent, 
-+            [ ac_use_shadow=yes ],
-+            [ ac_use_shadow=no ])
-+	])
-+    ])
-+  AC_SUBST(LIBSHADOW)
-+  AC_SUBST(LIBGEN)
-+  
-+  AC_MSG_CHECKING([for shadow passwords])
-+
-+  AC_ARG_WITH(shadow,
-+    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
-+    [ if test "x$withval" != "xno"; then
-+        use_shadow=yes
-+      else
-+        use_shadow=no
-+      fi
-+    ], [
-+      use_shadow="$ac_use_shadow"
-+    ])
-+
-+  if test "x$use_shadow" = xyes; then
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
-+  else
-+    AC_MSG_RESULT(no)
-+    LIBSHADOW=
-+    LIBGEN=
-+  fi
-+
-+  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
-+  dnl this still applies, if we could use it indirectly through pam.
-+  if test "x$use_shadow" = xyes || 
-+     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-+      case $host in
-+      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-+	SETUIDFLAGS="-m 4755 -o root";;
-+      *)
-+	SETUIDFLAGS="-m 4755";;
-+      esac
-+  fi
-+  AC_SUBST(SETUIDFLAGS)
-+
-+])
-+
-+AC_DEFUN([KDE_PASSWDLIBS], [
-+  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-+  AC_REQUIRE([KDE_PAM])
-+  AC_REQUIRE([KDE_SHADOWPASSWD])
-+
-+  if test "x$use_pam" = "xyes"; then 
-+    PASSWDLIBS="$PAMLIBS"
-+  else
-+    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-+  fi
-+
-+  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
-+  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
-+  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
-+  dnl may need to read /etc/master.passwd).
-+  case $host in
-+  *-*-freebsd*)
-+    SETUIDFLAGS="-m 4755 -o root"
-+    ;;
-+  *)
-+    ;;
-+  esac
-+
-+  AC_SUBST(PASSWDLIBS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIBDL],
-+[
-+AC_CHECK_LIB(dl, dlopen, [
-+LIBDL="-ldl"
-+ac_cv_have_dlfcn=yes
-+])
-+
-+AC_CHECK_LIB(dld, shl_unload, [
-+LIBDL="-ldld"
-+ac_cv_have_shload=yes
-+])
-+
-+AC_SUBST(LIBDL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_DLOPEN],
-+[
-+KDE_CHECK_LIBDL
-+AC_CHECK_HEADERS(dlfcn.h dl.h)
-+if test "$ac_cv_header_dlfcn_h" = "no"; then
-+  ac_cv_have_dlfcn=no
-+fi
-+
-+if test "$ac_cv_header_dl_h" = "no"; then
-+  ac_cv_have_shload=no
-+fi
-+
-+dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-+dnl (MM)
-+AC_ARG_ENABLE(dlopen,
-+AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-+enable_dlopen=$enableval,
-+enable_dlopen=yes)
-+
-+# override the user's opinion, if we know it better ;)
-+if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
-+  enable_dlopen=no
-+fi
-+
-+if test "$ac_cv_have_dlfcn" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-+fi
-+
-+if test "$ac_cv_have_shload" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-+fi
-+
-+if test "$enable_dlopen" = no ; then
-+  test -n "$1" && eval $1
-+else
-+  test -n "$2" && eval $2
-+fi
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-+[
-+KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-+KDE_PROG_LIBTOOL
-+AC_MSG_CHECKING([dynamic loading])
-+eval "`egrep '^build_libtool_libs=' libtool`"
-+if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
-+  dynamic_loading=yes
-+  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-+else
-+  dynamic_loading=no
-+fi
-+AC_MSG_RESULT($dynamic_loading)
-+if test "$dynamic_loading" = "yes"; then
-+  $1
-+else
-+  $2
-+fi
-+])
-+
-+AC_DEFUN([KDE_ADD_INCLUDES],
-+[
-+if test -z "$1"; then
-+  test_include="Pix.h"
-+else
-+  test_include="$1"
-+fi
-+
-+AC_MSG_CHECKING([for libg++ ($test_include)])
-+
-+AC_CACHE_VAL(kde_cv_libgpp_includes,
-+[
-+kde_cv_libgpp_includes=no
-+
-+   for ac_dir in               \
-+                               \
-+     /usr/include/g++          \
-+     /usr/include              \
-+     /usr/unsupported/include  \
-+     /opt/include              \
-+     $extra_include            \
-+     ; \
-+   do
-+     if test -r "$ac_dir/$test_include"; then
-+       kde_cv_libgpp_includes=$ac_dir
-+       break
-+     fi
-+   done
-+])
-+
-+AC_MSG_RESULT($kde_cv_libgpp_includes)
-+if test "$kde_cv_libgpp_includes" != "no"; then
-+  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-+fi
-+])
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-+[
-+  dnl This code is here specifically to handle the
-+  dnl various flavors of threading library on FreeBSD
-+  dnl 4-, 5-, and 6-, and the (weird) rules around it.
-+  dnl There may be an environment PTHREAD_LIBS that 
-+  dnl specifies what to use; otherwise, search for it.
-+  dnl -pthread is special cased and unsets LIBPTHREAD
-+  dnl below if found.
-+  LIBPTHREAD=""
-+
-+  if test -n "$PTHREAD_LIBS"; then
-+    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-+      LIBPTHREAD="PTHREAD"
-+    else
-+      PTHREAD_LIBS_save="$PTHREAD_LIBS"
-+      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-+      AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
-+      KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
-+          LIBPTHREAD="$PTHREAD_LIBS_save"])
-+      PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+    fi
-+  fi
-+
-+  dnl Is this test really needed, in the face of the Tru64 test below?
-+  if test -z "$LIBPTHREAD"; then
-+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
-+  fi
-+
-+  dnl This is a special Tru64 check, see BR 76171 issue #18.
-+  if test -z "$LIBPTHREAD" ; then
-+    AC_MSG_CHECKING([for pthread_create in -lpthread])
-+    kde_safe_libs=$LIBS
-+    LIBS="$LIBS -lpthread"
-+    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
-+        AC_MSG_RESULT(yes)
-+        LIBPTHREAD="-lpthread"],[
-+	AC_MSG_RESULT(no)])
-+    LIBS=$kde_safe_libs
-+  fi
-+
-+  dnl Un-special-case for FreeBSD.
-+  if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-+    LIBPTHREAD=""
-+  fi
-+
-+  AC_SUBST(LIBPTHREAD)
-+])
-+
-+AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-+[
-+      USE_THREADS=""
-+      if test -z "$LIBPTHREAD"; then
-+        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
-+      fi
-+
-+    AH_VERBATIM(__svr_define, [
-+#if defined(__SVR4) && !defined(__svr4__)
-+#define __svr4__ 1
-+#endif
-+])
-+    case $host_os in
-+ 	solaris*)
-+		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-+                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-+    		;;
-+        freebsd*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-+                ;;
-+        aix*)
-+                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-+                LIBPTHREAD="$LIBPTHREAD -lc_r"
-+                ;;
-+        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+                if test "$CXX" = "KCC"; then
-+                  CXXFLAGS="$CXXFLAGS --thread_safe"
-+		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-+                fi
-+                ;;
-+	*)
-+		;;
-+    esac
-+    AC_SUBST(USE_THREADS)
-+    AC_SUBST(LIBPTHREAD)
-+])
-+
-+AC_DEFUN([KDE_CHECK_THREADING],
-+[
-+  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-+  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-+  dnl default is yes if libpthread is found and no if no libpthread is available
-+  if test -z "$LIBPTHREAD"; then
-+    if test -z "$USE_THREADS"; then
-+      kde_check_threading_default=no
-+    else
-+      kde_check_threading_default=yes
-+    fi
-+  else
-+    kde_check_threading_default=yes
-+  fi
-+  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
-+   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
-+  if test "x$kde_use_threading" = "xyes"; then
-+    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
-+  fi
-+])
-+
-+AC_DEFUN([KDE_TRY_LINK_PYTHON],
-+[
-+if test "$kde_python_link_found" = no; then
-+
-+if test "$1" = normal; then
-+  AC_MSG_CHECKING(if a Python application links)
-+else
-+  AC_MSG_CHECKING(if Python depends on $2)
-+fi
-+
-+AC_CACHE_VAL(kde_cv_try_link_python_$1,
-+[
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+AC_TRY_LINK(
-+[
-+#include <Python.h>
-+],[
-+	PySys_SetArgv(1, 0);
-+],
-+	[kde_cv_try_link_python_$1=yes],
-+	[kde_cv_try_link_python_$1=no]
-+)
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+])
-+
-+if test "$kde_cv_try_link_python_$1" = "yes"; then
-+  AC_MSG_RESULT(yes)
-+  kde_python_link_found=yes
-+  if test ! "$1" = normal; then
-+    LIBPYTHON="$LIBPYTHON $2"
-+  fi
-+  $3
-+else
-+  AC_MSG_RESULT(no)
-+  $4
-+fi
-+
-+fi
-+
-+])
-+
-+AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-+[
-+AC_MSG_CHECKING([for Python directory])
-+ 
-+AC_CACHE_VAL(kde_cv_pythondir,
-+[
-+  if test -z "$PYTHONDIR"; then
-+    kde_cv_pythondir=/usr/local
-+  else
-+    kde_cv_pythondir="$PYTHONDIR"
-+  fi
-+])
-+ 
-+AC_ARG_WITH(pythondir,
-+AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-+[
-+  ac_python_dir=$withval
-+], ac_python_dir=$kde_cv_pythondir
-+)
-+ 
-+AC_MSG_RESULT($ac_python_dir)
-+])
-+
-+AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-+[
-+AC_REQUIRE([KDE_CHECK_LIBDL])
-+AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-+AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-+
-+if test -z "$1"; then
-+  version="1.5"
-+else
-+  version="$1"
-+fi
-+
-+AC_MSG_CHECKING([for Python$version])
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-+if test ! -r $python_incdir/Python.h; then
-+  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
-+  python_incdir=$python_incdir/python$version
-+  if test ! -r $python_incdir/Python.h; then
-+    python_incdir=no
-+  fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-+AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-+if test ! -r $python_libdir/libpython$version.so; then
-+  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
-+  if test ! -r $python_libdir/libpython$version.a; then
-+    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-+    python_libdir=$python_libdir/python$version/config
-+    if test ! -r $python_libdir/libpython$version.a; then
-+      python_libdir=no
-+    fi
-+  fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+  LIBPYTHON=-lpython$version
-+fi
-+
-+AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+  python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-+
-+if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-+   LIBPYTHON=$kde_orig_LIBPYTHON
-+   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+   $2
-+else 
-+  dnl Note: this test is very weak
-+  kde_python_link_found=no
-+  KDE_TRY_LINK_PYTHON(normal)
-+  KDE_TRY_LINK_PYTHON(m, -lm)
-+  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
-+  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
-+  KDE_TRY_LINK_PYTHON(db2, -ldb2)
-+  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
-+  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-+  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
-+  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
-+  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-+	[AC_MSG_WARN([it seems, Python depends on another library.
-+    Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+    and contact the authors to let them know about this problem])
-+	])
-+
-+  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+  AC_SUBST(PYTHONINC)
-+  AC_SUBST(PYTHONLIB)
-+  AC_SUBST(LIBPYTHON)
-+  AC_SUBST(PYTHONMODDIR)
-+  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-+fi
-+
-+])
-+
-+
-+AC_DEFUN([KDE_CHECK_PYTHON],
-+[
-+  KDE_CHECK_PYTHON_INTERN("2.6",
-+    [KDE_CHECK_PYTHON_INTERN("2.5",
-+      [KDE_CHECK_PYTHON_INTERN("2.4",
-+        [KDE_CHECK_PYTHON_INTERN("2.3", 
-+          [KDE_CHECK_PYTHON_INTERN("2.2", 
-+            [KDE_CHECK_PYTHON_INTERN("2.1", 
-+              [KDE_CHECK_PYTHON_INTERN("2.0", 
-+                [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-+              ])
-+            ])
-+          ])
-+        ])
-+      ])
-+    ])
-+])
-+
-+AC_DEFUN([KDE_CHECK_STL],
-+[
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_save_CXXFLAGS="$CXXFLAGS"
-+    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-+
-+    AC_MSG_CHECKING([if C++ programs can be compiled])
-+    AC_CACHE_VAL(kde_cv_stl_works,
-+    [
-+      AC_TRY_COMPILE([
-+#include <string>
-+using namespace std;
-+],[
-+  string astring="Hallo Welt.";
-+  astring.erase(0, 6); // now astring is "Welt"
-+  return 0;
-+], kde_cv_stl_works=yes,
-+   kde_cv_stl_works=no)
-+])
-+
-+   AC_MSG_RESULT($kde_cv_stl_works)
-+
-+   if test "$kde_cv_stl_works" = "yes"; then
-+     # back compatible
-+	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-+   else
-+	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-+Check config.log for details - if you're using a Linux distribution you might miss
-+a package named similar to libstdc++-dev.])
-+   fi
-+
-+   CXXFLAGS="$ac_save_CXXFLAGS"
-+   AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([AC_FIND_QIMGIO],
-+   [AC_REQUIRE([AC_FIND_JPEG])
-+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-+AC_MSG_CHECKING([for qimgio])
-+AC_CACHE_VAL(ac_cv_lib_qimgio,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+ac_save_LIBS="$LIBS"
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-+CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-+AC_TRY_RUN(dnl
-+[
-+#include <qimageio.h>
-+#include <qstring.h>
-+int main() {
-+		QString t = "hallo";
-+		t.fill('t');
-+		qInitImageIO();
-+}
-+],
-+            ac_cv_lib_qimgio=yes,
-+            ac_cv_lib_qimgio=no,
-+	    ac_cv_lib_qimgio=no)
-+LIBS="$ac_save_LIBS"
-+CXXFLAGS="$ac_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])dnl
-+if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
-+  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
-+  AC_SUBST(LIBQIMGIO)
-+else
-+  AC_MSG_RESULT(not found)
-+fi
-+])
-+
-+AC_DEFUN([AM_DISABLE_LIBRARIES],
-+[
-+    AC_PROVIDE([AM_ENABLE_STATIC])
-+    AC_PROVIDE([AM_ENABLE_SHARED])
-+    enable_static=no
-+    enable_shared=yes
-+])
-+
-+
-+AC_DEFUN([AC_CHECK_UTMP_FILE],
-+[
-+    AC_MSG_CHECKING([for utmp file])
-+
-+    AC_CACHE_VAL(kde_cv_utmp_file,
-+    [
-+    kde_cv_utmp_file=no
-+
-+    for ac_file in    \
-+                      \
-+	/var/run/utmp \
-+	/var/adm/utmp \
-+	/etc/utmp     \
-+     ; \
-+    do
-+     if test -r "$ac_file"; then
-+       kde_cv_utmp_file=$ac_file
-+       break
-+     fi
-+    done
-+    ])
-+
-+    if test "$kde_cv_utmp_file" != "no"; then
-+	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+	$1
-+	AC_MSG_RESULT($kde_cv_utmp_file)
-+    else
-+    	$2
-+	AC_MSG_RESULT([non found])
-+    fi
-+])
-+
-+
-+AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-+[
-+
-+DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-+TOPSUBDIRS=""
-+
-+if test ! -s $srcdir/subdirs; then
-+  dnl Note: Makefile.common creates subdirs, so this is just a fallback
-+  files=`cd $srcdir && ls -1`
-+  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-+  for i in $dirs; do
-+    echo $i >> $srcdir/subdirs
-+  done
-+fi
-+
-+ac_topsubdirs=
-+if test -s $srcdir/inst-apps; then
-+  ac_topsubdirs="`cat $srcdir/inst-apps`"
-+elif test -s $srcdir/subdirs; then
-+  ac_topsubdirs="`cat $srcdir/subdirs`"
-+fi
-+
-+for i in $ac_topsubdirs; do
-+  AC_MSG_CHECKING([if $i should be compiled])
-+  if test -d $srcdir/$i; then
-+    install_it="yes"
-+    for j in $DO_NOT_COMPILE; do
-+      if test $i = $j; then
-+        install_it="no"
-+      fi
-+    done
-+  else
-+    install_it="no"
-+  fi
-+  AC_MSG_RESULT($install_it)
-+  vari=`echo $i | sed -e 's,[[-+.@]],_,g'`
-+  if test $install_it = "yes"; then
-+    TOPSUBDIRS="$TOPSUBDIRS $i"
-+    eval "$vari""_SUBDIR_included=yes"
-+  else
-+    eval "$vari""_SUBDIR_included=no"
-+  fi
-+done
-+
-+AC_SUBST(TOPSUBDIRS)
-+])
-+
-+AC_DEFUN([KDE_CHECK_NAMESPACES],
-+[
-+AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+AC_TRY_COMPILE([
-+],
-+[
-+namespace Foo {
-+  extern int i;
-+  namespace Bar {
-+    extern int i;
-+  }
-+}
-+
-+int Foo::i = 0;
-+int Foo::Bar::i = 1;
-+],[
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE(HAVE_NAMESPACES)
-+], [
-+AC_MSG_RESULT(no)
-+])
-+AC_LANG_RESTORE
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_CHECK_S_ISSOCK],
-+[
-+AC_MSG_CHECKING(for S_ISSOCK)
-+AC_CACHE_VAL(ac_cv_have_s_issock,
-+[
-+AC_TRY_LINK(
-+[
-+#include <sys/stat.h>
-+],
-+[
-+struct stat buff;
-+int b = S_ISSOCK( buff.st_mode );
-+],
-+ac_cv_have_s_issock=yes,
-+ac_cv_have_s_issock=no)
-+])
-+AC_MSG_RESULT($ac_cv_have_s_issock)
-+if test "$ac_cv_have_s_issock" = "yes"; then
-+  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-+fi
-+
-+AH_VERBATIM(_ISSOCK,
-+[
-+#ifndef HAVE_S_ISSOCK
-+#define HAVE_S_ISSOCK
-+#define S_ISSOCK(mode) (1==0)
-+#endif
-+])
-+
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-+[
-+AC_MSG_CHECKING(for MAXPATHLEN)
-+AC_CACHE_VAL(ac_cv_maxpathlen,
-+[
-+cat > conftest.$ac_ext <<EOF
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/param.h>
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+
-+KDE_HELLO MAXPATHLEN
-+
-+EOF
-+
-+ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-+
-+if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-+    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-+else
-+    ac_cv_maxpathlen=1024
-+fi
-+
-+rm conftest.*
-+
-+])
-+AC_MSG_RESULT($ac_cv_maxpathlen)
-+AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-+])
-+
-+AC_DEFUN([KDE_CHECK_HEADER],
-+[
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-+   AC_LANG_RESTORE
-+   CPPFLAGS=$kde_safe_cppflags
-+])
-+
-+AC_DEFUN([KDE_CHECK_HEADERS],
-+[
-+   AH_CHECK_HEADERS([$1])
-+   AC_LANG_SAVE
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+   AC_LANG_CPLUSPLUS
-+   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
-+   CPPFLAGS=$kde_safe_cppflags
-+   AC_LANG_RESTORE
-+])
-+
-+AC_DEFUN([KDE_FAST_CONFIGURE],
-+[
-+  dnl makes configure fast (needs perl)
-+  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
-+      with_fast_perl=$enableval, with_fast_perl=yes)
-+])
-+
-+AC_DEFUN([KDE_CONF_FILES],
-+[
-+  val=
-+  if test -f $srcdir/configure.files ; then
-+    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-+  fi
-+  CONF_FILES=
-+  if test -n "$val" ; then
-+    for i in $val ; do
-+      CONF_FILES="$CONF_FILES $i"
-+    done
-+  fi
-+  AC_SUBST(CONF_FILES)
-+])dnl
-+
-+dnl This sets the prefix, for arts and kdelibs
-+dnl Do NOT use in any other module.
-+dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
-+AC_DEFUN([KDE_SET_PREFIX_CORE],
-+[
-+  unset CDPATH
-+  dnl make $KDEDIR the default for the installation
-+  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-+
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$ac_default_prefix
-+    ac_configure_args="$ac_configure_args --prefix=$prefix"
-+  fi
-+  # And delete superfluous '/' to make compares easier
-+  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+
-+  kde_libs_prefix='$(prefix)'
-+  kde_libs_htmldir='$(kde_htmldir)'
-+  AC_SUBST(kde_libs_prefix)
-+  AC_SUBST(kde_libs_htmldir)
-+  KDE_FAST_CONFIGURE
-+  KDE_CONF_FILES
-+])
-+
-+
-+AC_DEFUN([KDE_SET_PREFIX],
-+[
-+  unset CDPATH
-+  dnl We can't give real code to that macro, only a value.
-+  dnl It only matters for --help, since we set the prefix in this function anyway.
-+  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
-+
-+  KDE_SET_DEFAULT_BINDIRS
-+  if test "x$prefix" = "xNONE"; then
-+    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
-+    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
-+  else
-+    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
-+    kde_save_PATH="$PATH"
-+    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-+    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
-+    PATH="$kde_save_PATH"
-+  fi
-+
-+  kde_libs_prefix=`$KDECONFIG --prefix`
-+  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-+                    This means it has been moved since you installed it.
-+                    This won't work. Please recompile kdelibs for the new prefix.
-+                    ])
-+  fi
-+  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-+
-+  AC_MSG_CHECKING([where to install])
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$kde_libs_prefix
-+    AC_MSG_RESULT([$prefix (as returned by kde-config)])
-+  else
-+    dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
-+    given_prefix=$prefix
-+    AC_MSG_RESULT([$prefix (as requested)])
-+  fi
-+
-+  # And delete superfluous '/' to make compares easier
-+  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+  given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-+
-+  AC_SUBST(KDECONFIG)
-+  AC_SUBST(kde_libs_prefix)
-+  AC_SUBST(kde_libs_htmldir)
-+
-+  KDE_FAST_CONFIGURE
-+  KDE_CONF_FILES
-+])
-+
-+pushdef([AC_PROG_INSTALL],
-+[
-+  dnl our own version, testing for a -p flag
-+  popdef([AC_PROG_INSTALL])
-+  dnl as AC_PROG_INSTALL works as it works we first have
-+  dnl to save if the user didn't specify INSTALL, as the
-+  dnl autoconf one overwrites INSTALL and we have no chance to find
-+  dnl out afterwards
-+  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-+  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-+  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-+  AC_PROG_INSTALL
-+
-+  if test -z "$kde_save_INSTALL_given" ; then
-+    # OK, user hasn't given any INSTALL, autoconf found one for us
-+    # now we test, if it supports the -p flag
-+    AC_MSG_CHECKING(for -p flag to install)
-+    rm -f confinst.$$.* > /dev/null 2>&1
-+    echo "Testtest" > confinst.$$.orig
-+    ac_res=no
-+    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-+      if test -f confinst.$$.new ; then
-+        # OK, -p seems to do no harm to install
-+	INSTALL="${INSTALL} -p"
-+	ac_res=yes
-+      fi
-+    fi
-+    rm -f confinst.$$.*
-+    AC_MSG_RESULT($ac_res)
-+  fi
-+  dnl the following tries to resolve some signs and wonders coming up
-+  dnl with different autoconf/automake versions
-+  dnl e.g.:
-+  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
-+  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
-+  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
-+  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
-+  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
-+  dnl   install-@DIR@PROGRAMS targets to explicitly use that flag
-+  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
-+  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
-+  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
-+  dnl  *sometimes KDE does not use the install-@DIR@PROGRAM targets from
-+  dnl   automake (due to broken Makefile.am or whatever) to install programs,
-+  dnl   and so does not see the -s flag in automake > 1.4
-+  dnl to clean up that mess we:
-+  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
-+  dnl   which cleans KDE's program with automake > 1.4;
-+  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
-+  dnl   with automake<=1.4
-+  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
-+  dnl   properly uses install-@DIR@PROGRAMS, but I don't care
-+  dnl
-+  dnl And to all this comes, that I even can't write in comments variable
-+  dnl  names used by automake, because it is so stupid to think I wanted to
-+  dnl  _use_ them, therefor I have written A_M_... instead of AM_
-+  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-+
-+  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-+    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-+  fi
-+  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-+    INSTALL_SCRIPT='${INSTALL}'
-+  fi
-+])dnl
-+
-+AC_DEFUN([KDE_LANG_CPLUSPLUS],
-+[AC_LANG_CPLUSPLUS
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-+pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-+])
-+
-+pushdef([AC_LANG_CPLUSPLUS],
-+[popdef([AC_LANG_CPLUSPLUS])
-+KDE_LANG_CPLUSPLUS
-+])
-+
-+AC_DEFUN([KDE_CHECK_LONG_LONG],
-+[
-+AC_MSG_CHECKING(for long long)
-+AC_CACHE_VAL(kde_cv_c_long_long,
-+[
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  AC_TRY_LINK([], [
-+  long long foo = 0;
-+  foo = foo+1;
-+  ],
-+  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
-+  AC_LANG_RESTORE
-+])
-+AC_MSG_RESULT($kde_cv_c_long_long)
-+if test "$kde_cv_c_long_long" = yes; then
-+   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-+fi
-+])
-+
-+AC_DEFUN([KDE_CHECK_LIB],
-+[
-+     kde_save_LDFLAGS="$LDFLAGS"
-+     dnl AC_CHECK_LIB modifies LIBS, so save it here
-+     kde_save_LIBS="$LIBS"
-+     LDFLAGS="$LDFLAGS $all_libraries"
-+     case $host_os in
-+      aix*) LDFLAGS="-brtl $LDFLAGS"
-+	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-+	;;
-+     esac
-+     AC_CHECK_LIB($1, $2, $3, $4, $5)
-+     LDFLAGS="$kde_save_LDFLAGS"
-+     LIBS="$kde_save_LIBS"
-+])
-+
-+AC_DEFUN([KDE_JAVA_PREFIX],
-+[
-+	dir=`dirname "$1"`
-+	base=`basename "$1"`
-+	list=`ls -1 $dir 2> /dev/null`
-+	for entry in $list; do 
-+		if test -d $dir/$entry/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/bin"
-+				;;
-+			esac
-+		elif test -d $dir/$entry/jre/bin; then
-+			case $entry in
-+			   $base)
-+				javadirs="$javadirs $dir/$entry/jre/bin"
-+				;;
-+			esac
-+		fi
-+	done
-+])
-+
-+dnl KDE_CHEC_JAVA_DIR(onlyjre)
-+AC_DEFUN([KDE_CHECK_JAVA_DIR],
-+[
-+
-+AC_ARG_WITH(java,
-+AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-+[  ac_java_dir=$withval
-+], ac_java_dir=""
-+)
-+
-+AC_MSG_CHECKING([for Java])
-+
-+dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-+if test "x$ac_java_dir" = "xno"; then
-+   kde_java_bindir=no
-+   kde_java_includedir=no
-+   kde_java_libjvmdir=no
-+   kde_java_libgcjdir=no
-+   kde_java_libhpidir=no
-+else
-+  if test "x$ac_java_dir" = "x"; then
-+     
-+     
-+      dnl No option set -> collect list of candidate paths
-+      if test -n "$JAVA_HOME"; then
-+        KDE_JAVA_PREFIX($JAVA_HOME)
-+      fi
-+      KDE_JAVA_PREFIX(/usr/j2se)
-+      KDE_JAVA_PREFIX(/usr/lib/j2se)
-+      KDE_JAVA_PREFIX(/usr/j*dk*)
-+      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
-+      KDE_JAVA_PREFIX(/opt/j*sdk*)
-+      KDE_JAVA_PREFIX(/usr/lib/java*)
-+      KDE_JAVA_PREFIX(/usr/java*)
-+      KDE_JAVA_PREFIX(/usr/java/j*dk*)
-+      KDE_JAVA_PREFIX(/usr/java/j*re*)
-+      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
-+      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
-+      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-+      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-+      KDE_JAVA_PREFIX(/opt/java*)
-+
-+      kde_cv_path="NONE"
-+      kde_save_IFS=$IFS
-+      IFS=':'
-+      for dir in $PATH; do
-+	  if test -d "$dir"; then
-+	      javadirs="$javadirs $dir"
-+	  fi
-+      done
-+      IFS=$kde_save_IFS
-+      jredirs=
-+
-+      dnl Now javadirs contains a list of paths that exist, all ending with bin/
-+      for dir in $javadirs; do
-+          dnl Check for the java executable
-+	  if test -x "$dir/java"; then
-+	      sane_path=$(cd $dir; /bin/pwd)
-+	      dnl And also check for a libjvm.so somewhere under there
-+	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
-+              if test "$sane_path" != "/usr/bin"; then
-+                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-+		  jredirs="$jredirs $dir"
-+	      fi
-+	  fi
-+      done
-+
-+      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
-+      JAVAC=
-+      JAVA=
-+      kde_java_bindir=no
-+      for dir in $jredirs; do
-+	  JAVA="$dir/java"
-+	  kde_java_bindir=$dir
-+	  if test -x "$dir/javac"; then
-+		JAVAC="$dir/javac"
-+                break
-+	  fi
-+      done
-+
-+      if test -n "$JAVAC"; then
-+          dnl this substitution might not work - well, we test for jni.h below
-+          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-+      else
-+          kde_java_includedir=no
-+      fi
-+  else
-+    dnl config option set
-+    kde_java_bindir=$ac_java_dir/bin
-+    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-+	kde_java_includedir=no
-+    else
-+        kde_java_includedir=$ac_java_dir/include
-+    fi
-+  fi
-+fi
-+
-+dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-+if test "x$kde_java_bindir" != "xno"; then
-+
-+  dnl Look for libjvm.so
-+  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-+  dnl Look for libgcj.so
-+  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-+  dnl Look for libhpi.so and avoid green threads
-+  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-+
-+  dnl Now check everything's fine under there
-+  dnl the include dir is our flag for having the JDK
-+  if test -d "$kde_java_includedir"; then
-+    if test ! -x "$kde_java_bindir/javac"; then
-+      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
-+    fi
-+    if test ! -x "$kde_java_bindir/javah"; then
-+      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+    fi
-+    if test ! -x "$kde_java_bindir/jar"; then
-+      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+    fi
-+    if test ! -r "$kde_java_includedir/jni.h"; then
-+      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
-+    fi
-+
-+    jni_includes="-I$kde_java_includedir"
-+    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-+    dnl and under linux here.. 
-+    
-+    dnl not needed for gcj
-+
-+    if test "x$kde_java_libgcjdir" = "x"; then 
-+      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-+      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-+      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-+    fi
-+
-+  else
-+    JAVAC=
-+    jni_includes=
-+  fi
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then 
-+     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-+        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-+     fi 
-+  else
-+     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-+        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-+     fi 
-+  fi
-+
-+  if test ! -x "$kde_java_bindir/java"; then
-+      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-+  fi
-+
-+  dnl not needed for gcj compile
-+
-+  if test "x$kde_java_libgcjdir" = "x"; then 
-+      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-+        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-+      fi
-+  fi
-+
-+  if test -n "$jni_includes"; then
-+    dnl Check for JNI version
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    ac_cxxflags_safe="$CXXFLAGS"
-+    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-+
-+    AC_TRY_COMPILE([
-+  #include <jni.h>
-+	      ],
-+	      [
-+  #ifndef JNI_VERSION_1_2
-+  Syntax Error
-+  #endif
-+	      ],[ kde_jni_works=yes ],
-+	      [ kde_jni_works=no ])
-+
-+    if test $kde_jni_works = no; then
-+      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
-+		    You need to have Java Development Kit (JDK) version 1.2. 
-+
-+		    Use --with-java to specify another location.
-+		    Use --without-java to configure without java support.
-+		    Or download a newer JDK and try again. 
-+		    See e.g. http://java.sun.com/products/jdk/1.2 ])
-+    fi
-+
-+    CXXFLAGS="$ac_cxxflags_safe"    
-+    AC_LANG_RESTORE
-+
-+    dnl All tests ok, inform and subst the variables
-+
-+    JAVAC=$kde_java_bindir/javac
-+    JAVAH=$kde_java_bindir/javah
-+    JAR=$kde_java_bindir/jar
-+    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+    if test "x$kde_java_libgcjdir" = "x"; then 
-+      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-+    else
-+      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-+    fi
-+    AC_MSG_RESULT([java JDK in $kde_java_bindir])
-+
-+  else
-+      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+      AC_MSG_RESULT([java JRE in $kde_java_bindir])
-+  fi
-+elif test -d "/Library/Java/Home"; then
-+  kde_java_bindir="/Library/Java/Home/bin"
-+  jni_includes="-I/Library/Java/Home/include"
-+
-+  JAVAC=$kde_java_bindir/javac
-+  JAVAH=$kde_java_bindir/javah
-+  JAR=$kde_java_bindir/jar
-+  JVMLIBS="-Wl,-framework,JavaVM"
-+
-+  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-+  AC_MSG_RESULT([Apple Java Framework])
-+else
-+  AC_MSG_RESULT([none found])
-+fi
-+
-+AC_SUBST(JAVAC)
-+AC_SUBST(JAVAH)
-+AC_SUBST(JAR)
-+AC_SUBST(JVMLIBS)
-+AC_SUBST(jni_includes)
-+
-+# for backward compat
-+kde_cv_java_includedir=$kde_java_includedir
-+kde_cv_java_bindir=$kde_java_bindir
-+])
-+
-+dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-+dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-+dnl big packages, m4_foreach is dog-slow.  So use our own version of
-+dnl it.  (matz@kde.org)
-+m4_define([mm_foreach],
-+[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-+m4_define([mm_car], [[$1]])
-+m4_define([mm_car2], [[$@]])
-+m4_define([_mm_foreach],
-+[m4_if(m4_quote($2), [], [],
-+       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
-+                                                   mm_car2(m4_shift($2)),
-+                                                   [$3])])])
-+m4_define([AC_FOREACH],
-+[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-+
-+AC_DEFUN([KDE_NEED_FLEX],
-+[
-+kde_libs_safe=$LIBS
-+LIBS="$LIBS $USER_LDFLAGS"
-+AM_PROG_LEX
-+LIBS=$kde_libs_safe
-+if test -z "$LEXLIB"; then
-+    AC_MSG_ERROR([You need to have flex installed.])
-+fi
-+AC_SUBST(LEXLIB)
-+])
-+
-+AC_DEFUN([AC_PATH_QTOPIA],
-+[
-+  dnl TODO: use AC_CACHE_VAL
-+
-+  if test -z "$1"; then
-+    qtopia_minver_maj=1
-+    qtopia_minver_min=5
-+    qtopia_minver_pat=0
-+  else
-+    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
-+    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
-+    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
-+  fi
-+
-+  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
-+  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-+
-+  AC_REQUIRE([AC_PATH_QT])
-+
-+  AC_MSG_CHECKING([for Qtopia])
-+
-+  LIB_QTOPIA="-lqpe"
-+  AC_SUBST(LIB_QTOPIA)
-+
-+  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-+
-+  ac_qtopia_incdir=NO
-+
-+  AC_ARG_WITH(qtopia-dir,
-+              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
-+              [  ac_qtopia_incdir="$withval"/include] ) 
-+  
-+  qtopia_incdirs=""
-+  for dir in $kde_qtopia_dirs; do
-+    qtopia_incdirs="$qtopia_incdirs $dir/include"
-+  done
-+
-+  if test ! "$ac_qtopia_incdir" = "NO"; then
-+    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
-+  fi
-+
-+  qtopia_incdir=""
-+  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
-+  ac_qtopia_incdir="$qtopia_incdir"
-+
-+  if test -z "$qtopia_incdir"; then
-+    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
-+  fi
-+
-+  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
-+  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
-+  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-+
-+  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
-+  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
-+  if test "$qtopia_ver" -lt "$qtopia_minver"; then
-+    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-+is required.])
-+  fi
-+
-+  AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+
-+  ac_cxxflags_safe="$CXXFLAGS"
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-+  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-+
-+  cat > conftest.$ac_ext <<EOF
-+#include "confdefs.h"
-+#include <qpe/qpeapplication.h>
-+#include <qpe/version.h>
-+
-+int main( int argc, char **argv )
-+{
-+    QPEApplication app( argc, argv );
-+    return 0;
-+}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-+    rm -f conftest*
-+  else
-+    rm -f conftest*
-+    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-+the end of config.log])
-+  fi
-+
-+  CXXFLAGS="$ac_cxxflags_safe"
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  AC_LANG_RESTORE
-+
-+  QTOPIA_INCLUDES="-I$qtopia_incdir"
-+  AC_SUBST(QTOPIA_INCLUDES)
-+
-+  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-+])
-+
-+
-+AC_DEFUN([KDE_INIT_DOXYGEN],
-+[
-+AC_MSG_CHECKING([for Qt docs])
-+kde_qtdir=
-+if test "${with_qt_dir+set}" = set; then
-+  kde_qtdir="$with_qt_dir"
-+fi
-+
-+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_MSG_RESULT($QTDOCDIR)
-+
-+AC_SUBST(QTDOCDIR)
-+
-+KDE_FIND_PATH(dot, DOT, [], [])
-+if test -n "$DOT"; then
-+  KDE_HAVE_DOT="YES"
-+else
-+  KDE_HAVE_DOT="NO"
-+fi
-+AC_SUBST(KDE_HAVE_DOT)
-+KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-+AC_SUBST(DOXYGEN)
-+
-+DOXYGEN_PROJECT_NAME="$1"
-+DOXYGEN_PROJECT_NUMBER="$2"
-+AC_SUBST(DOXYGEN_PROJECT_NAME)
-+AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-+
-+KDE_HAS_DOXYGEN=no
-+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-+  KDE_HAS_DOXYGEN=yes
-+fi
-+AC_SUBST(KDE_HAS_DOXYGEN)
-+
-+])
-+
-+
-+AC_DEFUN([AC_FIND_BZIP2],
-+[
-+AC_MSG_CHECKING([for bzDecompress in libbz2])
-+AC_CACHE_VAL(ac_cv_lib_bzip2,
-+[
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+kde_save_LIBS="$LIBS"
-+LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-+kde_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-+AC_TRY_LINK(dnl
-+[
-+#define BZ_NO_STDIO
-+#include<bzlib.h>
-+],
-+            [ bz_stream s; (void) bzDecompress(&s); ],
-+            eval "ac_cv_lib_bzip2='-lbz2'",
-+            eval "ac_cv_lib_bzip2=no")
-+LIBS="$kde_save_LIBS"
-+CXXFLAGS="$kde_save_CXXFLAGS"
-+AC_LANG_RESTORE
-+])dnl
-+AC_MSG_RESULT($ac_cv_lib_bzip2)
-+
-+if test ! "$ac_cv_lib_bzip2" = no; then
-+  BZIP2DIR=bzip2
-+
-+  LIBBZ2="$ac_cv_lib_bzip2"
-+  AC_SUBST(LIBBZ2)
-+
-+else
-+
-+   cxx_shared_flag=
-+   ld_shared_flag=
-+   KDE_CHECK_COMPILER_FLAG(shared, [
-+	ld_shared_flag="-shared"
-+   ])
-+   KDE_CHECK_COMPILER_FLAG(fPIC, [
-+        cxx_shared_flag="-fPIC"
-+   ])
-+
-+   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
-+   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
-+   [
-+   AC_LANG_SAVE
-+   AC_LANG_CPLUSPLUS
-+   kde_save_LIBS="$LIBS"
-+   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-+   kde_save_CXXFLAGS="$CXXFLAGS"
-+   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-+
-+   AC_TRY_LINK(dnl
-+   [
-+   #define BZ_NO_STDIO
-+   #include<bzlib.h>
-+   ],
-+               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
-+               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
-+               eval "ac_cv_lib_bzip2_prefix=no")
-+   LIBS="$kde_save_LIBS"
-+   CXXFLAGS="$kde_save_CXXFLAGS"
-+   AC_LANG_RESTORE
-+   ])dnl
-+
-+   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-+   
-+   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-+     BZIP2DIR=bzip2
-+    
-+     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-+     AC_SUBST(LIBBZ2)
-+
-+     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
-+   dnl else, we just ignore this
-+   fi
-+
-+fi
-+AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-+])
-+
-+dnl ------------------------------------------------------------------------
-+dnl Try to find the SSL headers and libraries.
-+dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-+dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-+dnl ------------------------------------------------------------------------
-+dnl
-+AC_DEFUN([KDE_CHECK_SSL],
-+[
-+LIBSSL="-lssl -lcrypto"
-+AC_REQUIRE([KDE_CHECK_LIB64])
-+
-+ac_ssl_includes=NO ac_ssl_libraries=NO
-+ssl_libraries=""
-+ssl_includes=""
-+AC_ARG_WITH(ssl-dir,
-+    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
-+    [  ac_ssl_includes="$withval"/include
-+       ac_ssl_libraries="$withval"/lib$kdelibsuff
-+    ])
-+
-+want_ssl=yes
-+AC_ARG_WITH(ssl,
-+    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
-+    [want_ssl=$withval])
-+
-+if test $want_ssl = yes; then
-+
-+AC_MSG_CHECKING(for OpenSSL)
-+
-+AC_CACHE_VAL(ac_cv_have_ssl,
-+[#try to guess OpenSSL locations
-+  
-+  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-+  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-+  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
-+  ac_ssl_includes="$ssl_incdir"
-+
-+  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-+  if test ! "$ac_ssl_libraries" = "NO"; then
-+    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-+  fi
-+
-+  test=NONE
-+  ssl_libdir=NONE
-+  for dir in $ssl_libdirs; do
-+    try="ls -1 $dir/libssl*"
-+    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-+  done
-+
-+  ac_ssl_libraries="$ssl_libdir"
-+
-+  ac_ldflags_safe="$LDFLAGS"
-+  ac_libs_safe="$LIBS"
-+
-+  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-+  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-+
-+  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
-+  ac_ssl_rsaref="yes"
-+  ,
-+  ac_ssl_rsaref="no"
-+  )
-+
-+  LDFLAGS="$ac_ldflags_safe"
-+  LIBS="$ac_libs_safe"
-+
-+  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-+    have_ssl=no
-+  else
-+    have_ssl=yes;
-+  fi
-+
-+  ])
-+
-+  eval "$ac_cv_have_ssl"
-+
-+  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-+
-+  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
-+  AC_MSG_RESULT($ac_ssl_rsaref)
-+
-+  AC_MSG_CHECKING([for easter eggs])
-+  AC_MSG_RESULT([none found])
-+
-+else
-+  have_ssl=no
-+fi
-+
-+if test "$have_ssl" = yes; then
-+  AC_MSG_CHECKING(for OpenSSL version)
-+  dnl Check for SSL version
-+  AC_CACHE_VAL(ac_cv_ssl_version,
-+  [
-+
-+    cat >conftest.$ac_ext <<EOF
-+#include <openssl/opensslv.h>
-+#include <stdio.h>
-+    int main() {
-+ 
-+#ifndef OPENSSL_VERSION_NUMBER
-+      printf("ssl_version=\\"error\\"\n");
-+#else
-+      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-+        printf("ssl_version=\\"old\\"\n");
-+      else
-+        printf("ssl_version=\\"ok\\"\n");
-+#endif
-+     return (0);
-+    }
-+EOF
-+
-+    ac_save_CPPFLAGS=$CPPFLAGS
-+    if test "$ac_ssl_includes" != "/usr/include"; then
-+        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-+    fi
-+
-+    if AC_TRY_EVAL(ac_link); then 
-+
-+      if eval `./conftest 2>&5`; then
-+        if test $ssl_version = error; then
-+          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
-+        else
-+          if test $ssl_version = old; then
-+            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
-+            have_ssl=no
-+          fi
-+        fi
-+        ac_cv_ssl_version="ssl_version=$ssl_version"
-+      else
-+        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
-+        Check config.log, and if you can't figure it out, send a mail to 
-+        David Faure <faure@kde.org>, attaching your config.log])
-+      fi
-+
-+    else
-+      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
-+      Check config.log, and if you can't figure it out, send a mail to 
-+      David Faure <faure@kde.org>, attaching your config.log])
-+    fi 
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+
-+  ])
-+
-+  eval "$ac_cv_ssl_version"
-+  AC_MSG_RESULT($ssl_version)
-+fi
-+
-+if test "$have_ssl" != yes; then
-+  LIBSSL="";
-+else
-+  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
-+  ac_cv_have_ssl="have_ssl=yes \
-+    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-+  
-+  
-+  ssl_libraries="$ac_ssl_libraries"
-+  ssl_includes="$ac_ssl_includes"
-+
-+  if test "$ac_ssl_rsaref" = yes; then
-+    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
-+  fi
-+
-+  if test $ssl_version = "old"; then
-+    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
-+  fi
-+fi
-+
-+SSL_INCLUDES=
-+
-+if test "$ssl_includes" = "/usr/include"; then
-+  if test -f /usr/kerberos/include/krb5.h; then
-+	SSL_INCLUDES="-I/usr/kerberos/include"
-+  fi
-+elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-+  SSL_INCLUDES="-I$ssl_includes"
-+fi
-+
-+if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
-+ SSL_LDFLAGS=""
-+else
-+ SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-+fi
-+
-+AC_SUBST(SSL_INCLUDES)
-+AC_SUBST(SSL_LDFLAGS)
-+AC_SUBST(LIBSSL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_STRLCPY],
-+[
-+  AC_REQUIRE([AC_CHECK_STRLCAT])
-+  AC_REQUIRE([AC_CHECK_STRLCPY])
-+  AC_CHECK_SIZEOF(size_t)
-+  AC_CHECK_SIZEOF(unsigned long)
-+
-+  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
-+  AC_TRY_COMPILE(,[
-+    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-+       choke me
-+    #endif
-+    ],AC_MSG_RESULT([yes]),[
-+      AC_MSG_RESULT(no)
-+      AC_MSG_ERROR([
-+       Apparently on your system our assumption sizeof size_t == sizeof unsigned long 
-+       does not apply. Please mail kde-devel@kde.org with a description of your system!
-+      ])
-+  ])
-+])
-+
-+AC_DEFUN([KDE_CHECK_BINUTILS],
-+[
-+  AC_MSG_CHECKING([if ld supports unversioned version maps])
-+
-+  kde_save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-+  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
-+  AC_TRY_LINK([int foo;],
-+[
-+#ifdef __INTEL_COMPILER
-+icc apparently does not support libtools version-info and version-script
-+at the same time. Dunno where the bug is, but until somebody figured out,
-+better disable the optional version scripts.
-+#endif
-+
-+  foo = 42;
-+], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
-+  LDFLAGS="$kde_save_LDFLAGS"
-+  rm -f conftest.map
-+  AM_CONDITIONAL(include_VERSION_SCRIPT, 
-+    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-+
-+  AC_MSG_RESULT($kde_supports_versionmaps)
-+])
-+
-+AC_DEFUN([AM_PROG_OBJC],[
-+AC_CHECK_PROGS(OBJC, gcc, gcc)
-+test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-+if test "x${OBJCFLAGS-unset}" = xunset; then
-+   OBJCFLAGS="-g -O2"
-+fi
-+AC_SUBST(OBJCFLAGS)
-+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-+])
-+
-+AC_DEFUN([KDE_CHECK_PERL],
-+[
-+	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
-+		    AC_MSG_ERROR([No Perl found in your $PATH.
-+We need perl to generate some code.])
-+	])
-+    AC_SUBST(PERL)
-+])
-+
-+AC_DEFUN([KDE_CHECK_LARGEFILE],
-+[
-+AC_SYS_LARGEFILE
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-+fi
-+
-+if test "x$ac_cv_sys_large_files" != "xno"; then
-+  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
-+fi
-+
-+])
-+
-+dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
-+dnl which allows to search for libs that get installed into the KDE prefix.
-+dnl
-+dnl Syntax:  KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
-+dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines KSTUFF_PKG_ERRORS on error
-+AC_DEFUN([KDE_PKG_CHECK_MODULES], [
-+
-+   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   if test "$prefix" != "$kde_libs_prefix"; then
-+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-+   fi
-+   export PKG_CONFIG_PATH
-+   PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
-+])
-+
-+
-+dnl Check for PIE support in the compiler and linker
-+AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
-+[
-+  AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
-+  [
-+    AC_LANG_SAVE
-+    AC_LANG_CPLUSPLUS
-+    safe_CXXFLAGS=$CXXFLAGS
-+    safe_LDFLAGS=$LDFLAGS
-+    CXXFLAGS="$CXXFLAGS -fPIE"
-+    LDFLAGS="$LDFLAGS -pie"
-+
-+    AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
-+
-+    CXXFLAGS=$safe_CXXFLAGS
-+    LDFLAGS=$safe_LDFLAGS
-+    AC_LANG_RESTORE
-+  ])
-+
-+  AC_MSG_CHECKING(if enabling -pie/fPIE support)
-+
-+  AC_ARG_ENABLE(pie,
-+    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
-+      [kde_has_pie_support=$enableval],
-+      [kde_has_pie_support=detect])
-+
-+  if test "$kde_has_pie_support" = "detect"; then
-+    kde_has_pie_support=$kde_cv_val_pie_support
-+  fi
-+
-+  AC_MSG_RESULT([$kde_has_pie_support])
-+
-+  KDE_USE_FPIE=""
-+  KDE_USE_PIE=""
-+
-+  AC_SUBST([KDE_USE_FPIE])
-+  AC_SUBST([KDE_USE_PIE])
-+
-+  if test "$kde_has_pie_support" = "yes"; then
-+    KDE_USE_FPIE="-fPIE"
-+    KDE_USE_PIE="-pie"
-+  fi
-+])
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+
-+# serial 47 AC_PROG_LIBTOOL
-+
-+
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+         [],
-+         [m4_define([AC_PROVIDE_IFELSE],
-+	         [m4_ifdef([AC_PROVIDE_$1],
-+		           [$2], [$3])])])
-+
-+
-+# AC_PROG_LIBTOOL
-+# ---------------
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+    [AC_LIBTOOL_CXX],
-+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+  ])])
-+dnl And a similar setup for Fortran 77 support
-+  AC_PROVIDE_IFELSE([AC_PROG_F77],
-+    [AC_LIBTOOL_F77],
-+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
-+
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+    [AC_LIBTOOL_GCJ],
-+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+      [AC_LIBTOOL_GCJ],
-+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+	[AC_LIBTOOL_GCJ],
-+      [ifdef([AC_PROG_GCJ],
-+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([A][M_PROG_GCJ],
-+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([LT_AC_PROG_GCJ],
-+	     [define([LT_AC_PROG_GCJ],
-+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
-+
-+
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
-+
-+
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
-+
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
-+AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+AC_ARG_WITH([pic],
-+    [AC_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
-+
-+
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
-+
-+
-+# _LT_AC_SYS_LIBPATH_AIX
-+# ----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_AC_SYS_LIBPATH_AIX
-+
-+
-+# _LT_AC_SHELL_INIT(ARG)
-+# ----------------------
-+AC_DEFUN([_LT_AC_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_AC_SHELL_INIT
-+
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[_LT_AC_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+[$]*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    IFS="$lt_save_ifs"
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "[$]0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *ELF-32*)
-+      HPUX_IA64_MODE="32"
-+      ;;
-+    *ELF-64*)
-+      HPUX_IA64_MODE="64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+   if test "$lt_cv_prog_gnu_ld" = yes; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -melf32bsmip"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -melf32bmipn32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -melf64bmip"
-+      ;;
-+    esac
-+   else
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+   fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case "`/usr/bin/file conftest.o`" in
-+    *32-bit*)
-+      LINUX_64_MODE="32"
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_i386"
-+          ;;
-+        ppc64-*linux*)
-+          LD="${LD-ld} -m elf32ppclinux"
-+          ;;
-+        s390x-*linux*)
-+          LD="${LD-ld} -m elf_s390"
-+          ;;
-+        sparc64-*linux*)
-+          LD="${LD-ld} -m elf32_sparc"
-+          ;;
-+      esac
-+      ;;
-+    *64-bit*)
-+      LINUX_64_MODE="64"
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        ppc*-*linux*|powerpc*-*linux*)
-+          LD="${LD-ld} -m elf64ppc"
-+          ;;
-+        s390*-*linux*)
-+          LD="${LD-ld} -m elf64_s390"
-+          ;;
-+        sparc*-*linux*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+  ])
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+])# _LT_AC_LOCK
-+
-+
-+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-+[AC_REQUIRE([LT_AC_PROG_SED])
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s conftest.err; then
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$5], , :, [$5])
-+else
-+    ifelse([$6], , :, [$6])
-+fi
-+])# AC_LIBTOOL_COMPILER_OPTION
-+
-+
-+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+[AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$4], , :, [$4])
-+else
-+    ifelse([$5], , :, [$5])
-+fi
-+])# AC_LIBTOOL_LINKER_OPTION
-+
-+
-+# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+# --------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-+[# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  testring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+ *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
-+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-+	       = "XX$testring") >/dev/null 2>&1 &&
-+	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
-+      testring=$testring$testring
-+    done
-+    testring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+
-+
-+# _LT_AC_CHECK_DLFCN
-+# --------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)dnl
-+])# _LT_AC_CHECK_DLFCN
-+
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_unknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# -------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+   ;;
-+    
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+    	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-+# ---------------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler
-+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+   # that will create temporary files in the current directory regardless of
-+   # the output directory.  Thus, making CWD read-only will cause this test
-+   # to fail, enabling locking or at least warning the user not to do parallel
-+   # builds.
-+   chmod -w .
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test ! -s out/conftest.err; then
-+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w .
-+   $rm conftest* out/*
-+   rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+])
-+])# AC_LIBTOOL_PROG_CC_C_O
-+
-+
-+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-+# -----------------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-+[AC_REQUIRE([_LT_AC_LOCK])dnl
-+
-+hard_links="nottested"
-+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+
-+
-+# AC_LIBTOOL_OBJDIR
-+# -----------------
-+AC_DEFUN([AC_LIBTOOL_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+])# AC_LIBTOOL_OBJDIR
-+
-+
-+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-+# ----------------------------------------------
-+# Check hardcoding attributes.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_AC_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+
-+
-+# AC_LIBTOOL_SYS_LIB_STRIP
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-+[striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         AC_MSG_RESULT([yes])
-+       else
-+  AC_MSG_RESULT([no])
-+fi
-+       ;;
-+   *)
-+  AC_MSG_RESULT([no])
-+    ;;
-+  esac  
-+fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-+[AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  shrext=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+kfreebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 3.2 on
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case "$host_cpu" in
-+  ia64*)
-+    shrext='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
-+     shrext='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
-+    shrext='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  libsuff=
-+  if test "x$LINUX_64_MODE" = x64; then
-+    # Some platforms are per default 64-bit, so there's no /lib64
-+    if test -d /lib64 -a ! -h /lib64; then
-+      libsuff=64
-+    fi
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+nto-qnx*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  shrext=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_ARG_WITH([tags],
-+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+        [include additional configurations @<:@automatic@:>@])],
-+    [tagnames="$withval"])
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+  if test ! -f "${ofile}"; then
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-+  fi
-+
-+  if test -z "$LTCC"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+    if test -z "$LTCC"; then
-+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-+    else
-+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+    fi
-+  fi
-+
-+  # Extract list of available tagged configurations in $ofile.
-+  # Note that this assumes the entire list is on one line.
-+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+  for tagname in $tagnames; do
-+    IFS="$lt_save_ifs"
-+    # Check whether tagname contains only valid characters
-+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+    "") ;;
-+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-+	;;
-+    esac
-+
-+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+    then
-+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+    fi
-+
-+    # Update the list of available tags.
-+    if test -n "$tagname"; then
-+      echo appending configuration tag \"$tagname\" to $ofile
-+
-+      case $tagname in
-+      CXX)
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	  AC_LIBTOOL_LANG_CXX_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      F77)
-+	if test -n "$F77" && test "X$F77" != "Xno"; then
-+	  AC_LIBTOOL_LANG_F77_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      GCJ)
-+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+	  AC_LIBTOOL_LANG_GCJ_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      RC)
-+	AC_LIBTOOL_LANG_RC_CONFIG
-+	;;
-+
-+      *)
-+	AC_MSG_ERROR([Unsupported tag name: $tagname])
-+	;;
-+      esac
-+
-+      # Append the new tag name to the list of available tags.
-+      if test -n "$tagname" ; then
-+      available_tags="$available_tags $tagname"
-+    fi
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+
-+  # Now substitute the updated list of available tags.
-+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+    mv "${ofile}T" "$ofile"
-+    chmod +x "$ofile"
-+  else
-+    rm -f "${ofile}T"
-+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+  fi
-+fi
-+])# _LT_AC_TAGCONFIG
-+
-+
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
-+
-+
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
-+# declare package support for building win32 dll's
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
-+
-+
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
-+
-+
-+# AC_DISABLE_SHARED
-+# -----------------
-+#- set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
-+
-+
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
-+
-+
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
-+
-+
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
-+
-+
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
-+
-+
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
-+
-+
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+    then ac_cv_prog_egrep='grep -E'
-+    else ac_cv_prog_egrep='egrep'
-+    fi])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
-+
-+
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
-+
-+
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# AC_PATH_MAGIC
-+
-+
-+# AC_PROG_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH([gnu-ld],
-+    [AC_HELP_STRING([--with-gnu-ld],
-+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
-+    [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
-+
-+
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-+
-+
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+])# AC_PROG_LD_RELOAD_FLAG
-+
-+
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+  
-+mingw* | pw32*)
-+  # win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='win32_libid'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  # this will be overwritten by pass_all, but leave it in just in case
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[[012]])
-+    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | kfreebsd*-gnu)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case "$host_cpu" in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-+  arm* )
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+nto-qnx*)
-+  lt_cv_deplibs_check_method=unknown
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+
-+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+])# AC_DEPLIBS_CHECK_METHOD
-+
-+
-+# AC_PROG_NM
-+# ----------
-+# find the pathname to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+      */dev/null* | *'Invalid file or object type'*)
-+	lt_cv_path_NM="$tmp_nm -B"
-+	break
-+        ;;
-+      *)
-+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null*)
-+	  lt_cv_path_NM="$tmp_nm -p"
-+	  break
-+	  ;;
-+	*)
-+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	  continue # so that we can try to find one that supports BSD flags
-+	  ;;
-+	esac
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+])# AC_PROG_NM
-+
-+
-+# AC_CHECK_LIBM
-+# -------------
-+# check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
-+esac
-+])# AC_CHECK_LIBM
-+
-+
-+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl convenience library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-+# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_CONVENIENCE
-+
-+
-+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl installable library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-+# DIRECTORY is not provided and an installed libltdl is not found, it is
-+# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-+# quotes!).  If your package is not flat and you're not using automake,
-+# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, lt_dlinit,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    LTDLINCL=
-+  fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_INSTALLABLE
-+
-+
-+# AC_LIBTOOL_CXX
-+# --------------
-+# enable support for C++ libraries
-+AC_DEFUN([AC_LIBTOOL_CXX],
-+[AC_REQUIRE([_LT_AC_LANG_CXX])
-+])# AC_LIBTOOL_CXX
-+
-+
-+# _LT_AC_LANG_CXX
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_CXX],
-+[AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([AC_PROG_CXXCPP])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-+])# _LT_AC_LANG_CXX
-+
-+
-+# AC_LIBTOOL_F77
-+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
-+
-+
-+# _LT_AC_LANG_F77
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
-+
-+
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
-+
-+
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
-+
-+
-+# AC_LIBTOOL_RC
-+# --------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
-+
-+
-+# AC_LIBTOOL_LANG_C_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-+[lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+_LT_AC_SYS_COMPILER
-+
-+#
-+# Check for any special shared library compilation flags.
-+#
-+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-+if test "$GCC" = no; then
-+  case $host_os in
-+  sco3.2v5*)
-+    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-+    ;;
-+  esac
-+fi
-+if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-+  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-+  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
-+  else
-+    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-+    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-+  fi
-+fi
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-+  [],
-+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+# Report which librarie types wil actually be built
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+  darwin* | rhapsody*)
-+  if test "$GCC" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      else
-+	case ${MACOSX_DEPLOYMENT_TARGET} in
-+	  10.[012])
-+	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+	    ;;
-+	  10.*)
-+	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-+	    ;;
-+	esac
-+      fi
-+      ;;
-+    esac
-+    output_verbose_link_cmd='echo'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+  else
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  fi  
-+    ;;  
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_C_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_CXX_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-+[AC_LANG_PUSH(C++)
-+AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([AC_PROG_CXXCPP])
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Dependencies to place before and after the object being linked:
-+_LT_AC_TAGVAR(predep_objects, $1)=
-+_LT_AC_TAGVAR(postdep_objects, $1)=
-+_LT_AC_TAGVAR(predeps, $1)=
-+_LT_AC_TAGVAR(postdeps, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cc
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
-+  unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+  lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
-+  unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+else
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+fi
-+
-+if test "$GXX" = yes; then
-+  # Set up default GNU C++ configuration
-+
-+  AC_PROG_LD
-+
-+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+  # archiving commands below assume that GNU ld is being used.
-+  if test "$with_gnu_ld" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+    #     investigate it a little bit more. (MM)
-+    wlarc='${wl}'
-+
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+	grep 'no-whole-archive' > /dev/null; then
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    with_gnu_ld=no
-+    wlarc=
-+
-+    # A generic and very simple default shared library creation
-+    # command for GNU C++ for the case where it uses the native
-+    # linker, instead of GNU ld.  If possible, this setting should
-+    # overridden to take advantage of the native linker features on
-+    # the platform it is being used on.
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
-+  fi
-+
-+  # Commands to make compiler produce verbose output that lists
-+  # what "hidden" libraries, object files and flags are used when
-+  # linking a shared library.
-+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+  GXX=no
-+  with_gnu_ld=no
-+  wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+case $host_os in
-+  aix3*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      # KDE requires run time linking.  Make it the default.
-+      aix_use_runtimelinking=yes
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    _LT_AC_TAGVAR(archive_cmds, $1)=''
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+    if test "$GXX" = yes; then
-+      case $host_os in aix4.[012]|aix4.[012].*)
-+      # We only want to do this on AIX 4.2 and lower, the check
-+      # below for broken collect2 doesn't work under 4.3+
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	else
-+	  # We have old collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	fi
-+      esac
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	shared_flag='-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='-qmkshrobj ${wl}-G'
-+	else
-+	  shared_flag='-qmkshrobj'
-+	fi
-+      fi
-+    fi
-+
-+    # Let the compiler handle the export list.
-+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+      # Determine the default libpath from the value encoded in an empty executable.
-+      _LT_AC_SYS_LIBPATH_AIX
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+     else
-+      if test "$host_cpu" = ia64; then
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	# Determine the default libpath from the value encoded in an empty executable.
-+	_LT_AC_SYS_LIBPATH_AIX
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	# -bexpall does not export symbols beginning with underscore (_)
-+	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+	# Exported symbols can be pulled into shared objects from archives
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	# This is similar to how AIX traditionally builds it's shared libraries.
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+  chorus*)
-+    case $cc_basename in
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+    # as there is no search path for DLLs.
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+      # If the export-symbols file already is a .def file (1st line
-+      # is EXPORTS), use it as is; otherwise, prepend...
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname.def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname.def;
-+	cat $export_symbols >> $output_objdir/$soname.def;
-+      fi~
-+      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+  ;;
-+
-+  darwin* | rhapsody*)
-+  if test "$GXX" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      else
-+	case ${MACOSX_DEPLOYMENT_TARGET} in
-+	  10.[012])
-+	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+	    ;;
-+	  10.*)
-+	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-+	    ;;
-+	esac
-+      fi
-+      ;;
-+    esac
-+    lt_int_apple_cc_single_mod=no
-+    output_verbose_link_cmd='echo'
-+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+      lt_int_apple_cc_single_mod=yes
-+    fi
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    else
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+    fi
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+
-+    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+  else
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+  fi
-+    ;;
-+
-+  dgux*)
-+    case $cc_basename in
-+      ec++)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      ghcx)
-+	# Green Hills C++ Compiler
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  freebsd[12]*)
-+    # C++ shared libraries reported to be fairly broken before switch to ELF
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  freebsd-elf*)
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    ;;
-+  freebsd* | kfreebsd*-gnu)
-+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+    # conventions
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9*)
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				# but as the default
-+				# location of the library.
-+
-+    case $cc_basename in
-+    CC)
-+      # FIXME: insert proper C++ library support
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    aCC)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      #
-+      # There doesn't appear to be a way to prevent this compiler from
-+      # explicitly linking system object files so we need to strip them
-+      # from the output so that they don't get included in the library
-+      # dependencies.
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      ;;
-+    *)
-+      if test "$GXX" = yes; then
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+        # FIXME: insert proper C++ library support
-+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+    ;;
-+  hpux10*|hpux11*)
-+    if test $with_gnu_ld = no; then
-+      case "$host_cpu" in
-+      hppa*64*)
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+        ;;
-+      ia64*)
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+        ;;
-+      *)
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        ;;
-+      esac
-+    fi
-+    case "$host_cpu" in
-+    hppa*64*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+    ia64*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					      # but as the default
-+					      # location of the library.
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					      # but as the default
-+					      # location of the library.
-+      ;;
-+    esac
-+
-+    case $cc_basename in
-+      CC)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      aCC)
-+	case "$host_cpu" in
-+	hppa*64*|ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	  ;;
-+	esac
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test $with_gnu_ld = no; then
-+	    case "$host_cpu" in
-+	    ia64*|hppa*64*)
-+	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+	      ;;
-+	    *)
-+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	      ;;
-+	    esac
-+	  fi
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  irix5* | irix6*)
-+    case $cc_basename in
-+      CC)
-+	# SGI C++
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test "$with_gnu_ld" = no; then
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  else
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+	  fi
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+	;;
-+    esac
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    ;;
-+  linux*)
-+    case $cc_basename in
-+      KCC)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	;;
-+      icpc)
-+	# Intel C++
-+	with_gnu_ld=yes
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	;;
-+      cxx)
-+	# Compaq C++
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	runpath_var=LD_RUN_PATH
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+    esac
-+    ;;
-+  lynxos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  m88k*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  mvs*)
-+    case $cc_basename in
-+      cxx)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    fi
-+    # Workaround some broken pre-1.5 toolchains
-+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+    ;;
-+  osf3*)
-+    case $cc_basename in
-+      KCC)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+	;;
-+      RCC)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      cxx)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  osf4* | osf5*)
-+    case $cc_basename in
-+      KCC)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+	;;
-+      RCC)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      cxx)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	  echo "-hidden">> $lib.exp~
-+	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  psos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  sco*)
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    case $cc_basename in
-+      CC)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  sunos4*)
-+    case $cc_basename in
-+      CC)
-+	# Sun C++ 4.x
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      lcc)
-+	# Lucid
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  solaris*)
-+    case $cc_basename in
-+      CC)
-+	# Sun C++ 4.2, 5.x and Centerline C++
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	case $host_os in
-+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-+	  *)
-+	    # The C++ compiler is used as linker so we must use $wl
-+	    # flag to pass the commands to the underlying system
-+	    # linker.
-+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	    ;;
-+	esac
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	;;
-+      gcx)
-+	# Green Hills C++ Compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+
-+	# The C++ compiler must be used to create the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	# GNU C++ compiler with Solaris linker
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  else
-+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	    # platform.
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  fi
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	fi
-+	;;
-+    esac
-+    ;;
-+  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    ;;
-+  tandem*)
-+    case $cc_basename in
-+      NCC)
-+	# NonStop-UX NCC 3.20
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  vxworks*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  *)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$GXX"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_POSTDEP_PREDEP($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+])# AC_LIBTOOL_LANG_CXX_CONFIG
-+
-+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-+# ------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-+int a;
-+void foo (void) { a = 0; }
-+EOF
-+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+EOF
-+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+EOF
-+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  # The `*' in the case matches for architectures that use `case' in
-+  # $output_verbose_cmd can trigger glob expansion during the loop
-+  # eval without this substitution.
-+  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+
-+  for p in `eval $output_verbose_link_cmd`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" \
-+	  || test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
-+    *.$objext|*.$libext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
-+
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$rm -f confest.$objext
-+
-+case " $_LT_AC_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+])# AC_LIBTOOL_POSTDEP_PREDEP
-+
-+# AC_LIBTOOL_LANG_F77_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-+[AC_REQUIRE([AC_PROG_F77])
-+AC_LANG_PUSH(Fortran 77)
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="      program t\n      end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+aix4*)
-+  test "$enable_shared" = yes && enable_static=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$G77"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_F77_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_RC_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
-+
-+
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars.  Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi  
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    _LT_AC_TAGVAR(compiler, $1) \
-+    _LT_AC_TAGVAR(CC, $1) \
-+    _LT_AC_TAGVAR(LD, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+    _LT_AC_TAGVAR(predep_objects, $1) \
-+    _LT_AC_TAGVAR(postdep_objects, $1) \
-+    _LT_AC_TAGVAR(predeps, $1) \
-+    _LT_AC_TAGVAR(postdeps, $1) \
-+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+    _LT_AC_TAGVAR(archive_cmds, $1) \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+    _LT_AC_TAGVAR(module_cmds, $1) \
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+    _LT_AC_TAGVAR(include_expsyms, $1); do
-+
-+    case $var in
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+    _LT_AC_TAGVAR(module_cmds, $1) | \
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  case $lt_echo in
-+  *'\[$]0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+ifelse([$1], [],
-+  [cfgfile="${ofile}T"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  $rm -f "$cfgfile"
-+  AC_MSG_NOTICE([creating $ofile])],
-+  [cfgfile="$ofile"])
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
-+
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -32,189 +9919,2379 @@ you should regenerate the build system entirely.], [63])])
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# PKG_PROG_PKG_CONFIG([MIN-VERSION])
--# ----------------------------------
--AC_DEFUN([PKG_PROG_PKG_CONFIG],
--[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
--m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
--AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext='$shrext'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+
-+ifelse([$1],[],
-+[# ### END LIBTOOL CONFIG],
-+[# ### END LIBTOOL TAG CONFIG: $tagname])
-+
-+__EOF__
-+
-+ifelse([$1],[], [
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
- fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=m4_default([$1], [0.9.0])
--	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		AC_MSG_RESULT([yes])
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" || \
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+])
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+])# AC_LIBTOOL_CONFIG
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+
-+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-+
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[[BDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGISTW]]' ;;
-+esac
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
- 	else
--		AC_MSG_RESULT([no])
--		PKG_CONFIG=""
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- 	fi
--		
--fi[]dnl
--])# PKG_PROG_PKG_CONFIG
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-+# ---------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+ ifelse([$1],[CXX],[
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | os2* | pw32*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case "$host_cpu" in
-+      hppa*64*|ia64*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix4* | aix5*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68)
-+	  # Green Hills C++ Compiler
-+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  ghcx)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | kfreebsd*-gnu)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
-+	  aCC)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+	    case "$host_cpu" in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
-+	  CC)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      linux*)
-+	case $cc_basename in
-+	  KCC)
-+	    # KAI C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  icpc)
-+	    # Intel C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;; 
-+	  cxx)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      netbsd*)
-+	;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
-+	  RCC)
-+	    # Rational C++ 2.4.1
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  cxx)
-+	    # Digital/Compaq C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      sco*)
-+	case $cc_basename in
-+	  CC)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      solaris*)
-+	case $cc_basename in
-+	  CC)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
-+	  gcx)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC)
-+	    # Sun C++ 4.x
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  lcc)
-+	    # Lucid
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      unixware*)
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case "$host_cpu" in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case "$host_cpu" in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    newsos6)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    linux*)
-+      case $CC in
-+      icc* | ecc*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      ccc*)
-+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
-+      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-+      ;;
-+
-+    solaris*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sunos4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
- 
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--#
--# Check to see whether a particular set of modules exists.  Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
- #
-+# Check to make sure the PIC flag actually works.
- #
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
--    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
--  m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
--  $3])dnl
--fi])
-+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+case "$host_os" in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
-+])
- 
- 
--# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
--# ---------------------------------------------
--m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
--    if test -n "$$1"; then
--        pkg_cv_[]$1="$$1"
-+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-+# ------------------------------------
-+# See if the linker supports building shared libraries.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ifelse([$1],[CXX],[
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix4* | aix5*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-     else
--        PKG_CHECK_EXISTS([$3],
--                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--			 [pkg_failed=yes])
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-     fi
--else
--	pkg_failed=untried
--fi[]dnl
--])# _PKG_CONFIG
-+    ;;
-+  pw32*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  *)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+],[
-+  runpath_var=
-+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_AC_TAGVAR(archive_cmds, $1)=
-+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_AC_TAGVAR(module_cmds, $1)=
-+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
-+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_AC_TAGVAR(include_expsyms, $1)=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
- 
--# _PKG_SHORT_ERRORS_SUPPORTED
--# -----------------------------
--AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi[]dnl
--])# _PKG_SHORT_ERRORS_SUPPORTED
-+  case $host_os in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
- 
-+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+
-+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
-+    solaris* | sysv5*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-+      runpath_var=LD_RUN_PATH
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+      fi
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$link_static_flag"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
-+
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+
-+	# KDE requires run time linking.  Make it the default.
-+	aix_use_runtimelinking=yes
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_AC_TAGVAR(archive_cmds, $1)=''
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[012]|aix4.[012].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  else
-+  	  # We have old collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	esac
-+	shared_flag='-shared'
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+  	if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='-qmkshrobj ${wl}-G'
-+	  else
-+	    shared_flag='-qmkshrobj'
-+  	fi
-+	fi
-+      fi
-+
-+      # Let the compiler handle the export list.
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
-+	_LT_AC_SYS_LIBPATH_AIX
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 _LT_AC_SYS_LIBPATH_AIX
-+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # -bexpall does not export symbols beginning with underscore (_)
-+	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds it's shared libraries.
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      # see comment about different semantics on the GNU ld section
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    bsdi4*)
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+    if test "$GXX" = yes ; then
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      case "$host_os" in
-+      rhapsody* | darwin1.[[012]])
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+	;;
-+      *) # Darwin 1.3 on
-+	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+	else
-+	  case ${MACOSX_DEPLOYMENT_TARGET} in
-+	    10.[012])
-+	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+	      ;;
-+	    10.*)
-+	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
-+	      ;;
-+	  esac
-+	fi
-+	;;
-+      esac
-+    	lt_int_apple_cc_single_mod=no
-+    	output_verbose_link_cmd='echo'
-+    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-+    	  lt_int_apple_cc_single_mod=yes
-+    	fi
-+    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	else
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      fi
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        else
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        fi
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    else  
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi  
-+      ;;
-+
-+    dgux*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | kfreebsd*-gnu)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
-+
-+    hpux10* | hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
-+	hppa*64*|ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
-+	  ;;
-+	esac
-+      else
-+	case "$host_cpu" in
-+	hppa*64*|ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	case "$host_cpu" in
-+	hppa*64*)
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	ia64*)
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    newsos6)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    openbsd*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	   ;;
-+	 *)
-+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
-+
-+    os2*)
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    sco3.2v5*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ;;
-+
-+    solaris*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+      esac
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4.3*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
-+
-+    sysv4.2uw2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      hardcode_runpath_var=yes
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+
-+   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+      fi
-+      runpath_var='LD_RUN_PATH'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv5*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+      # $CC -shared without GNU ld will not create a library from C++
-+      # object files and a static libstdc++, better avoid it by now
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+      ;;
-+
-+    uts4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
- 
--# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
--# [ACTION-IF-NOT-FOUND])
- #
-+# Do we need to explicitly link libc?
- #
--# Note that if there is a possibility the first call to
--# PKG_CHECK_MODULES might not happen, you should be sure to include an
--# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+  
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
-+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+])# AC_LIBTOOL_PROG_LD_SHLIBS
-+
-+
-+# _LT_AC_FILE_LTDLL_C
-+# -------------------
-+# Be careful that the start marker always follows a newline.
-+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
- #
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
- #
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+])# _LT_AC_FILE_LTDLL_C
- 
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
- 
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
- 
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
- 
--if test $pkg_failed = yes; then
--        _PKG_SHORT_ERRORS_SUPPORTED
--        if test $_pkg_short_errors_supported = yes; then
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
--        else 
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+  AC_SUBST(GCJFLAGS)
-+])
-+
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-+
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && break
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_MSG_RESULT([$SED])
-+])
-+
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN([PKG_CHECK_MODULES], [
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
-+
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
-+
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
-+
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-         fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- 
--	ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
- 
--$$1_PKG_ERRORS
-+  if test $succeeded = yes; then
-+     ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+  fi
-+])
- 
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
- 
--_PKG_TEXT
--])],
--		[AC_MSG_RESULT([no])
--                $4])
--elif test $pkg_failed = untried; then
--	ifelse([$4], , [AC_MSG_FAILURE(dnl
--[The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
- 
--_PKG_TEXT
-+# AM_CONDITIONAL                                              -*- Autoconf -*-
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
--		[$4])
-+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 5
-+
-+AC_PREREQ(2.52)
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
- else
--	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
--	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
--        AC_MSG_RESULT([yes])
--	ifelse([$3], , :, [$3])
--fi[]dnl
--])# PKG_CHECK_MODULES
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.])
-+fi])])
- 
--# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Do all the work for Automake.                            -*- Autoconf -*-
-+
-+# This macro actually does too much some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 10
-+
-+AC_PREREQ([2.54])
-+
-+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-+# the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_MISSING_PROG(AMTAR, tar)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright 2002  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--# (This private macro should not be called outside this file.)
--AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.10'
--dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
--dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.10], [],
--      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
--])
--
--# _AM_AUTOCONF_VERSION(VERSION)
--# -----------------------------
--# aclocal traces this macro to find the Autoconf version.
--# This is a private macro too.  Using m4_define simplifies
--# the logic in aclocal, which can simply ignore this definition.
--m4_define([_AM_AUTOCONF_VERSION], [])
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+	 [AM_AUTOMAKE_VERSION([1.7.9])])
-+
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+
-+# Copyright 2001, 2002  Free Software Foundation, Inc.
- 
--# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 2
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Check to make sure that the build environment is sane.
-+#
-+
-+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 3
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+#  -*- Autoconf -*-
-+
-+
-+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 3
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# AM_AUX_DIR_EXPAND
-+
-+# Copyright 2001 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -254,56 +12331,131 @@ _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
- # absolute PATH.  The drawback is that using absolute paths prevent a
- # configured tree to be moved without reconfiguration.
- 
--AC_DEFUN([AM_AUX_DIR_EXPAND],
--[dnl Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])dnl
-+# Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND], [
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                            -*- Autoconf -*-
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+
-+# Copyright 2001 Free Software Foundation, Inc.
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# serial 8
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
--	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])dnl
--AC_SUBST([$1_FALSE])dnl
--_AM_SUBST_NOTMAKE([$1_TRUE])dnl
--_AM_SUBST_NOTMAKE([$1_FALSE])dnl
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# AM_PROG_INSTALL_STRIP
-+
-+# Copyright 2001 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+#                                                          -*- Autoconf -*-
-+# Copyright (C) 2003  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# serial 1
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
- else
--  $1_TRUE='#'
--  $1_FALSE=
-+  am__leading_dot=_
- fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([[conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.]])
--fi])])
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# serial 5						-*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--# serial 9
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -312,6 +12464,7 @@ fi])])
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
-+
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -331,7 +12484,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
- ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
--       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
- 
-@@ -371,9 +12523,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
-     : > sub/conftest.c
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
-+      : > sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-@@ -397,19 +12547,13 @@ AC_CACHE_CHECK([dependency style of $depcc],
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
--       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
--      # or remarks (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored or not supported.
--      # When given -MP, icc 7.0 and 7.1 complain thusly:
--      #   icc: Command line warning: ignoring option '-M'; no argument required
--      # The diagnosis changed in icc 8.0:
--      #   icc: Command line remark: option '-MP' not supported
--      if (grep 'ignoring option' conftest.err ||
--          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+      # (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored.
-+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-         am_cv_$1_dependencies_compiler_type=$depmode
-         break
-       fi
-@@ -443,27 +12587,36 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
- # ------------
- AC_DEFUN([AM_DEP_TRACK],
- [AC_ARG_ENABLE(dependency-tracking,
--[  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors])
-+[  --disable-dependency-tracking Speeds up one-time builds
-+  --enable-dependency-tracking  Do not reject slow dependency extractors])
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+AC_SUBST([AMDEPBACKSLASH])
- ])
- 
--# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+# Generate code to set up dependency tracking.   -*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--#serial 3
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+#serial 2
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -476,28 +12629,33 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-   # some people rename them; so instead we look at the file content.
-   # Grep'ing the first line is not enough: some people post-process
-   # each Makefile.in and add a new line on top of each file to say so.
--  # Grep'ing the whole file is not good either: AIX grep has a line
--  # limit of 2048, but all sed's we know have understand at least 4000.
--  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-     dirpart=`AS_DIRNAME("$mf")`
-   else
-     continue
-   fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-+  # Extract the definition of DEP_FILES from the Makefile without
-+  # running `make'.
-+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-   test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-   # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+  U=`sed -n -e '/^U = / s///p' < "$mf"`
-+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+  # We invoke sed twice because it is the simplest approach to
-+  # changing $(DEPDIR) to its actual value in the expansion.
-+  for file in `sed -n -e '
-+    /^DEP_FILES = .*\\\\$/ {
-+      s/^DEP_FILES = //
-+      :loop
-+	s/\\\\$//
-+	p
-+	n
-+	/\\\\$/ b loop
-+      p
-+    }
-+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-     # Make sure the directory exists.
-     test -f "$dirpart/$file" && continue
-@@ -523,188 +12681,27 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
--
--# Do all the work for Automake.                             -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 12
--
--# This macro actually does too much.  Some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out.  PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition.  After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.60])dnl
--dnl Autoconf wants to disallow AM_ names.  We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
--  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
--  # is not polluted with repeated "-I."
--  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
--  # test to see if srcdir already configured
--  if test -f $srcdir/config.status; then
--    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--  fi
--fi
--
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
--  if (cygpath --version) >/dev/null 2>/dev/null; then
--    CYGPATH_W='cygpath -w'
--  else
--    CYGPATH_W=echo
--  fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
--  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
--              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
--	      		     [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
--                  [_AM_DEPENDENCIES(OBJC)],
--                  [define([AC_PROG_OBJC],
--                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--])
--
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated.  The stamp files are numbered to have different names.
-+# Check to see how 'make' treats includes.	-*- Autoconf -*-
- 
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_stamp_count=1
--for _am_header in $config_headers :; do
--  case $_am_header in
--    $1 | $1:* )
--      break ;;
--    * )
--      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
--  esac
--done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
- # serial 2
- 
--# Check whether the underlying file-system supports filenames
--# with a leading dot.  For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
--  am__leading_dot=.
--else
--  am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
--
--# Check to see how 'make' treats includes.	            -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 3
--
- # AM_MAKE_INCLUDE()
- # -----------------
- # Check to see how make treats includes.
-@@ -747,287 +12744,220 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
- 
--# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- 
--# serial 5
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([missing])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
--  am_missing_run="$MISSING --run "
--else
--  am_missing_run=
--  AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
-+# serial 3
- 
--# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+AC_PREREQ(2.50)
- 
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
--  [[\\/$]]* | ?:[[\\/]]*) ;;
--  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
-+# AM_PROG_LEX
-+# -----------
-+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
-+# "missing" invocation, for better error output.
-+AC_DEFUN([AM_PROG_LEX],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-+AC_REQUIRE([AC_PROG_LEX])dnl
-+if test "$LEX" = :; then
-+  LEX=${am_missing_run}flex
-+fi])
- 
--# Helper functions for option handling.                     -*- Autoconf -*-
-+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
- 
--# serial 3
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
- 
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME.  Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+AC_PREREQ([2.52])
- 
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+# serial 6
- 
--# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
-+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-+# 
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
- 
--# serial 4
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=m4_default([$1], [0.9.0])
-+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		AC_MSG_RESULT([yes])
-+	else
-+		AC_MSG_RESULT([no])
-+		PKG_CONFIG=""
-+	fi
-+		
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
- 
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
--   if test "$[*]" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$[*]" != "X $srcdir/configure conftest.file" \
--      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists.  Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+  m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+  $3])dnl
-+fi])
- 
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
- 
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-+        PKG_CHECK_EXISTS([$3],
-+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+			 [pkg_failed=yes])
-+    fi
- else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
-+	pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
- 
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries.  This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
--  AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# Copyright (C) 2006  Free Software Foundation, Inc.
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
- 
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
- 
--# Check how to create a tarball.                            -*- Autoconf -*-
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
- 
--# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
- 
--# serial 2
-+if test $pkg_failed = yes; then
-+        _PKG_SHORT_ERRORS_SUPPORTED
-+        if test $_pkg_short_errors_supported = yes; then
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+        else 
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- 
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--#     tardir=directory && $(am__tar) > result.tar
--#
--# Substitute a variable $(am__untar) that extract such
--# a tarball read from stdin.
--#     $(am__untar) < result.tar
--AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
--     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
--     [m4_case([$1], [ustar],, [pax],,
--              [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
--  case $_am_tool in
--  gnutar)
--    for _am_tar in tar gnutar gtar;
--    do
--      AM_RUN_LOG([$_am_tar --version]) && break
--    done
--    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
--    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
--    am__untar="$_am_tar -xf -"
--    ;;
--  plaintar)
--    # Must skip GNU tar: if it does not support --format= it doesn't create
--    # ustar tarball either.
--    (tar --version) >/dev/null 2>&1 && continue
--    am__tar='tar chf - "$$tardir"'
--    am__tar_='tar chf - "$tardir"'
--    am__untar='tar xf -'
--    ;;
--  pax)
--    am__tar='pax -L -x $1 -w "$$tardir"'
--    am__tar_='pax -L -x $1 -w "$tardir"'
--    am__untar='pax -r'
--    ;;
--  cpio)
--    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
--    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
--    am__untar='cpio -i -H $1 -d'
--    ;;
--  none)
--    am__tar=false
--    am__tar_=false
--    am__untar=false
--    ;;
--  esac
-+	ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
- 
--  # If the value was cached, stop now.  We just wanted to have am__tar
--  # and am__untar set.
--  test -n "${am_cv_prog_tar_$1}" && break
-+$$1_PKG_ERRORS
- 
--  # tar/untar a dummy directory, and stop if the command works
--  rm -rf conftest.dir
--  mkdir conftest.dir
--  echo GrepMe > conftest.dir/file
--  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
--  rm -rf conftest.dir
--  if test -s conftest.tar; then
--    AM_RUN_LOG([$am__untar <conftest.tar])
--    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
--  fi
--done
--rm -rf conftest.dir
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
- 
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
--AC_SUBST([am__tar])
--AC_SUBST([am__untar])
--]) # _AM_PROG_TAR
-+_PKG_TEXT
-+])],
-+		[AC_MSG_RESULT([no])
-+                $4])
-+elif test $pkg_failed = untried; then
-+	ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+		[$4])
-+else
-+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+        AC_MSG_RESULT([yes])
-+	ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
- 
--m4_include([acinclude.m4])
-diff --git a/configure.in b/configure.in
-index ca0b183..31a7116 100644
---- a/configure.in
-+++ b/configure.in
-@@ -40,7 +40,7 @@ dnl Perform program name transformation
- AC_ARG_PROGRAM
- 
- dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(ktorrent, 2.2.6) dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(ktorrent, 2.2.8) dnl searches for some needed programs
- 
- KDE_SET_PREFIX
- 
-diff --git a/configure.in.in b/configure.in.in
-index 56cc979..fae7ea7 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -1,6 +1,6 @@
- #MIN_CONFIG(3.3)
- 
--AM_INIT_AUTOMAKE(ktorrent,2.2.6)
-+AM_INIT_AUTOMAKE(ktorrent,2.2.8)
- 
- dnl #### Check for FSEEK variants
- AC_SYS_LARGEFILE
-diff --git a/libktorrent/ktversion.h b/libktorrent/ktversion.h
-index ffe3dbe..494b1be 100644
---- a/libktorrent/ktversion.h
-+++ b/libktorrent/ktversion.h
-@@ -27,10 +27,10 @@ namespace kt
- {
- 	const bt::Uint32 MAJOR = 2;
- 	const bt::Uint32 MINOR = 2;
--	const char VERSION_STRING[] = "2.2.6";
--	const char PEER_ID[] = "-KT2260-";
-+	const char VERSION_STRING[] = "2.2.8";
-+	const char PEER_ID[] = "-KT2280-";
- }
- 
--#define KT_VERSION_MACRO "2.2.6"
-+#define KT_VERSION_MACRO "2.2.8"
- 
- #endif
-diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
-index 0c76b8a..bf64a2e 100644
---- a/libktorrent/torrent/queuemanager.cpp
-+++ b/libktorrent/torrent/queuemanager.cpp
-@@ -49,6 +49,7 @@ namespace bt
- 
- 		keep_seeding = true; //test. Will be passed from Core
- 		paused_state = false;
-+		ordering = false;
- 	}
- 
- 
-@@ -439,11 +440,13 @@ namespace bt
- 
- 	void QueueManager::orderQueue()
- 	{
--		if (!downloads.count())
-+		if (!downloads.count() || ordering)
- 			return;
- 
- 		if (paused_state || exiting)
- 			return;
-+		
-+		ordering = true;
- 
- 		downloads.sort();
- 
-@@ -584,7 +587,7 @@ namespace bt
- 				}
- 			}
- 		}
--
-+		ordering = false;
- 	}
- 
- 	void QueueManager::torrentFinished(kt::TorrentInterface* tc)
-diff --git a/libktorrent/torrent/queuemanager.h b/libktorrent/torrent/queuemanager.h
-index e49ad44..a51e9ec 100644
---- a/libktorrent/torrent/queuemanager.h
-+++ b/libktorrent/torrent/queuemanager.h
-@@ -169,6 +169,7 @@ namespace bt
- 			bool paused_state;
- 			bool keep_seeding;
- 			bool exiting;
-+			bool ordering;
- 	};
- }
- #endif
-diff --git a/libktorrent/util/sha1hashgen.cpp b/libktorrent/util/sha1hashgen.cpp
-index 5c0d9f5..bacca62 100644
---- a/libktorrent/util/sha1hashgen.cpp
-+++ b/libktorrent/util/sha1hashgen.cpp
-@@ -139,12 +139,11 @@ namespace bt
- 		{
- 			if (i < 16)
- 			{
--				w[i] = ntohl(*(const Uint32*)(chunk + (4*i)));
--			/*	w[i] = (chunk[4*i] << 24) | 
-+			//	w[i] = ntohl(*(const Uint32*)(chunk + (4*i))); <- crashes on sparc
-+				w[i] = (chunk[4*i] << 24) | 
- 						(chunk[4*i + 1] << 16) | 
- 						(chunk[4*i + 2] << 8) | 
- 						chunk[4*i + 3];
--				*/
- 			}
- 			else
- 			{
-diff --git a/plugins/infowidget/geoip/geoip.dat b/plugins/infowidget/geoip/geoip.dat
-index 11f1f6b..1f7ca0f 100644
-Binary files a/plugins/infowidget/geoip/geoip.dat and b/plugins/infowidget/geoip/geoip.dat differ
-diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
-index a067edd..119b9b2 100644
---- a/plugins/rssfeed/rssfeed.cpp
-+++ b/plugins/rssfeed/rssfeed.cpp
-@@ -195,11 +195,18 @@ namespace kt
- 		
- 		if (file.exists())
- 			{
--			file.open( IO_ReadOnly );
-+			try
-+				{
-+				file.open( IO_ReadOnly );
- 			TQDataStream in(&file);
- 			
--			in >> m_articles;
--			emit articlesChanged( m_articles );
-+				in >> m_articles;
-+				emit articlesChanged( m_articles );
-+				}
-+			catch (...)
-+				{
-+				m_articles.clear();
-+				}
- 			}
- 	}
- 	
-diff --git a/plugins/stats/ChartDrawer.h b/plugins/stats/ChartDrawer.h
-index 912d153..3dc2f48 100644
---- a/plugins/stats/ChartDrawer.h
-+++ b/plugins/stats/ChartDrawer.h
-@@ -23,6 +23,8 @@
- 
- #include <stdint.h> 
- 
-+#include <stdint.h> //uint32_t, int64_t
-+
- #include <tqwidget.h>
- #include <tqpainter.h>
- #include <tqstring.h>
-diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
-index 4d582a7..c85b7f1 100644
---- a/plugins/webinterface/httpserver.cpp
-+++ b/plugins/webinterface/httpserver.cpp
-@@ -433,6 +433,14 @@ namespace kt
- 		const char* ptr = data.data();
- 		Uint32 len = data.size();
- 		int pos = TQString(data).find("\r\n\r\n");
-+
-+		if (!session.logged_in || !checkSession(hdr))
-+		{
-+			// You can't post torrents if you are not logged in
-+			// or the session is not OK
-+			redirectToLoginPage(hdlr);
-+			return;
-+		}
- 		
- 		if (pos == -1 || pos + 4 >= len || ptr[pos + 4] != 'd')
- 		{
-diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
-index d2c2f55..cd8fd63 100644
---- a/plugins/webinterface/php_handler.cpp
-+++ b/plugins/webinterface/php_handler.cpp
-@@ -82,7 +82,9 @@ namespace kt
- 			
- 		for ( it = args.begin(); it != args.end(); ++it )
- 		{
--			ts << TQString("$_REQUEST['%1']=\"%2\";\n").arg(it.key()).arg(it.data());
-+			// Check for string delimiters, don't want PHP injection attacks
-+			if (!containsDelimiters(it.key()) && !containsDelimiters(it.data()))
-+				ts << TQString("$_REQUEST['%1']=\"%2\";\n").arg(it.key()).arg(it.data());
- 		}
- 		ts.writeRawBytes(php_s.data() + off,php_s.size() - off); // the rest of the script
- 		ts << flush;
-@@ -98,6 +100,11 @@ namespace kt
- #endif
- 		return launch(data);
- 	}
-+
-+	bool PhpHandler::containsDelimiters(const QString & str)
-+	{
-+		return str.contains("\"") || str.contains("'");
-+	}
- 	
- 	void PhpHandler::onExited()
- 	{
-diff --git a/plugins/webinterface/php_handler.h b/plugins/webinterface/php_handler.h
-index 9644ad2..37a87e6 100644
---- a/plugins/webinterface/php_handler.h
-+++ b/plugins/webinterface/php_handler.h
-@@ -46,6 +46,9 @@ namespace kt
- 		
- 	signals:
- 		void finished();
-+
-+	private:
-+		bool containsDelimiters(const QString & str);
- 		
- 	private:
- 		TQByteArray output;
-diff --git a/translations/ar/messages/ktorrent.po b/translations/ar/messages/ktorrent.po
-index df3779c..bdc5048 100644
---- a/translations/ar/messages/ktorrent.po
-+++ b/translations/ar/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-12-21 15:38+0100\n"
- "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
- "Language-Team: Arabic <doc@arabeyes.org>\n"
-@@ -18,7 +18,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "المعلومات"
-@@ -187,7 +187,7 @@ msgstr ""
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "المنزلة"
-@@ -303,7 +303,7 @@ msgid "Document to open"
- msgstr "المستند لفتحه"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr ""
-@@ -581,7 +581,7 @@ msgstr "مصادر نظير إضافية"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -625,7 +625,7 @@ msgid "Add to Group"
- msgstr "أضف إلى المجموعة"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, fuzzy, no-c-format
- msgid "Speed Limits"
- msgstr "حدّ السرعة بِـ ك. بايت/ث"
-@@ -643,7 +643,7 @@ msgid "Malformed IP address."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "التفضيلات"
-@@ -677,7 +677,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "الخيارات المتقدمة"
-@@ -688,7 +688,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "الحالة"
-@@ -710,7 +710,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "سرعة التنزيل"
-@@ -830,7 +830,7 @@ msgid "User"
- msgstr "المستخدم"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "مسيير صف الإنتظار"
-@@ -1022,8 +1022,8 @@ msgid "Start torrent"
- msgstr "أنشئ سيل"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "نزّل"
-@@ -1077,13 +1077,13 @@ msgid "Encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "إستعمل تشفير الميفاق"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1091,20 +1091,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "إسمح بلإتصالات غير المشفرة"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1112,169 +1112,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "المجلّدات"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "المجلّد حيث يتم حفظ الملفات المؤقتة:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "ملفات السيول"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "شريط أدوات التنزيل"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "النسبة الأقصى:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "عدد التنزيلات الأقصى:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "ك. بايت/ث ( 0 يعني لا حدّ )"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "أضف نظير محتمل"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "عنوان ميفاق الإنترنت للنظير:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "المنفذ:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "أدخل عنوان ميفاق الإنترنت و المنفذ للنظير."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1282,187 +1282,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "عنوان ميفاق الإنترنت للنظير"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "أضف النظير:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&أمحي"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "يمحي هذه اللائحة"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "إحفظ &كـ..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "عدد التنزيلات الأقصى:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "( 0 يعني لا حدّ )"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, fuzzy, no-c-format
- msgid "Global connection limit:"
- msgstr "حدّ الإتصال الإجمالي"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "عدد التنزيلات الأقصى:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "ك. بايت/ث ( 0 يعني لا حدّ )"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "( 0 يعني لا حدّ )"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "إنتباه"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1470,283 +1470,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "الحالة:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "البايتات المتبقية:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "السيل"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "أ&نقل للإعلى"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "أنقل للأ&سفل"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "أ&نقل للإعلى"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&موافق"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "إ&لغاء"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "أنشئ سيل"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "خيارات الملف"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "ك. بايت"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "الملاحظات:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "أن&شئ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "أ&لغي"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "لا شيئ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1754,19 +1754,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "التفضيلات المتقدمة"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1782,427 +1782,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "محرك البحث الحالي"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "الإداء"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "إستعمال الذاكرة:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "منخفض"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "متوسط"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "عالي"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "فترة تحديث واجهة المستخدم الرسزمية:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ملي ث"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "ثانية واحِدة"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "ثانيتين إثنتين"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "خمس ثوان"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, fuzzy, no-c-format
- msgid "Data Checking"
- msgstr "جاري فحص البيانات"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "الشبكة"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "مسح البيانات"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, fuzzy, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "مسح البيانات"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "الإختبار"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "المجلّد حيث يتم حفظ الملفات المؤقتة:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "المجلّد حيث يتم حفظ الملفات المؤقتة:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "إستعمال الذاكرة"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2210,602 +2210,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "حمل"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "لا &تحمل"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "حمل الكلّ"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "لا تحمل الكل"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "الأجهزة المكتشفة:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "الجهاز"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "الإتصالات:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "إعادة المسح"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "تمكين مسح المجلّد1 ؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "تمكين مسح المجلّد2 ؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "تمكين مسح المجلّد3 ؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "مسار المجلّد1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "مسار المجلّد2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "مسار المجلّد3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "إمسح المجلّد &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "إمسح المجلّد &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "إمسح المجلّد &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "المجلّدات لمسحها"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "المجلّد 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "المجلّد 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "المجلّد 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "تفضيلات البحث"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "إختر لا &شيء"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "المستخدم"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "الخيارات العامة"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "المجموع:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "حالياً يجري تنزيل:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "منزل:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "الحجم:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "التقدم"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "النظير"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "متوسط سرعة التنزيل:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "متوسط سرعة التحميل:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "التحديث التالي في:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "حدّ الإتصال الإجمالي"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "&إستعمل الحدّ ؟"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "فترة التحديث الأدنى - 60 ثانية"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "إستعد الإفتراضيات"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "أعرض لائحة النظائر"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2813,25 +2813,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2840,61 +2840,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "فترة تحديث واجهة المستخدم الرسزمية:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "متوسط"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "عدد التنزيلات الأقصى:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2903,847 +2903,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "عنوان ميفاق الإنترنت للنظير:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "الإتصالات:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "المحملة"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "الإتصالات:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "السيل:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "البيانات:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&إستورد"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "الإفتراضي"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "أم&حي"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&جديد"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "إنتعاش &تلقائي"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "أنعش"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "ال&عنوان"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&نشط"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "المرشحات"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "أقبل المرشحات"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "أرفض المرشحات"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "العبارات المنتظمة"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "إ&ختبر"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "أ&وقف التشغيل"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "ال&عادي"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "منزل:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "محمل:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "ك. بايت/ث *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 يغني لا حدّ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "إحفظ إلى الملف"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&حمل من الملف"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "إستعادة الجدول"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&موافق"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "حرر ال&جدول"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "الخيارات العامة"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "الكل"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "ملاحظة"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "هام"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "لا شيئ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "الخيارات العامة"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "النظام"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "العام:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "الإتصالات:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "متصفح خارجي"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, fuzzy, no-c-format
- msgid "Open searches in external browser"
- msgstr "إفتح نتائج البحث في المتصفح ال&خارجي"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "إستعمل المتصفح الإفتراضي"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "مسار المتصفح المعتاد:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "محركات البحث"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "إسم محرك البحث:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&أضف"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "المحركات"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "أ&حذف الكلّ"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "أضف الإفترا&ضي"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "إبحث"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "محرك البحث:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "محرك البحث الحالي"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "إستعمل المتصفح المعتاد"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4020,33 +4020,33 @@ msgstr "جاري فحص البيانات"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "خطأ إيقاف السيل %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "خطأ بدء تشغيل السيل %1 : %2"
- 
-diff --git a/translations/bg/messages/ktorrent.po b/translations/bg/messages/ktorrent.po
-index 57a568e..b9867a8 100644
---- a/translations/bg/messages/ktorrent.po
-+++ b/translations/bg/messages/ktorrent.po
-@@ -6,8 +6,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2008-03-04 21:53+0000\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-06-12 21:29+0000\n"
- "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
- "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
- "MIME-Version: 1.0\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Няма вх. връзки (вероятно има защитна стена)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Информация"
-@@ -188,7 +188,7 @@ msgstr "Неправилен адрес (URL)."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Сваляния"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Документ за отваряне"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -576,7 +576,7 @@ msgstr "Торент потребители:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT (протокол за размяна между децентрализирани потребители)"
-@@ -618,7 +618,7 @@ msgid "Add to Group"
- msgstr "Добавяне към групата"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Ограничение на скоростта"
-@@ -638,7 +638,7 @@ msgid "Malformed IP address."
- msgstr "Неправилен IP адрес."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Настройки"
-@@ -675,7 +675,7 @@ msgid "Advanced"
- msgstr "Разширени"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Разширени настройки"
-@@ -686,7 +686,7 @@ msgstr "Видими колони"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Състояние"
-@@ -708,7 +708,7 @@ msgstr "Качени"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Скорост на сваляне"
-@@ -834,7 +834,7 @@ msgid "User"
- msgstr "Потребител"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Мениджър на опашката"
-@@ -1057,8 +1057,8 @@ msgid "Start torrent"
- msgstr "Стартиране на торента"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Сваляне"
-@@ -1112,13 +1112,13 @@ msgid "Encryption"
- msgstr "Шифроване"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Шифроване на протоколите"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1128,13 +1128,13 @@ msgstr ""
- "забавя връзките."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Нешифровани връзки"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1143,7 +1143,7 @@ msgstr ""
- "шифроване."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1154,170 +1154,170 @@ msgstr ""
- "информация вижте ръководството"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Използване на DHT за намиране на потребители"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP порт за комуникация с DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Потребителско IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
--"&Изпращане на потребителското IP или името на хоста на координиращ сървър"
-+"&Изпращане на потребителското IP или името на хоста на координиращия сървър"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Потребителско IP или име на хост:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Икона в системния панел"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Показване на &икона в системния панел"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Показване на &лента за скоростта в системния панел"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Показване на изскачащи съобщения в системния панел"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Лента на качване (кБ/сек):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Лента на сваляне (кБ/сек):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Директории"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Папка за съхранение на временните файлове:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Преместване на свалените в:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Автоматично записване на свалянията в:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Копиране на .torrent файловете в:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Лента с инструменти за сваляне"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Задаване ограничения на скоростта за торент"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Макс. скорост на качване:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Макс. скорост на сваляне:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "кБ/сек (0 = без ограничение)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Добавяне на потенциален потребител"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Потребителско IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Порт:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Въведете IP и порт на потребителя."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Черен списък на KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1328,474 +1328,474 @@ msgstr ""
- "IP в раздела \"Настройване на KTorrent\"."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Блокирани потребители"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP адрес на потребител"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Добавяне на потребител:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Добавяне на потребител към черния списък"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Премахване на маркирания потребител от черния списък"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Изчистване"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Изчистване на списъка"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Запис &като..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Запис на черния списък, за да бъде използван с приставката за филтриране по IP"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Максимално сваляния:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Максимално качвания:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Сваляне при малко дисково пространство :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Минимално дисково пространство:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
--msgstr "Без стартиране"
-+msgstr "Не"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
--msgstr "Питане винаги"
-+msgstr "Питане"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
--msgstr "Принудително стартиране"
-+msgstr "Да"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "МБ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = без ограничение)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Максимална скорост на сваляне:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Ограничение на глобалната връзка:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Макс. време на качване:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Максимално връзки за торент:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Брой слотове при качване:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Порт на UDP координиращ сървър:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Макс. коефициент на споделяне:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Максимална скорост на качване:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "кБ/сек (0 = без ограничение)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "часа (0 = без ограничение)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Продължаване на качването след като свалянето завърши"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Внимание"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
- "plugin can do this for you."
- msgstr ""
--"Ако сте зад маршрутизатор горните портове трябва да бъдат пренасочени. "
--"Приставката UPnP може да го направи вместо вас."
-+"Ако сте зад маршрутизатор, горните портове трябва да бъдат пренасочени. "
-+"Приставката UPnP може да ви помогне за това."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Опашка - КТ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Състояние:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Координиращ сървър:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Коефициент на споделяне:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Остават:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Торент"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Контролирано от"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Качвания"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Качени:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "П&реместване нагоре"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Преместване на&долу"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Преместване отгоре"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Преместване &отдолу"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Контролирано от &мениджъра на опашката"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Контролирано от &потребителя"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Поставяне на адрес (URL)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "Адрес (URL):"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "О&К"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Отмяна"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Създаване на торент"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Файлът или папката, която искате да направите торент:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Трябва да добавите поне един координиращ сървър или възел."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Настройки на файл"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Големина на всяко парче:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "кБ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "&Качване на торента"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "&Децентрализирано (само DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Частен торент (DHT не е разрешен)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Коментари:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Създаване"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Отмяна"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Координиращи сървъри"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT възли"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Възел:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP или име на хост"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Порт"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1805,19 +1805,19 @@ msgstr ""
- "напишете IP адреса и порта си, ако смятате да качвате този торент."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Разширени настройки"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "Алгоритъм за оставащото време:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1843,428 +1843,428 @@ msgstr ""
- "<b>Алгоритъм за преместване:</b> Средна скорост на преместване, изчислена от Х"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Текуща скорост"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Средна скорост"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Х"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Средно преместване"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(активира се след рестартиране)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "&Изключване преразпределянето на дисковото пространство"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- "Пълно преразпределяне на &дисковото пространство (избягва фрагментацията)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Основно (бавно)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Особености на файловата система"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Натоварване"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Използвана памет:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Малко"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Средно"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Много"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Интервал за обновяване на ГПИ:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 мс"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Бърз процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Бавен процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Проверка на данните"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "По време на качване да &не се проверяват наново парчета по-големи от"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Проверка &цялостта на данните след"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "повредени парчета"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Мрежа"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Максимално връзки за торент:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP за IP пакети:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Без използване &проксито на KDE за връзки към HTTP координиращ сървър"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Прокси на HTTP координиращ сървър:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Сканиране на данни"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Сканиране данните на торент :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Намерени парчета:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Ненамерени / несвалени парчета:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Тест"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Максимално сваляния (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Максимално качвания (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Започване на сваляне при малко дисково пространство?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Максимално връзки за торент (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Максимално връзки за всички торенти (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Максимална скорост на качване в кБ/сек (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Максимална скорост на сваляне в кБ/сек (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Максимален коефициент за споделяне (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Максимално време за качване (0 = без ограничение)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Показване на икона в системния панел"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Показване на лента със скоростта в системния панел"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Скорост на сваляне (кБ/сек):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Скорост на качване (кБ/сек):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Показване на изскачащо съобщение когато торентът е готов."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Продължаване на качването след като свалянето завърши"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Папка за временните файлове"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Дали свалянията автоматично да се записват в saveDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Папка за свалените файлове"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Дали свалянията автоматично да се записват в completedDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Папка за свалените файлове"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Дали свалянията автоматично да се записват в директорията"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Папка за копиране на .torrent файловете"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Дали потребителското IP да се изпраща на координиращия сървър"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Директория, използвана като последната директория за сваляне"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP, което да бъде изпратено на координиращия сървър"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Използвана памет"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Интервал за обновяване на ГПИ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Поддръжка за DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT порт"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Брой слотове за качване"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Видими колони в KTorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ЕТ алгоритъм"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2274,458 +2274,458 @@ msgstr ""
- "зададеното, свалянето ще бъде спряно."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Мениджър на приставките"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Включване"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Изключване"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Включване на &всички"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Изключване на всички"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "UPnP устройство по подразбиране"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Открити устройства:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Устройство"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Портовете са пренасочени"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN връзки"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "&Пренасочване на портове"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Отмяна на пренасочването към портове"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Ново сканиране"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Сканиране на директория 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Сканиране на директория 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Сканиране на директория 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Път до директория 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Път до директория 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Път до директория 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Дали торентът да бъде тихо отворен или не."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Премахването е отметнато."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Преместването е отметнато."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Настройки на търсенето"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Сканиране на директория &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Сканиране на директория &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Сканиране на директория &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Преместване в директория \"Качени\" след като качването завърши"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- "Преместване на торента в директория \"Качени\" след приключване на качването"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "&Тихо отваряне на торентите"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Без показване на прозореца \"Избор на файлове за качване \""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Премахване след като &качването завърши"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Премахване на торента след като качването му завърши"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Сканирани директории"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Директория 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Директория 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Директория 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Настройки на търсенето"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Уеб сървър"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Пренасочване на порт"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL на сесия (сек.):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Маркиране на интерфейс:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Потребител:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Промяна на паролата..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Изпълним път за РНР:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Порт номер"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "пренасочване на порт"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Време на сесия"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Кожа на интерфейса"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Изпълним път на РНР"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "потребител"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "парола"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Парчета"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Общо:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "В момента се свалят:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Свалени:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Изключени:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Оставащи:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Размер:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Парче"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Завършено"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Потребител"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Приети връзки"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Качващи:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Свалящи:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Средна скорост на сваляне:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Средна скорост на качване:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Следващо обновяване след:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Състояние на координиращ сървър:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Свалени части от файла:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Налични части от файла:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Споделяне"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2734,145 +2734,145 @@ msgstr ""
- "ограничение."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Качването ще спре когато достигне тези часове."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "часа"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Ограничение на коефициента:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Ограничението работи само в режим \"качване\""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Ограничение на времето:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Обновяване"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Максимален интервал за обновяване - 60 сек."
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "&Добавяне"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Премахване"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Промяна"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "По подразбиране"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Показване на подпрозорец за потребителя в главния прозорец"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Показване на подпрозорец за сваляне в главния прозорец"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Показване на подпрозорец за координиращия сървър в главния прозорец"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Показване на списъка с потребители"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Показване на списъка с текущо сваляните па&рчета"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Показване на списъка с координиращи сървъри"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Настройки на IP-блокировката"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Избор на файл за филтъра по IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Филтриране по IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Файл за филтриране по IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Свал&яне/Конвертиране"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2882,25 +2882,25 @@ msgstr ""
- "ЗАБЕЛЕЖКА: bluetack.co.uk поддържа формата ZIP."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Адрес на филтър за ниво 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Използване на филтър за ниво 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Конвертиране..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2912,61 +2912,61 @@ msgstr ""
- "това време няма да можете да използвате KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Обновяване"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Обновяване на всеки"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Обновяване на ГПИ"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Събиране на данни на всеки"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "милисек."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Максимално"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Максимална скорост:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Фиксирана"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "За повече информация вижте \"какво е това?\""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2978,164 +2978,164 @@ msgstr ""
- "- Фиксирана: максимална скорост, която е видима в таблицата"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Потребителска скорост"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Потребителска скорост:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "обновяване на всеки"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "обновяване на таблицата"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "Ако се събрат данни за много потребители, това може да натовари процесора."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Връзки"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Големите стойности могат да засенчат данните за потребителите"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Показване на качващите като множество"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Показване на свалящите като множество"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Брояч"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Качване"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Връзки"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Потребители"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Вкл/изкл на брояча за скоростта"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Интервал между две събирания на данни за скоростта"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Вкл/изкл на брояча за свалящите"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Вкл/изкл на брояча за качващите"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Брояч на свалянията"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Брояч на скоростта"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Брояч на качванията"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Брояч на връзките"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Брояч на DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Макс. OY ос"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Импортиране на съществуващо сваляне"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Торент:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Данни:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3143,684 +3143,684 @@ msgstr ""
- "Моля, посочете торента и данните, които вече за свалени от този торент."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Импортиране"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "по подразбиране"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Rss източници"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Източници"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Премахване"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Нов"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&Адрес (URL)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Статии"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Авто&обновяване"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "&Игнориране на TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Презареждане"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Заглавие"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Запазване на статиите (дни)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Активни"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Филтри"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Приемане на филтри"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Отхвърляне на филтри"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Регулярни изрази"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Третиране като &серии"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Процес"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Критерии за серия"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Съвпадане без епизод"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Макс. епизод"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Макс. сезон"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Мин. сезон"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Мин. епизод"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Тестване на &текст"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Тест"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Съвпадения на филтъра"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "График"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Щракнете с левия бутон върху категория"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Категория &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Изключване"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Нормално"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Категория &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Категория &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Щракнете с десния бутон върху категория"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Категория &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "Категория &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Категории"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "сваляне:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "качване:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "кБ/сек *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "0 = без ограничение"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Запис във файл"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Зареждане от файл"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Анулиране на графика"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "О&К"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Страница за настройка на приставката за графика"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Използване на &график"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "График"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Използване на цветове вместо &пикселкарти"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Препоръчително за по-бавни компютри)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Редактиране на &графика"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Включване на графика за лентата?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Използване на цветове вместо пикселкарти?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Богато оформление"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Флаг на съобщенията за обща информация"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Флаг на съобщенията за връзките"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Флаг на DHT съобщенията"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Флаг на съобщенията с информация от координиращия сървър"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Флаг на съобщенията за приставката за вх/изх"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за филтриране по IP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за търсене"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Флаг на съобщенията за приставката частично импортиране на файлове"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за информация"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за сканиране на директории"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Флаг на съобщения за приставката за графика"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Флаг на съобщенията за RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Флаг на съобщенията за приставката за уеб-интерфейса"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Настройки на дневника"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Приставки"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Всички"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Отстраняване на грешки"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Бележка"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Важно"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Без"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-филтър:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Търсене:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Сканирани директории:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "График:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Информация:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS приставка:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Приставка за уеб-интерфейса:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Система"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Общи:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Връзки:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Диск - вх/изх:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Използване на &богато оформление"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Външен браузър"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Отваряне на резултатите от търсенето във външен браузър"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Използване на браузъра по подразбиране"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Път до потребителски браузър:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Търсачки"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Име на търсачката:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Добавяне"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Търсачки"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "Адрес (URL)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Премахване на всички"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Добавяне по подразбиране"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Обновяване от Интернет"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Търсене"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Търсачка:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Използвана търсачка"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Използване на потребителски браузър"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Изпълним път на браузъра"
-@@ -4109,7 +4109,7 @@ msgstr "Проверка на данните"
- msgid "Stopped. No space left on device."
- msgstr "Спрян. Няма свободно място."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4117,12 +4117,12 @@ msgstr ""
- "Нямате достатъчно свободно място на диска. Сигурни ли сте, че искате да "
- "продължите?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Недостатъчно дисково пространство за %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4130,16 +4130,16 @@ msgstr ""
- "Торентът \"%1\" достигна максималния коефициент на споделяне. Искате ли да "
- "игнорирате ограничението и да започнете качване?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Достигнато е ограничението на коефициента за споделяне."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Грешка при спиране на торент %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Грешка при стартиране на торент %1 : %2"
- 
-diff --git a/translations/br/messages/ktorrent.po b/translations/br/messages/ktorrent.po
-index c2694d4..1b9fa6a 100644
---- a/translations/br/messages/ktorrent.po
-+++ b/translations/br/messages/ktorrent.po
-@@ -1,7 +1,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: all2.po\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2004-09-20 15:44+0200\n"
- "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
- "Language-Team: br <LL@li.org>\n"
-@@ -14,7 +14,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Titouroù"
-@@ -189,7 +189,7 @@ msgstr "URL siek."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr ""
-@@ -307,7 +307,7 @@ msgid "Document to open"
- msgstr "Teul da zigeriñ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -592,7 +592,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -637,7 +637,7 @@ msgid "Add to Group"
- msgstr "Ouzhpennañ er strollad"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -656,7 +656,7 @@ msgid "Malformed IP address."
- msgstr "URL siek."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Dibaboù"
-@@ -690,7 +690,7 @@ msgid "Advanced"
- msgstr "Barek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Dibaboù barek"
-@@ -701,7 +701,7 @@ msgstr "Bannoù hewel"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stad"
-@@ -723,7 +723,7 @@ msgstr "Ezkarget"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr ""
-@@ -844,7 +844,7 @@ msgid "User"
- msgstr "Arveriad"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Merour al lost"
-@@ -1037,8 +1037,8 @@ msgid "Start torrent"
- msgstr "Krouiñ ar ster-froud"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Enkargañ"
-@@ -1092,13 +1092,13 @@ msgid "Encryption"
- msgstr "Enrinegadur"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1106,20 +1106,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1127,169 +1127,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP diouzhoc'h"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "IP pe anv ostiz diouzhoc'h :"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP pe anv ostiz diouzhoc'h :"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Arlun barlenn ar reizhiad"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Diskou&ez arlun barlenn ar reizhiad"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Diskou&ez arlun barlenn ar reizhiad"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Diskou&ez arlun barlenn ar reizhiad"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Renkelloù"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Renkell ar restroù padennek :"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "N'enkargit ket"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "restroù ster-froud"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barenn ostilhoù enkargañ"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "ezkargañ :"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Enkargañ"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porzh :"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Restroù ster-froud"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1297,187 +1297,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Goullonderiñ"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Enrollañ e ..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, fuzzy, no-c-format
- msgid "Minimum disk space:"
- msgstr "Egor dieub ar bladenn :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "N'eo ket loc'het"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Goulenn bepred"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "N'eo ket loc'het"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "Mo"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "ezkargañ :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Ho evezh"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1485,283 +1485,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stad :"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT :"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Ster-froud"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Ezkarget"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Ezkarget :"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "P&ignit"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "D&iskennit"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "P&ignit"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Fiñval d'an &traoñ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Pegañ an URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL :"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "Mat &eo"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Nullañ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Krouiñ ar ster-froud"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Dibarzhoù ar restr"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KO"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Askelennoù :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Krouiñ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Nu&llañ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Skoulm :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "IP pe anv ostiz diouzhoc'h :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porzh"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1769,19 +1769,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Dibaboù klask"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1797,427 +1797,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Dibaboù"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Penoas vez implijet ar vemor :"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Izel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Krenn"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Uhel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500me"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1e"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2e"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5e"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Rouedad"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Arnodiñ"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Diskouez un arlun barlenn reizhiad"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Diskou&ez arlun barlenn ar reizhiad"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Renkell ar restroù padennek"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Renkell ar restroù padennek"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr " N'hell ket bet digoret ar restr ster-froud %1 : %2"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Renkell ar restroù padennek"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Penoas vez implijet ar vemor"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Porzh DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2225,602 +2225,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Merour al lugentoù"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Kargañ"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Di&gargañ"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Kargañ an holl re"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Digargañ an holl re"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Trobarzhell"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "Kevreadennoù :"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr " N'hell ket bet digoret ar restr ster-froud %1 : %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Dibaboù klask"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "restroù ster-froud"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Dibaboù klask"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Servijer Web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Dibabit &netra"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Anv an arveriad :"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Tremenger :"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Dibarzhoù hollek"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "anv an arveriad"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "tremenger"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Hollek :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Emaon oc'h enkargañ :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Enkarget :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Kleiz :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Ment :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Pezh"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Araogenn"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Stad :"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Rannañ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "Hep muzul"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Da gaout"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Da gaout"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Da gaout"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Da gaout"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Dibaboù IPBlocking"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Implij sil KTorrent ?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Implij sil KTorrent ?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Restr sil IP :"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "En&kargañ/Amdreiñ"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2828,25 +2828,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Oc'h amdreiñ ..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2855,61 +2855,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Krenn"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2918,847 +2918,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "Kevreadennoù :"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Diskou&ez arlun barlenn ar reizhiad"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Ezkarget"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "Kevreadennoù :"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Enkargañ ar ster-froud"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Ster-froud :"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Roadoù :"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Enporzh"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "dre ziouer"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Dilemel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nevez"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Pennadoù"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Adtresañ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titl"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Bev"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Siloù"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Pep restr"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Argerzh"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Ar&nodiñ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, fuzzy, no-c-format
- msgid "Categor&y 1"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "L&azhañ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Boas"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, fuzzy, no-c-format
- msgid "Category &3"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, fuzzy, no-c-format
- msgid "Category &2"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, fuzzy, no-c-format
- msgid "Category &1"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, fuzzy, no-c-format
- msgid "&Category 3"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Rummoù"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Enkargañ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "ezkargañ :"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Enrollañ en ur restr"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "M&at eo"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Dibaboù al lugent"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Dibarzhoù ar restr"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Dibaboù al lugent"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Dibaboù al lugent"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Dibaboù al lugent"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Dibarzhoù ar restr"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Lugentoù"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Holl"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Kemenn"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Pouezus"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ebet"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Restr sil IP :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Klask :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Renkelloù"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Steuñvaer :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Lugent RSS :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Dibarzhoù hollek"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Reizhiad"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Pennañ :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Kevreadennoù :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "IP diouzhoc'h"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Kefluskerioù klask"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Anv ar c'heflusker klask :"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Ouzhpennañ"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "L&emel an holl re"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Klask"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Keflusker klask :"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4037,33 +4037,33 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Fazi en ur herzel ar ster-froud %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Fazi en ur loc'hañ ar ster-froud %1 : %2"
- 
-diff --git a/translations/ca/messages/ktorrent.po b/translations/ca/messages/ktorrent.po
-index 7cd624f..86ebaa1 100644
---- a/translations/ca/messages/ktorrent.po
-+++ b/translations/ca/messages/ktorrent.po
-@@ -7,8 +7,8 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2008-02-09 15:12+0100\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-06-03 21:57+0200\n"
- "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
- "Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
- "MIME-Version: 1.0\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Sense connexions d'entrada (possible tallafocs)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informació"
-@@ -169,7 +169,7 @@ msgid ""
- "ranges like '127.0.0.*'."
- msgstr ""
- "Heu d'escriure les IP en format 'XXX.XXX.XXX.XXX'. Podeu usar comodins per a "
--"rangs, com ara '127.0.0.*'."
-+"intervals, com ara '127.0.0.*'."
- 
- #: apps/ktorrent/ipfilterwidget.cpp:88
- #: plugins/scheduler/bwsprefpagewidget.cpp:129
-@@ -189,7 +189,7 @@ msgstr "URL erroni."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Baixades"
-@@ -212,7 +212,7 @@ msgid ""
- "KTorrent is unable to accept connections because the ports %1 to %2 are already "
- "in use by another program."
- msgstr ""
--"El Ktorrent no pot acceptar connexions perquè un altre programa està usant els "
-+"El KTorrent no pot acceptar connexions perquè un altre programa està usant els "
- "ports del %1 al %2."
- 
- #: apps/ktorrent/ktorrentcore.cpp:767
-@@ -312,7 +312,7 @@ msgid "Document to open"
- msgstr "Document a obrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -577,7 +577,7 @@ msgstr "Fonts de parells de torrents:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -619,7 +619,7 @@ msgid "Add to Group"
- msgstr "Afegeix al grup"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Límits de velocitat"
-@@ -639,7 +639,7 @@ msgid "Malformed IP address."
- msgstr "Adreça IP mal escrita."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferències"
-@@ -675,7 +675,7 @@ msgid "Advanced"
- msgstr "Avançat"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Opcions avançades"
-@@ -686,7 +686,7 @@ msgstr "Columnes visibles"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Estat"
-@@ -708,7 +708,7 @@ msgstr "Pujat"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Baixant a"
-@@ -832,7 +832,7 @@ msgid "User"
- msgstr "Usuari"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Gestor de cues"
-@@ -1055,8 +1055,8 @@ msgid "Start torrent"
- msgstr "Engega el torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Descarrega"
-@@ -1110,13 +1110,13 @@ msgid "Encryption"
- msgstr "Xifrat"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usa xifrat del protocol"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1126,13 +1126,13 @@ msgstr ""
- "connexions bittorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permet connexions no encriptades"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1141,7 +1141,7 @@ msgstr ""
- "encriptació."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1152,169 +1152,169 @@ msgstr ""
- "més informació."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usa DHT per a obtenir parells addicionals"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Port UDP per a la comunicació DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP personalitzada"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "E&nvia al seguidor una IP o nom de màquina personalitzat"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP personalitzada o nom de màquina:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Icona de la safata de sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostra la icona a la safata del s&istema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Mostra la &barra de velocitat a la safata del sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mostra missatges emergents a la safata"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Ample de banda de pujada (en KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Ample de banda de baixada (en KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Carpetes"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Carpeta per desar arxius temporals:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Moure les descàrregues completes a:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Des&a automàticament les baixades a:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Copiar els arxius .torrent a:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra d'eines de baixades"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Posa límits de velocitat per torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Raó màxima de pujada:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Raó màxima de baixada:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 és sense límit)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Afegeix un parell potencial"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Parell IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Entreu el parell IP i el port."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Llista negra del KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1324,187 +1324,187 @@ msgstr ""
- "desar les entrades o useu el connector IPFilter (Guardià de parells)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Parell bandejats"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Adreça IP del parell"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Afegeix parell:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Afegeix parells a la llista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Esborra el parell seleccionat de la llista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Neteja"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Neteja aquesta llista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Des&a Com..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Desa aquesta llista per a utilitzar-la amb el connector IPFilter"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Màxim nombre de baixades:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Màxim nombre de llavors:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Comença la baixada amb poc espai al disc:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Espai mínim al disc:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "No comencis"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Pregunta-ho sempre"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Obliga a començar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 és sense límit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Velocitat màxima de baixada:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Límit global de connexió:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Ràtio màxima de compartició:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Nombre màxim de connexions per torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Nombre de canals de pujada:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Port del seguidor UDP:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Ràtio màxima de compartició:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Velocitat màxima de pujada:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/seg (0 és sense límit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Hores (0 és sense límit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Manté la llavor després de haver finalitzat la baixada"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Atenció"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1514,283 +1514,283 @@ msgstr ""
- "connector UPnP por fer-ho per vosaltres."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Diàleg de cua KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Estat:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Seguidor:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Ràtio de compartició:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Bytes deixats:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlat per"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Pujade&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Pujat:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "M&ou amunt"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Mou a&vall"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Mou a dalt"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Mou a &baix"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controlat per &QM"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controlat per l'&usuari"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Enganxa URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&Bé"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancel·la"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Crea torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "L'arxiu o la carpeta del que voleu crear un torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Heu d'afegir almenys un seguidor o node."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opcions de fitxer"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Mida de cada tros:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Comença a &sembrar el torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Descentralit&zat (només DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrent privat (DHT no permés)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comentaris:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Crea"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncel·la"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Seguidors"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Nodes DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Node:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP o nom de màquina"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1801,19 +1801,19 @@ msgstr ""
- "torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferències avançades"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
--msgstr ""
-+msgstr "Algorisme d'estimació del temps restant:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1831,7 +1831,7 @@ msgstr ""
- "d'altres algorismes i basat en les nostres proves."
- "<br>\n"
- "<b>Algorisme de la velocitat actual:</b> El més simple - "
--"BytesPendents/VelociatActual"
-+"BytesPendents/VelocitatActual"
- "<br>\n"
- "<b>Algorisme de la velocitat mitjana global:</b> BytesPendents/VelocitatMitjana"
- "<br>\n"
-@@ -1841,428 +1841,428 @@ msgstr ""
- "calculades a X mostres"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Velocitat actual"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Velocitat mitjana global"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Finestra d'X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
--msgstr "Mitjàna mòbil"
-+msgstr "Mitjana mòbil"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(té efecte en reiniciar)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Desa&ctiva la reserva d'espai al disc"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Reser&va completa d'espai al disc (evita la fragmentació)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Bàsic (lent)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Específic del sistema de fitxers"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Preferències"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Ús de memòria:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Baix"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Mitjà"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "interval d'actualització de l'IGU:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "CPU ràpida"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "CPU lenta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Comprovació de dades"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Durant la pujada &no comprovis trossos més grans que"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Comprova la integr&itat de les dades després"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "Trossos corruptes"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Connexions"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Nombre màxim de connexions establertes:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP per a paquets IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- "No usis l'inte&rmediari del KDE per a les connexions HTTP dels seguidors"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Intermediari del seguidor HTTP:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Explorant dades"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Explorant dades del torrent:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Nombre de trossos trobats:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Nombre de trossos fallits / sense baixar:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Prova"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Nombre màxim de baixades (0 = cap límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Nombre màxim de llavors(0 = cap límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Inicia baixades si hi ha poc espai al disc?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Nombre màxim de connexions per torrent (0 = sense límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Màxim nombre de connexions per a tots els torrents (0 = sense límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocitat màxima de pujada en KB/seg (0 = cap límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocitat màxima de baixada en KB/seg (0 = cap límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Ràtio màxima de compartició (0 significa sense límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Ràtio màxima de compartició (0 significa sense límit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostra una icona a la safata del sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostra la barra de velocitat a la safata del sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Ample de banda de baixada (en kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Ample de banda de pujada (en kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostra missatges emergents en finalitzar el torrent."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Manté la llavor després d'haver finalitzat la baixada"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Carpeta per desar els fitxers temporals"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Si desar automàticament les baixades a la carpeta de desat"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Carpeta per desar els fitxers baixats"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Si desar automàticament les baixades a la carpeta de completats"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Carpeta on moure els fitxers baixats del tot"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Si copiar automàticament els fitxers .torrent a la carpeta de còpies"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Carpeta on copiar els fitxers .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Si usar una IP personalitzada a per a passar al seguidor"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Carpeta que s'ha usat en l'últim desat"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP per enviar al seguidor"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Ús de memòria"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Interval d'actualització de l'IGU"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Accepta DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Port DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Nombre de canals de pujada"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
--msgstr "Columnes que es mostren en la vista del Ktorrent"
-+msgstr "Columnes que es mostren en la vista del KTorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algorisme ET"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2272,458 +2272,458 @@ msgstr ""
- "l'espai mínim al disc, el torrent s'atura."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Gestor de connectors"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Carrega"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Descarrega"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "C&arrega-ho tot"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Descarrega-ho tot"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositiu UPnP a utilitzar per defecte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositius detectats:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositiu"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Ports redirigits"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Connexió WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Ports de &redirecció"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Desfés la redirecció de ports"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Reescaneja"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Permet l'exploració de la carpeta1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Permet l'exploració de la carpeta2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Permet l'exploració de la carpeta3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Camí de la carpeta1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Camí de la carpeta2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Camí de la carpeta3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Si obrir el torrent silenciosament o no."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Activada l'acció d'esborrar."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Acció de moure activada."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferències d'exploració de carpetes"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Explora la carpeta &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Explora la carpeta &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Explora la carpeta &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Mou &a la carpeta de \"carregats\" després de carregar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- "Mou el torrent a la carpeta de \"carregats\" després d'haver-lo carregat"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Obre els torrents s&ilenciosament"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "No mostra el diàleg 'Seleccioneu els fitxers a baixar'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Esborrar després de carre&gar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Esborra el torrent després de la càrrega"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Carpetes a explorar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Carpeta 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Carpeta 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Carpeta 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferències de cerca"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Servidor web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Port de redirecció"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL de sessió (en segons):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Trieu interfície:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Usuari:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Canvia la contrasenya ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Camí de l'executable php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Número del port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Port de redirecció"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Temps de vida de la sessió"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Aspecte de la interfície"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Camí de l'executable php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "usuari"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "contrasenya"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Trossos"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Baixant ara:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Baixat:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Exclòs:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Pendent:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Mida:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Tros"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Progrés"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Parell"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Parells assignats"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Sembradors:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Sangoneres:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocitat mitjana de baixada:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocitat mitjana de pujada:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Propera actualització:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Estat del seguidor:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Parts del torrent que s'han baixat:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Parts del torrent que estan disponibles:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Compartint"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2732,7 +2732,7 @@ msgstr ""
- "valor. El zero significa que no hi ha límit."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2740,140 +2740,140 @@ msgstr ""
- "valor. El zero significa que no hi ha límit."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Hores"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Ràtio límit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "El límit només funciona en mode sembrador"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Temps &límit:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Actu&alitza el seguidor"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Interval mínim d'actualització - 60 segons"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Afegeix se&guidor"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Elimina seguidor"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Ca&nvia seguidor"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Restaura per defecte"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostra la pestanya de vista de parells a la finestra principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- "Mostra la pestanya de vista de baixada de trossos a la finestra principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Mostra la pestanya de seguidors a la finestra principal"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostra la llista de parells"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostra la llista de trossos &actualment en baixada"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostra la llista de seguidors"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferències de bloqueig d'IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Selecciona el fitxer filtre de guardià de parells"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Usar el filtre Guardià de parells?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Fitxer de filtres d'IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&Baixa/Converteix"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2883,25 +2883,25 @@ msgstr ""
- "Nota: Es pot usar el fitxer ZIP de bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL del filtre de nivell1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Utilitzo el filtre de nivell1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "S'està convertint..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2913,61 +2913,61 @@ msgstr ""
- "durant aquesta estona no podreu usar el KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Actualitza"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Actualitza els gràfics cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Actualitzacions de l'IGU"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Reuneix dades cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "mil·lisegons"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Màxim"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Mode escala de màxima velocitat:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exacte"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Vegeu 'Què és això' per a més ajuda"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2979,163 +2979,163 @@ msgstr ""
- "- Exacte: La velocitat assolida més gran visible al gràfic"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Velocitat dels parells"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Velocitat dels parells:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "actualitza cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "actualitzacions de les dades"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Reunir dades sobre molts parells pot consumir força CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Connexions de parells"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Grans valors poden amagar gràfics de parells connectats"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostra els sembradors dels eixams"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Mostra les sangoneres dels eixams"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Nombre de mesures"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Pujada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Connexions"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Parells"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Canvia els gràfics de parells i velocitat"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Interval en el qual agafar dades sobre velocitat dels parells"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Canvia el gràfic de sangoneres en eixams"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Canvia el gràfic de sembradors en eixams"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Nombre de mesures de baixada"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Nombre de mesures de velocitat dels parells"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Nombre de mesures de pujada"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Nombre de mesures de connexions"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Nombre de mesures DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "mode eix OY màxim"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importa una baixada existent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dades:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3143,684 +3143,684 @@ msgstr ""
- "Si us plau, indiqueu el torrent i les dades ja baixades per aquest torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importa"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "per defecte"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Fonts RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Fonts"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "E&sborra"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nou"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Articles"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "&Refresc automàtic"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnora TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Refresca"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Títol"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Manté articles (dies)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Actiu"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtres"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Accepta filtres"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Rebutja filtres"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Expressions regulars"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tracta com a &sèrie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Processa"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Criteris de sèries"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Coincidència sense l'episodi"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Episodi màx."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Temporada màx."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Temporada mín."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Episodi mín."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Comprova te&xt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Prova"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtre de correspondències"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Programador d'ample de banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoria del botó esquerra"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Categor&ia 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "A&paga"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoria del botó dret"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categories"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>Categoria 1.-</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>Categoria 3.-</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "baixada:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "pujada:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>Categoria 2.-</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* El zero és igual a sense límit"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Desa a un fitxer"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Carrega des del fitxer"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Restaura programa"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&D'acord"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Pàgina de preferències del connector de programació"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Usar el programador d'ample de &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Programador d'ample de banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Uso colors enlloc de mapes de pí&xels?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Recomenat per a sistemes lents)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Edita la &programació"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Activar el programador d'ample de banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Usar colors enlloc de mapes de píxels?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usa text ric per a la bitàcola"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Marca dels missatges d'informació general"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Marca dels missatges de connexions"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Marca dels missatges de DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Marca dels missatges dels seguidors"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Marca dels missatges d'informació E/S del disc"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Marca del connector IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Marca dels missatges del connector de cerca"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Marca dels missatges del connector PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Marca dels missatges del connector Estri d'informació"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Etiquetes pels missatges del connector UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Etiqueta pels missatges del connector d'exploració"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Etiqueta pels missatges del connector de programació"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Marca dels missatges del connector RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Marca del connector IPFilter"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opcions del visualitzador de la bitàcola"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Connectors"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Tot"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Depuració"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Avís"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Important"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Cap"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtre d'IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Cerca:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Explorador de carpetes:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Programador:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Import de parts de fitxer:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Estri d'informació:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Endollable RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Connector Interfície de web:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "General:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Connexions:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "E/S del disc:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usa te&xt ric per la bitàcola"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Navegador extern"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Obre els resultats de la cerca en un navegador extern"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Usa el navegador per omissió"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Camí d'exploració personalitzat:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Motors de cerca"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nom del motor de cerca:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Afegeix"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motors"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Elimina-ho tot"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Afegeix per &defecte"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Actualitza des d'Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Cerca"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motor de cerca:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Motor de cerca actual"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Usa el navegador per omissió"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Ruta de l'executable del navegador personalitzat"
-@@ -4109,7 +4109,7 @@ msgstr "Comprovant dades"
- msgid "Stopped. No space left on device."
- msgstr "Aturat. No queda espai al dispositiu."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4117,12 +4117,12 @@ msgstr ""
- "No disposeu de prou espai al disc per a baixar aquest torrent. Esteu segur que "
- "voleu continuar?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Espai al disc insuficient per a %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4130,16 +4130,16 @@ msgstr ""
- "El torrent \"%1\" ha assolit la seva ràtio màxima de compartició. Ignorar el "
- "límit i tornar a sembrar?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "S'ha assolit la ràtio màxima de compartició."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Error en aturar el torrent %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Error en engegar el torrent %1 : %2"
- 
-@@ -4338,7 +4338,7 @@ msgstr "Interfície de web"
- 
- #: plugins/webinterface/webinterfaceplugin.cpp:44
- msgid "Allow to control ktorrent through browser"
--msgstr "Permet controlar el Ktorrent des del navegador"
-+msgstr "Permet controlar el ktorrent des del navegador"
- 
- #: plugins/infowidget/fileview.cpp:57
- msgid "Download First"
-@@ -4897,6 +4897,3 @@ msgid ""
- "Finds peers running ktorrent on the local network to share torrents with"
- msgstr ""
- "Troba parells executant KTorrent a la xarxa local per a compartir els torrents"
--
--#~ msgid "ETA algorithm:"
--#~ msgstr "Algorisme ETA:"
-diff --git a/translations/cs/messages/ktorrent.po b/translations/cs/messages/ktorrent.po
-index d3d791e..c4cebbe 100644
---- a/translations/cs/messages/ktorrent.po
-+++ b/translations/cs/messages/ktorrent.po
-@@ -11,7 +11,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-08-18 00:52+0200\n"
- "Last-Translator: Marek Stopka (m4r3k) <marekstopka@gmail.com>\n"
- "Language-Team:  <cs@li.org>\n"
-@@ -27,7 +27,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Žárné příchozí spojení (možná špatně nastavený firewall)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informace"
-@@ -195,7 +195,7 @@ msgstr "Chybné URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Stahování"
-@@ -320,7 +320,7 @@ msgid "Document to open"
- msgstr "Dokument k otevření"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -589,7 +589,7 @@ msgstr "Zdroje protějšků pro torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -633,7 +633,7 @@ msgid "Add to Group"
- msgstr "Přidat do skupiny"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Omezení rychlosti"
-@@ -651,7 +651,7 @@ msgid "Malformed IP address."
- msgstr "Nesprávně utvořená IP adresa."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Nastavení"
-@@ -687,7 +687,7 @@ msgid "Advanced"
- msgstr "Pokročilé"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Pokročilá nastavení"
-@@ -698,7 +698,7 @@ msgstr "Viditelné sloupce"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stav"
-@@ -720,7 +720,7 @@ msgstr "Odesláno"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Stahování"
-@@ -844,7 +844,7 @@ msgid "User"
- msgstr "Uživatel"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Správce fronty"
-@@ -1069,8 +1069,8 @@ msgid "Start torrent"
- msgstr "Spustit torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Stáhnout"
-@@ -1124,13 +1124,13 @@ msgid "Encryption"
- msgstr "Šifrování"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Používat šifrování protokolu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1140,13 +1140,13 @@ msgstr ""
- "pro bittorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Povolit nešifrovaná spojení"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1155,7 +1155,7 @@ msgstr ""
- "kteří mají zapnuto šifrování."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1166,169 +1166,169 @@ msgstr ""
- "přečtěte manuál."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "Po&užít DHT k získání většího počtu protějšků"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP port pro DHT komunikaci:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Vlastní IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Poslat trackeru vlast&ní IP nebo jméno hostitele"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Vlastní IP nebo jméno hostitele:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikona v systémové části panelu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Zobrazit ikonu v s&ystémovém panelu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Zo&brazit rychlost v ikoně systémového panelu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Zobrazit vyskakovací zprávy systémového panelu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Rychlost odesílání (v KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Rychlost stahování (v KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Složky"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Složka pro dočasné soubory:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Přesunout dokončená stahování do:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Automaticky ukládat torrenty do:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopírovat .torrent soubory do:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Lišta stahování"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Nastavit omezení rychlosti pro torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximální rychlost odesílání:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maximální rychlost stahování:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 je bez omezení)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Přidat potenciální protějšek"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP protějšku:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Vložte IP a port protějšku."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent blacklist"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1339,187 +1339,187 @@ msgstr ""
- "(PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Zakázané protějšky"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP adresa protějšku"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Přidat protějšek:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Přidá protějšek na blacklist"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Odstraní vybraný protějšek z blacklistu"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Vyčis&tit"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Vyčistit tento seznam"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Uložit j&ako..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Uložit tento blacklist pro použití se zásuvným modulem IPFilter"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximum stahování:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximum odesílání:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Začít stahovat i pokud je na disku málo místa :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimální místo na disku:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Nespouštět"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Vždy se zeptat"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Spustit"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 je bez omezení)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximální rychlost stahování:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Souhrnný limit připojení:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maximální doba sdílení:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximum připojení na torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Počet slotů pro odesílání:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Port UDP trackeru:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maximální poměr sdílení:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximální rychlost odesílání:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 je bez omezení)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Hodin (0 je bez omezení)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "Pokračovat ve &sdílení i když je stahování dokončeno"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Pozor"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1529,283 +1529,283 @@ msgstr ""
- "UPnP to za vás může udělat."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Správce fronty"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stav:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Poměr sdílení:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Zbývá bajtů:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Spravuje fronta"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Ode&sílání"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Odesláno:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Přesunout &výš"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Přesunout &níž"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Přesunout nahoru"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Přesunout &dolů"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Spravováno ve &frontě"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Ovládání &uživatelem"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Vložit URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "Z&rušit"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Vytvořit torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Soubor nebo složka, ze které chcete vytvořit torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Je třeba přidat aspoň jeden tracker nebo uzel."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Možnosti souboru"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Velikost bloku:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Začít &sdílet torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Decentrali&zováno (pouze DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privátní torrent (DHT nepovoleno)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Komentáře:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "V&ytvořit"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Z&rušit"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackery"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT uzlů"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Uzel:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "Vlastní IP nebo jméno hostitele"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1815,19 +1815,19 @@ msgstr ""
- "IP adresu a port, pokud plánujete sdílet tento torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Pokročilé volby"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1855,429 +1855,429 @@ msgstr ""
- "z X vzorků"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Aktuální rychlost"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Celková průměrná rychlost"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Okno X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Pohyblivý průměr"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(změny se projeví až po restartu aplikace)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Vy&pnout předallokování místa na disku"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Kompletně předallokovat místo na disk&u (předejdete fragmentaci)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Základní (pomalé)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Podle filesystému"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Výkon"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Využití paměti:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Nízké"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Střední"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Vysoké"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Interval aktualizace GUI:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Rychlé CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Pomalé CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Kontrola dat"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Během odesílání &nekontrolovat bloky větší než"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Zkontroluj integrit&u dat po"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "chybných blocích"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Síťové nástroje"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximální počet připojení na jeden torrent (0= bez omezení)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Nepoužívat KDE pro&xy pro HTTP spojení s trackerem"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP proxy pro spojení s trackerem:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Kontroluji data"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Kontroluji data torrentu:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Počet nalezených bloků:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Počet chybných/nestažených bloků:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximální počet stahování (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximální počet sdílení (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Začít stahovat pokud je na disku málo místa?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximální počet připojení na jeden torrent (0= bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maximální počet připojení na všechny torrenty (0= bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximální rychlost odesílání v KB/s (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximální rychlost stahování v KB/s (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximální poměr sdílení (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maximální čas sdílení v hodinách (0 = bez omezení)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Zapustit ikonu do panelu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Zobrazit ikonu v systémovém panelu i s rychlostí"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Pásmo pro stahování (v kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Pásmo pro odesílání (v kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Zobrazit vyskakovací zprávu, jakmile bude torrent stažen."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Sdílet soubor i po stažení"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Složka pro dočasné soubory"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Jestli automaticka ukládat stahování do saveDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Složka pro stažené soubory"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Zda-li automaticky automaticky přesouvat dokončená stahování do completedDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Složka pro stažené soubory"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Zda-li automaticky automaticky kopírovat .torrent soubory do torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Složka pro .torrent soubory"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Zda použít vlastní IP na předání trackeru"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Složka, která byla použita jako sposlední k uložení"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP na předání trackeru"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Použití pamětiVyužití paměti"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Interval aktualizace GUI"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Podpora DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Počet slotů pro odesílání"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Viditelné sloupce v KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritmus pro průměr"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2287,457 +2287,457 @@ msgstr ""
- "minDiskSpace, torret bude zastaven."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Správce zásuvných modulů"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Načíst"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Uvol&nit"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "N&ačíst vše"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Uvolnit vše"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Výchozí UPnP zařízení"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Zjištěná zařízení:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Zařízení"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Předávané porty"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN připojení"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Před&at porty"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Vrátit zpět předávání portů"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Znovu projít"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Povolit procházení složky 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Povolit procházení složky 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Povolit procházení složky 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Cesta ke složce 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Cesta ke složce 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Cesta ke složce 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Zda otevírat torrenty bez dotazování či ne."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Označeno Smazat."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Označeno Přesunout."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Nastavení procházení složek"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Procházet složku &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Procházet složku &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Procházet složku &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Přesunout do složky \"načteno\" po n&ačtení"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Přesunout torrenty do složky \"načteno\" po jejich načtení"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Otevírat torrent&y bez dotazování"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Nezobrazovat dialog pro vybrání souborů, které se mají stahovat"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "S&mazat po načtení"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Smazat torrent po načtení"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Složky k prohledávání"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Složka 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Složka 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Složka 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Nastavení hledání"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Webový server"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Předat port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Délka platnosti Session (v sekudnách):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Vyber uživatelské rozhraní:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Uživatelské jméno:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Změnit heslo ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Cesta k php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Číslo portu"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Předat port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Délka platnosti sezení"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Vzhled rozhraní"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Cesta ke spustitelnému souboru php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "uživatelské jméno"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "heslo"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Bloky"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Celkem:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Právě se stahuje:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Staženo:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Vyloučeno:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Zbývá:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Velikost:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Blok"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Průběh"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Protějšek"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Přiřazené protějšky"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Protějšky:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Stahující:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Průměrná rychlost stahování:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Průměrná rychlost odesílání:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Další aktualizace za:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Stav trackeru:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Části souboru, které jsou staženy:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Části souboru, které jsou dostupné:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Sdílení"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2746,145 +2746,145 @@ msgstr ""
- "nulová, tak je bez limitu."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Režim sdílení se vypne, jakmile doba sdílení dosáhne této hodnoty."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Hodiny"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Sdílecí limit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Limit funguje pouze, v režimu sdílení"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Časový &limit:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Aktualizovat tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimální interval aktualizace - 60 sekund"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Přidat t&racker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Odstranit tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Změ&nit tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Obnovit výchozí"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Zobrazit kartu protějšků v hlůavním okně"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Zobrazit kartu stahování bloků v hlavním okně"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Zobrazit záložku s trackery v hlavním okně"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Zobrazit seznam protějšků"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Zobrazit seznam právě stahovaných por&cí"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Zobrazit seznam trackerů"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Nastavení blokování IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Vyberte soubor s filtrem"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Použít filtr KTorrent?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Soubor IP filtru:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Stáh&nout/převést"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2894,25 +2894,25 @@ msgstr ""
- " Poznámka: ZIP soubor z bluetack.co.uk je podporován."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL filtru úrovně 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Použít filtr úrovně 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Převádí se..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2924,61 +2924,61 @@ msgstr ""
- "tuto dobu nebudete moci používat KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Aktualizace"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Aktualizovat grafy každé"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "aktualizace GUI"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Sbírej data každých"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisekund"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maximum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maximální měřítko rychlosti:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Přesné"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Podívejte se na \"Co je to\" pro nápovědu"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2990,847 +2990,847 @@ msgstr ""
- "- Přesné: Zvolí jako myximální nejvyšší hodnotu, která je viditelná na grafu"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Rychlost protějšků"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Rychlost protějšků:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "aktualizovat každé"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "aktualizace dat v grafu"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Získávání dat o množství připojených protějšcích může vytěžovat CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Připojení protějšků"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Vysoké hodnoty mohou znehodnotit graf připojených protějšků"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Zobrazit sdílející v roji"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Zobrazit stahující v roji"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Počty měření"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Odesílání"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Připojení"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Protějšky"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Přepnout graf rychlosti protějšků"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Doba mezi získáváním dat ohledně rychlosti protějšků"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Přepnout vykreslování stahujících v roji"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Přepnout vykreslování sdílejících v roji"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Počet měčení stahování"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Počet měření rychlosti protějšků"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Počet měření odesílání"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Počet měření připojení"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Počet měření DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importovat existující stahování"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Zadejte torrent a data již stažená z tohoto torrentu."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importovat"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "výchozí"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS kanály"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Kanály"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Smazat"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nový"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Členy"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Au&tomaticky obnovit"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnoruj TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Obnovit"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "Náze&v"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Ponechat články (dní)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktivní"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtry"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filtry pro přijetí"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filtry pro zahození"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Regulární výrazy"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Zacházet jako  &s řadou"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Průběh"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maximální díl"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maximální řada"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Minimální řada"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Minimální díl"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testovací te&xt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Shody filtru"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Plánovač pásma"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Kategorie pro levé kliknutí"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kate&gorie 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Vypno&ut"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normální"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategorie &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategorie &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Kategorie pro pravé kliknutí"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategorie &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategorie 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>První kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>Třetí kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "stáhnout:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "odeslat:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>Druhá kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 je bez omezení"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Uložit do souboru"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "N&ačíst ze souboru"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Vynuluj plán"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Stránka s nastavením zásuvného modulu \"Plánovač\""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Použít &plánovač pásma?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Plánovač pásma"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Použít barvy místo o&brázků?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Doporučené pro pomalé počítače)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Upravit p&lán"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Povolit plánovač pásma?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Použít barvy místo obrázků?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Použít textové logy s více informacemi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Příznak obecných informací"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Příznak informací o připojení"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Příznak informací o DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Příznak informací o trackeru"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Příznak informací o diskových I/O"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Příznak informací o IPFiltru"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Pžíznak informací o hledání"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Příznak informací o importu neúplných souborů"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Příznak informací o InfoWidgetu"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Příznak informací o UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Příznak informací o procházení složek"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Příznak informací o plánování"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Příznak informací o RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Příznak informací o webovém rozhraní"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Možnosti zobrazení logu"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Zásuvné moduly"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Vše"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Ladění"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Upozornění"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Důležité"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nic"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IPFIlter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Hledání:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Procházení složek:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Plánovač:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Import neúplného souboru:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS zásuvný modul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Zásuvný mosul webového rozhraní:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Systém"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Obecné:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Připojení:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Diskové I/O:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Použít bohaté te&xtové logy"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Externí prohlížeč"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Otevírat výsledky vyhledávání v externím prohlížeči"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Použít výchozí prohlížeč"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Vlastní cesta k prohlížeči:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Vyhledávače"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Název vyhledávače:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "Přid&at"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Vyhledávače"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Odstranit vš&e"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Př&idat výchozí"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Aktualizovat z internetu"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Hledat"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Vyhledávač:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Aktuální vyhledávač"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Použít vlastní prohlížeč"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Cesta ke spustitelnému souboru prohlížeče"
-@@ -4118,7 +4118,7 @@ msgstr "Kontroluji data"
- msgid "Stopped. No space left on device."
- msgstr "Zastaveno. Není místo na disku."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4126,12 +4126,12 @@ msgstr ""
- "Nemáte dostatek místa na disku ke stažení tohoto torrentu. Jste si jisti, že "
- "chcete pokračovat?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Nedostatek místa na disku pro %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4139,16 +4139,16 @@ msgstr ""
- "Torrent \"%1\" již dosáhl maximálního poměru sdílení. Přejete si ignorovat "
- "limit a začít sdílet i přesto?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Bylo dosaženo maximálního sdílecího poměru."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Chyba při zastavování torrentu %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Chyba při spouštění torrentu %1: %2"
- 
-diff --git a/translations/cy/messages/ktorrent.po b/translations/cy/messages/ktorrent.po
-index 89665b8..060d5ca 100644
---- a/translations/cy/messages/ktorrent.po
-+++ b/translations/cy/messages/ktorrent.po
-@@ -1,7 +1,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
-@@ -14,7 +14,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Gwybo"
-@@ -187,7 +187,7 @@ msgstr "URL annilys."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Lawrlwythiadau"
-@@ -306,7 +306,7 @@ msgid "Document to open"
- msgstr "Dogfen i'w hagor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -590,7 +590,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -636,7 +636,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -655,7 +655,7 @@ msgid "Malformed IP address."
- msgstr "URL annilys."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Hoffterau"
-@@ -689,7 +689,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Dewisiadau Cyffredinol"
-@@ -700,7 +700,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Cyflwr"
-@@ -722,7 +722,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr ""
-@@ -840,7 +840,7 @@ msgid "User"
- msgstr "Defnyddiwr"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, fuzzy, no-c-format
- msgid "Queue Manager"
- msgstr "Trefnydd Ategion"
-@@ -1034,8 +1034,8 @@ msgid "Start torrent"
- msgstr "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Lawrlwytho"
-@@ -1089,13 +1089,13 @@ msgid "Encryption"
- msgstr "Cêl-ysgrifaeth"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1103,20 +1103,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1124,169 +1124,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Plygyll"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "lanlwytho:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porth:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1294,187 +1294,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "lanlwytho:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Taler Sylw"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1482,283 +1482,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Cyflwr:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, fuzzy, no-c-format
- msgid "Torrent"
- msgstr "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "S&ymud i fyny"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Symud i la&wr"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "S&ymud i fyny"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "I&awn"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Diddymu"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Sylwadau :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Cre&u"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Di&ddymu"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Dim"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porth"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1766,19 +1766,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Hoffterau"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1794,427 +1794,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Hoffterau"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Defnydd Cof :"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Isel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Canolig"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Uchel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Profi"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Methu creu %1: %2"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Methu creu %1: %2"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Defnydd Cof"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2222,602 +2222,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Trefnydd Ategion"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Llwytho"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Llwytho"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dyfais"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, fuzzy, no-c-format
- msgid "Ports Forwarded"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "Cysylltiadau:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Ailsyllu"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Methu creu %1: %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Hoffterau"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "KTorrent"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "Hoffterau"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Dewis D&im"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "Defnyddiwr"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Dewisiadau Cyffredinol"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Cyfanswm:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, fuzzy, no-c-format
- msgid "Downloaded:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Gwaharddwyd :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Maint:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Cynnydd"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Cyflwr:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Rhannu"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "Heb derfyn"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Ar gael"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Ar gael"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Ar gael"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Ar gael"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, fuzzy, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Hoffterau"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "KTorrent"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "KTorrent"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2825,25 +2825,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, fuzzy, no-c-format
- msgid "Converting..."
- msgstr "Creu ... %1"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2852,61 +2852,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Canolig"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2915,847 +2915,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "Cysylltiadau:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Dangos eicon y teclyn &cysawd"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "Cysylltiadau:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Lawrlwythiadau"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "KTorrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Mewnforio"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Hoffterau"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Pob Ffeil"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Cynnydd"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, fuzzy, no-c-format
- msgid "Te&st"
- msgstr "Profi"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "T&roi i ffwrdd"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Arferol"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categoriau"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Lawrlwytho"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "lanlwytho:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Cadw i Ffeil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "I&awn"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Dewisiadau Cyffredinol"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Dewisiadau Cyffredinol"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Ategion"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Popeth"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Noder"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Pwysig"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Dim"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Hoffterau"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Chwiliad:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Plygyll"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Dewisiadau Cyffredinol"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Cysawd"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Cyffredinol:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Cysylltiadau:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Ychwanegu"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "G&waredu Popeth"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Chwilio"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Peiriant chwilio :"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4043,34 +4043,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "Gwall wrth ysgrifennu i %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "Gwall wrth ysgrifennu i %1"
-diff --git a/translations/da/messages/ktorrent.po b/translations/da/messages/ktorrent.po
-index 66fe2f8..3013b4a 100644
---- a/translations/da/messages/ktorrent.po
-+++ b/translations/da/messages/ktorrent.po
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-01-24 16:36+0100\n"
- "Last-Translator: Martin Schlander <suse@linuxin.dk>\n"
- "Language-Team:  <dansk@dansk-gruppen.dk>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Ingen indkommende forbindelser (måske bag lukket firewall)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -189,7 +189,7 @@ msgstr "Misdannet URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Download"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Dokument der skal åbnes"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -575,7 +575,7 @@ msgstr "Peer-kilder for torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -617,7 +617,7 @@ msgid "Add to Group"
- msgstr "Tilføj til gruppe"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Hastighedsgrænser"
-@@ -635,7 +635,7 @@ msgid "Malformed IP address."
- msgstr "Misdannet IP-adresse."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Indstillinger"
-@@ -671,7 +671,7 @@ msgid "Advanced"
- msgstr "Avanceret"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Avancerede tilvalg"
-@@ -682,7 +682,7 @@ msgstr "Synlige søjler"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -704,7 +704,7 @@ msgstr "Sent"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Download-hastighed"
-@@ -827,7 +827,7 @@ msgid "User"
- msgstr "Bruger"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Kø-håndtering"
-@@ -1012,13 +1012,13 @@ msgstr "Kan ikke åbne indeksfilen %1 : %2"
- msgid ""
- "_: NAME OF TRANSLATORS\n"
- "Your names"
--msgstr "Erik Kjær Pedersen Martin Møller,Martin Schlander"
-+msgstr "Erik Kjær Pedersen,Martin Møller,Martin Schlander"
- 
- #: _translatorinfo.cpp:3
- msgid ""
- "_: EMAIL OF TRANSLATORS\n"
- "Your emails"
--msgstr "erik@binghamton.edu martin@martinm-76.dk,suse@linuxin.dk"
-+msgstr "erik@binghamton.edu,martin@martinm-76.dk,suse@linuxin.dk"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 16
- #: rc.cpp:3
-@@ -1051,8 +1051,8 @@ msgid "Start torrent"
- msgstr "Start torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Hent"
-@@ -1106,13 +1106,13 @@ msgid "Encryption"
- msgstr "Kryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Brug protokolkryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1122,13 +1122,13 @@ msgstr ""
- "bittorrentforbindelser langsommere."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Tillad ukrypterede forbindelser"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1136,7 +1136,7 @@ msgstr ""
- "Hvis afmarkeret, kan du kun forbinde til klienter som understøtter kryptering."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1147,169 +1147,169 @@ msgstr ""
- "information."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Brug DHT til at hente yderligere peers"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-port for DHT-kommunikation:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Egen IP-adresse"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Se&nd brugerdefineret IP-adresse eller værtsnavn til trackeren"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Brugerdefineret IP-adresse eller værtsnavn:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikon i statusfeltet"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Vis sta&tusikon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Vis &hastighedslinje i statusfeltet"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Vis meddelelser i statusfeltet"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Overførselsbåndbredde (i kb/sek):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Download-båndbredde (i kb/sek):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Mapper"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Mappe til at opbevare midlertidige filer:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Flyt afsluttede downloads til:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Gem &automatisk download i:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopiér torrent-filer til:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Download-værktøjslinje"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Angiv hastighedsgrænserne for torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maks. uploadhastighed:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maks. downloadhastighed:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 er ubegrænset)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Tilføj mulig peer"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP-adresse for peer:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Angiv IP-adresse og port for peer."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Ktorrents sortlistning"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1319,188 +1319,188 @@ msgstr ""
- "dine indgange, eller bruge IP-filterplugin (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Bandlyste peers"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP-adresse for peer"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Tilføj peer:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Tilføjer peer til sortliste"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Fjerner peer fra sortliste"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Ryd"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Rydder listen"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Gem &som..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Gemmer denne sorte liste til at bruge den med Ktorrents IP-filterplugin"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maksimalt antal download:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maksimalt antal seeds:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Start download ved lav ledig diskplads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimal diskplads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Start ikke"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Spørg altid"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Tving til start"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 betyder ubegrænset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maksimal download-hastighed:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Global forbindelsesbegrænsning:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maks. seedtid:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maksimalt antal forbindelser pr torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Antal overførselsnicher:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP-sporingsport:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maksimalt delingsforhold:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maksimal upload-hastighed:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "Kbyte/sek (0 betyder ubegrænset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Timer (0 er ubegrænset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Fortsæt seedning efter download er færdig"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Pas på"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1510,283 +1510,283 @@ msgstr ""
- "UPnP-pluginnet kan ikke gøre det for dig."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT-kødialog"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Sporer:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Delingsforhold:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Byte tilbage:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Styret af"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Overførsler"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Overført:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Flyt &opad"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Flyt &nedad"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Flyt længst op"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Flyt &længst ned"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Styret af &køhåndtering"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Styret af &bruger"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Indsæt URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Annullér"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Opret en torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Filen eller mappen du vil oprette en torrent for:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Du skal tilføje mindst en sporer eller knude."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Fil-tilvalg"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Størrelse af hver blok:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "&Begynd at seede en torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "De&centraliseret (kun DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privat datastrøm (DHT ikke tilladt)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentarer:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Opret"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Annullér"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Sporere"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT-knuder"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Knude:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "Egen IP-adresse eller eget værtsnavn"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1797,19 +1797,19 @@ msgstr ""
- "seede denne torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Avancerede præferencer"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1837,428 +1837,428 @@ msgstr ""
- "X hastighedsprøver"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Nuværende hastighed"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Global gns.hastighed"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Vindue af X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Bevægeligt gennemsnt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(får virkning efter genstart)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Deaktivér &præallokering af diskplads"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Præallokér diskplads fuldt ud (undgår fragmentering)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Basal (langsom)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Filsystemsafhængig"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Ydelse"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Hukommelsesforbrug:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Lavt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Middel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Højt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Opdateringsinterval for grafisk grænseflade:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Hurtig CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Langsom CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Datakontrol"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Ved upload skal klumper ikke tjekkes hvis de er større e&nd"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Udfør en kontrol af data&integritet efter"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "skadede stumper"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Netværk"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maksimalt antal forbindelser:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP for IP-pakker:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Brug ikke KDEs proxy-indstillinger til HTTP-tracker-forbindelser"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP-sporingsproxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Gennemsøger data"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Skanner data i torrent:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Antal fundne dele:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Antal mislykkede eller ikke hentede dele:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "tekstetiket2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "tekstetikette3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maksimalt antal download (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maksimalt antal seeds (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Start downloads ved lav diskplads?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maksimalt antal forbindelser pr torrent (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maksimalt antal forbindelser pr torrent (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maksimal upload-hastighed i Kbyte/sek (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maksimal download-hastighed i Kbyte/sek (0 = ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maksimalt delingsforhold (0 = ingen begrænsning)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maksimal seedtid i timer (0 er ubegrænset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Vis en ikon i statusfeltet"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Vis hastighedslinje i statusfeltet"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Download-båndbredde (i Kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Overførselsbåndbredde (i Kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Vis meddelelser når en torrent er færdig."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Fortsæt seedning efter download er færdig"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Mappe til at opbevare midlertidige filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Om download automatisk skal gemmes i den angivne mappe"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Mappe til at opbevare downloadede filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Hvorvidt afsluttede downloads automatisk skal flyttes til færdigmappe"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Mappe som filer fra afsluttede downloads skal flyttes til"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Hvorvidt .torrent-filer automatisk skal kopieres til kopimappen for torrenter"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Mappe som .torrent-filer skal kopieres til"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Om en egen IP-adresse skal bruges at sende til sporeren"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Mappen der senst blev brugt som gemmemappe"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP-adresse at sende til sporeren"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Hukommelsesforbrug"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Opdateringsinterval for grafisk grænseflade"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Støtte for DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT-port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Antal overførselsnicher"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Søjler viste i Ktorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Tid tilbage-algoritme"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2268,457 +2268,457 @@ msgstr ""
- "mindre end min. diskplads vil torrenten blive stoppet."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Plugin-håndtering"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Indlæs"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Læs af"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "&Indlæs alle"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Aflæs alle"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Standard UPnP-enhed at bruge"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Detekterede enheder:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Enhed"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Videresendte porte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Forbindelse til fjernnetværk"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Videre&befordring af porte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Fortryd videresending af porte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Søg igen"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Aktivér søgning i mappe 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Aktivér søgning i mappe 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Aktivér søgning i mappe 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Søgesti til mappe 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Søgesti til mappe 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Søgesti til mappe 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Om en torrent skal åbnes tavst eller ej."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Sletningshandling markeret."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Forflytningshandling markeret."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Mappesøgningsindstillinger"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Søg i mappe &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Søg i mappe &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Søg i mappe &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Gå til \"&indlæst\" mappe efter indlæsning"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Flyt torrent til \"indlæst\" mappe efter den er indlæst"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Åbn torrent t&avst"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Vis ikke dialogen 'Markér filer at downloade'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Slet efter indlæsnin&g"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Sletter torrent efter indlæsning"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Mapper at søge i"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Mappe 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Mappe 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Mappe 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Søgeindstillinger"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Web-server"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Videresend port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Sessionstid at være aktiv (i sekunder)"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Vælg grænseflade:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Brugernavn:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Ændr kodeord..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Søgesti til kørbar fil for PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "videresend port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Sessionstid at være aktiv"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "grænseflades udseende"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Søgesti til kørbar fil for PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "brugernavn"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "kodeord"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Blokke"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "I alt:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Nuværende download:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Hentede:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Undtagne:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Venstre:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Størrelse:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Blok"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Fremgang"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Tildelte peers"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Seedere:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Leechere:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Gennemsnitlig hastighed nedad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Gennemsnitlig hastighed opad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Næste opdatering om:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Sporerens status:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Dele af den torrent som er hentet:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Dele af torrent som er tilgængelige:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Deling"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2727,145 +2727,145 @@ msgstr ""
- "begrænsning."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Dit upload vil stoppe når du har uploadet i så mange timer."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Timer"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Forholdsgrænse:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Grænse virker kun i seed-tilstand"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Tids&grænse:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Opdatér sporer"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimalt opdateringsinterval - 60 sekunder"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Tilføj spo&rere"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Fjern sporer"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Skift tr&acker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Genopret standard"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Vis peer-visningsfaneblad i hovedvinduet"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Vis visningsfaneblad for blok-download i hovedvinduet"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Vis visningfaneblad for sporere i hovedvinduet"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Vis liste over peers"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Vis liste med blokke som for ø&jeblikket hentes"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Vis liste med sporere"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Indstillinger af IP-blokering"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Vælg PeerGuardian-filterfil "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Brug PeerGuardian-filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP-filterfil:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&Download og konvertér"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2875,25 +2875,25 @@ msgstr ""
- "Bemærk: ZIP-filer fra bluetack.co.uk understøttes."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Filter-url af niveau 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Brug niveau 1 filter?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konverterer..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2905,61 +2905,61 @@ msgstr ""
- "den tid kan du ikke bruge Ktorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Opdatér"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Opdatér diagrammer hver"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "GUI-opdateringer"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Saml data hver"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisekunder"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maksimum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maksimal hastighedsskala-tilstand:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Nøjagtigt"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Se 'Hvad er dette' for mere hjælp"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2971,847 +2971,847 @@ msgstr ""
- "- Nøjagtig: Maksimalt opnået hastighed som er synligt i diagrammet"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Peers-hastighed"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Peers-hastighed:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "opdatér hver"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "opdatering af diagramdata"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Indsamling af data om mange forbundne peers kan være CPU-forbrugende."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Forbindelser til peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Store værdier kan tilsløre diagrammer over forbundne peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Vis seedere i sværme"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Vis leechere i sværme"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Målingsoptælling"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Overfør"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Forbindelser"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Skift mellem hastighedsdiagrammer for peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Interval mellem hentning af data om hastighed for peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Skift mellem tegning af leechere i sværme"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Skift mellem tegning af seedere i sværme"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Optælling af downloadmålinger"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Optælling af hastighedsmålinger for peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Optælling af uploadmålinger"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Optælling af forbindelsesmålinger"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Optælling af DHT-målinger"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Maks.tilstand for OY-akse"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importér eksisterende download"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Angiv torrent og data som allerede er hentet  hjem for den torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "Impo&rtér"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "standard"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-kanaler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Kilder"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "S&let"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Ny"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artikler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "&Opdatér automatisk"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnorér TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Genopfrisk"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Behold artikler (dage)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiv"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtre"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filter til at acceptere"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filter til at forkaste"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Regulære udtryk"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Behandl som &serier"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Proces"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Kriterier for serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Match uden episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Sidste episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Sidste sæson"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Første sæson"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Første episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testte&kst"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Test"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtrér træffere"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Skemalægning af båndbredde"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Venstreklikkategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kate&gori 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Luk &af"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategori &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategori &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Højreklikskategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategori &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategori 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorier"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "hent:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "overfør:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "kB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 betyder ubegrænset"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Gem til fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Indlæs fra fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Nulstil skema"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O.&k."
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Indstillingsside for plugin for skemalægning"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "&Brug skemalægning af båndbredde?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Skemalægning af båndbredde"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "brug farver i stedet for p&ixmaps?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Anbefalet for langsommere systemer)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Redigér s&kema"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Aktivér skemalægning af båndbredde?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Brug farver i stedet for pixmaps?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Brug formateret tekst i log"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Meddelelsesflag for generel information"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Meddelelsesflag for forbindelser"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Meddelelsesflag for DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Meddelelsesflag i sporingsinformation"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Meddelelsesflag for information om disk ind- og uddata"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Meddelelsesflag i plugin for IP-filtrering"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Meddelelsesflag i søgeplugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Meddelelsesflag i plugin for delfilimport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Meddelelsesflag i plugin for informationskontrol"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Meddelelsesflag i UPnP-plugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Meddelelsesflag i plugin for mappesøgning"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Meddelelsesflag i plugin for skemalægning"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Meddelelsesflag i RSS-plugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Plugin for internetgrænseflade"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Logvisningstilvalg"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugin"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Alle"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Fejlsøgning"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Anmærkning"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Vigtigt"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ingen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Søg:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Søg i mappe:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Skemalægger:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Delfilimport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Informationskontrol:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-plugin:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Plugin for web-grænseflade"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "System"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Generelt:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Forbindelser:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk ind- og uddata:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Brug formateret te&kst i log"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Ekstern browser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Åbn søgninger i ekstern browser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Brug standardbrowser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Søgesti til egen browser:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Søgetjenester"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Søgetjenestens navn:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Tilføj"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Tjenester"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Fjern alt"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Tilføj s&tandard"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Opdatér fra internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Søg"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Søgetjeneste:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Denne søgetjeneste"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Brug egen browser"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Søgesti til kørbar fil for egen browser"
-@@ -4100,7 +4100,7 @@ msgstr "Kontrollerer data"
- msgid "Stopped. No space left on device."
- msgstr "Stoppet. Ingen plads tilbage på enheden."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4108,12 +4108,12 @@ msgstr ""
- "Du har ikke tilstrækkelig diskplads til at downloade denne torrent. Vil du "
- "fortsætte?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Utilstrækkelig diskplads til %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4121,16 +4121,16 @@ msgstr ""
- "Torrent \"%1\" har nået sit maksimale delingsforhold. Ignorér denne grænse og "
- "tilbyd denne torrent alligevel?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Maksimalt delingsforhold opnået."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Fejl ved at stoppe torrent %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Fejl ved start af torrent %1: %2"
- 
-diff --git a/translations/de/messages/ktorrent.po b/translations/de/messages/ktorrent.po
-index 861e491..aeca4f8 100644
---- a/translations/de/messages/ktorrent.po
-+++ b/translations/de/messages/ktorrent.po
-@@ -10,7 +10,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-11-11 13:57+0100\n"
- "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
- "Language-Team: Deutsch <tde-i18n-de@lists.kde.org>\n"
-@@ -26,7 +26,7 @@ msgstr ""
- "Keine eingehenden Verbindungen (möglicherweise durch Firewall geblockt)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Information"
-@@ -194,7 +194,7 @@ msgstr "Ungültige Adresse"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Downloads"
-@@ -318,7 +318,7 @@ msgid "Document to open"
- msgstr "Zu öffnendes Dokument"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -587,7 +587,7 @@ msgstr "Quellen für Torrent-Gegenstellen:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "VHT"
-@@ -629,7 +629,7 @@ msgid "Add to Group"
- msgstr "Zu Gruppe hinzufügen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Geschwindigkeitsbegrenzungen"
-@@ -649,7 +649,7 @@ msgid "Malformed IP address."
- msgstr "Ungültige IP-Adresse."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Einstellungen"
-@@ -685,7 +685,7 @@ msgid "Advanced"
- msgstr "Erweitert"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Erweiterte Einstellungen"
-@@ -696,7 +696,7 @@ msgstr "Sichtbare Spalten"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -718,7 +718,7 @@ msgstr "Verteilt"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Downloadgeschwindigkeit"
-@@ -846,7 +846,7 @@ msgid "User"
- msgstr "Benutzer"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Warteschlangenverwaltung"
-@@ -1075,8 +1075,8 @@ msgid "Start torrent"
- msgstr "Torrent starten"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Herunterladen"
-@@ -1130,13 +1130,13 @@ msgid "Encryption"
- msgstr "Verschlüsselung"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Protokollverschlüsselung verwenden"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1146,13 +1146,13 @@ msgstr ""
- "von Bittorrent-Verbindungen zu hindern."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Unverschlüsselte Verbindungen erlauben"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1161,7 +1161,7 @@ msgstr ""
- "Programmen herstellen, die Verschlüsselung unterstützen."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1172,169 +1172,169 @@ msgstr ""
- "weitere Informationen."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "VHT &verwenden, um zusätzliche Gegenstellen zu ermitteln"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-Port für VHT-Kommunikation:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Benutzerdefinierte IP-Adresse"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Benutzerdefinierte IP-Adresse oder Rechnernamen an den Tracker se&nden"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Benutzerdefinierte IP-Adresse oder Rechnername:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Symbol im Systemabschnitt der Kontrollleiste"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "&Symbol anzeigen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "&Geschwindigkeitsbalken in Symbol anzeigen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Kurzinfo-Fenster im Systemabschnitt der Kontrollleiste anzeigen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Bandbreite für Verteilen (in KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Bandbreite für Herunterladen (in KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Ordner"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Ordner zum Speichern temporärer Dateien:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Abgeschlossene Downloads verschieben nach:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Downloads &automatisch speichern nach:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr ".torrent-Dateien kopieren nach:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Download-Werkzeugleiste"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Geschwindigkeitsbegrenzungen für Torrent festlegen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximale Verteilrate:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maximale Downloadrate:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 = keine Begrenzung)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Potentielle Gegenstelle hinzufügen"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Gegenstellen-IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Gegenstellen-IP und -Port eingeben."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Schwarze Liste von KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1345,55 +1345,55 @@ msgstr ""
- "IP-Filter-Modul (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Gebannte Gegenstellen"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP-Adresse der Gegenstelle"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Gegenstelle hinzufügen:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Fügt eine Gegenstelle zur schwarzen Liste hinzu."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Entfernt die ausgewählte Gegenstelle von der schwarzen Liste."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Leeren"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Diese Liste leeren"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Speichern &unter ..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
-@@ -1401,133 +1401,133 @@ msgstr ""
- "verwenden."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximale Downloads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximale Verteilungen:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Downloads bei wenig Speicherplatz starten:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimaler Speicherplatz:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Nicht starten"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Immer fragen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Start erzwingen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = keine Begrenzung)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximale Downloadrate:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Globale Verbindungsbegrenzung:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maximale Verteilungszeit:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximale Anzahl Verbindungen pro Torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Anzahl der Slots zum Hochladen:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP-Tracker-Port:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maximales Verteilungsverhältnis:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximale Verteilrate:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 = keine Begrenzung)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Stunden (0 = keine Begrenzung)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Nach Beendigung des Downloads weiter verteilen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Achtung"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1537,283 +1537,283 @@ msgstr ""
- "einem Router befinden. Das UPnP-Modul kann dies für Sie tun."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT-Warteschlangen-Dialog"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "VHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Verteilungsverhältnis:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Verbleibende Bytes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Gesteuert durch"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "H&ochladen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Hochgeladen:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Nach &oben"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Nach &unten"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Ganz nach oben"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Ganz nach unten"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&WV-gesteuert "
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Ben&utzergesteuert"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL einfügen"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "Adresse:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&OK"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Abbrechen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent erstellen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Die Datei oder der Ordner, aus dem Sie ein Torrent erstellen wollen:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Sie müssen mindestens einen Tracker oder Knoten hinzufügen."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Dateieinstellungen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Größe jedes Blocks:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Verteilung des Torrents be&ginnen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "De&zentralisiert (nur VHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privates Torrent (VHT nicht erlaubt)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentare:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "Ers&tellen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Abbrechen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Tracker"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "VHT-Knoten"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Knoten:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP-Adresse oder Rechnername"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1824,19 +1824,19 @@ msgstr ""
- "Torrent verteilen wollen."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Erweiterte Einstellungen"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1866,345 +1866,345 @@ msgstr ""
- "Durchschnittsgeschwindigkeit berechnet aus X Proben"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Aktuelle Geschwindigkeit"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Globale Durchschnittsgeschwindigkeit"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Fenster aus X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Beweglicher Durchschnitt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(wird nach Neustart wirksam)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Speicherplatzreservierung &deaktivieren"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "&Vollständige Speicherplatzreservierung (vermeidet Fragmentierung)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Einfach (langsam)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Dateisystemspezifisch"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Leistung"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Speicherausnutzung:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Niedrig"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Mittel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Hoch"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Aktualisierungsintervall der Benutzeroberfläche:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Schnelle CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Langsame CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Datenprüfung"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Während des Verteilens &keine erneute Prüfung von Blöcken größer als"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Daten&integritätsprüfung durchführen nach"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "fehlerhaften Blöcken"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Netzwerk"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximale Anzahl neuer Verbindungen:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP für IP-Pakete:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "KDE-Pro&xyeinstellungen nicht für HTTP-Tracker-Verbindungen verwenden"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP-Tracker-Proxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Daten werden eingelesen"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Daten des folgenden Torrents werden eingelesen:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Anzahl der gefundenen Blöcke:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Anzahl der fehlgeschlagenen / nicht heruntergeladenen Blöcke:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximale Anzahl Downloads (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximale Anzahl Verteilungen (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Downloads bei wenig Speicherplatz starten?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximale Anzahl der Verbindungen pro Torrent (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- "Maximale Anzahl der Verbindungen für alle Torrents (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximale Verteilgeschwindigkeit in KB/s (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximale Downloadgeschwindigkeit in KB/s (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximales Verteilungsverhältnis (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maximale Verteilungszeit in Stunden (0 = keine Begrenzung)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Symbol im Systemabschnitt der Kontrollleiste anzeigen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Geschwindigkeitsbalken im Symbol anzeigen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Downloadbandbreite (in KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Hochladebandbreite (in KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Hinweisfenster anzeigen, wenn ein Torrent beendet ist."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Nach Beendigung eines Downloads weiter verteilen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Ordner zum Speichern temporärer Dateien"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Ob Transfers automatisch in den Speicherordner gespeichert werden sollen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Ordner zum Speichern heruntergeladener Dateien"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2212,13 +2212,13 @@ msgstr ""
- "werden sollen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Ordner, in den abgeschlossene Downloads verschoben werden"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
-@@ -2226,73 +2226,73 @@ msgstr ""
- "sollen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Ordner, in den .torrent-Dateien kopiert werden"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Ob eine veränderte IP-Adresse an den Tracker gesendet werden soll"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Ordner, der als letzter Speicherort verwendet wurde"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP-Adresse, die an den Tracker gesendet wird"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Speicherverwendung:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Aktualisierungsintervall der Benutzeroberfläche"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Unterstützung für VHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "VHT-Port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Anzahl der Slots zum Verteilen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "In KTorrent-Ansicht angezeigte Spalten"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Restzeit-Algorithmus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2303,457 +2303,457 @@ msgstr ""
- "wird der Torrent angehalten."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Modulverwaltung"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Laden"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Entladen"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Alle la&den"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Alle e&ntladen"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Standardmäßig zu benutzendes UPnP-Gerät"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Gefundene Geräte:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Gerät"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Weitergeleitete Ports"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-Verbindung"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Ports &weiterleiten"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Ports nicht weiterleiten"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Erneut suchen"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Durchsuchen von Ordner1 aktivieren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Durchsuchen von Ordner2 aktivieren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Durchsuchen von Ordner3 aktivieren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Pfad zu Ordner1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Pfad zu Ordner2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Pfad zu Ordner3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Ob ein Torrent ohne Rückmeldung geöffnet werden soll oder nicht."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Löschaktion geprüft."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Verschiebeaktion geprüft."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Einstellungen zum Durchsuchen von Ordnern"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Ordner &1 durchsuchen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Ordner &2 durchsuchen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Ordner &3 durchsuchen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "&Nach dem Laden in den \"Geladen\"-Ordner verschieben"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Torrent nach dem Laden in den Ordner \"Geladen\" verschieben"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Torrents ohne &Rückmeldung öffnen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Dialog 'Herunterzuladende Dateien auswählen' nicht anzeigen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Nach dem Laden &löschen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Löscht den Torrent nach dem Laden"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Zu durchsuchende Ordner"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Ordner 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Ordner 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Ordner 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Such-Einstellungen"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Webserver"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Port weiterleiten"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL der Sitzung (in Sekunden)"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Schnittstelle auswählen:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Benutzername:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Passwort ändern ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Pfad zur PHP-Programmdatei:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Port weiterleiten"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Lebensdauer (TTL) der Sitzung"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Schnittstellenoberfläche"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Pfad zur PHP-Programmdatei"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "Benutzername"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "Passwort"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Blöcke"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Gesamt:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Laufende Downloads:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Heruntergeladen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Ausgenommen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Verbleibend:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Größe:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Block"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Fortschritt"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Gegenstelle"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Zugewiesene Gegenstellen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Seeder:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Leecher:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Durchschnittliche Empfangsgeschwindigkeit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Durchschnittliche Sendegeschwindigkeit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Nächste Aktualisierung in:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Tracker-Status:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Heruntergeladene Teile des Torrents:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Verfügbare Teile des Torrents:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Verteilen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2762,7 +2762,7 @@ msgstr ""
- "überschreitet. Null bedeutet keine Begrenzung."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2770,139 +2770,139 @@ msgstr ""
- "überschreitet."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Stunden"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Verhältnisbegrenzung:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Die Begrenzung funktioniert nur im Verteilungsmodus"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Zeitbegrenzung:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Tracker akt&ualisieren"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimales Aktualisierungsintervall - 60 Sekunden"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Trac&ker hinzufügen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Tracker entfernen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Tracker ä&ndern"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Standardeinstellungen wiederherstellen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Unterfenster \"Gegenstellen\" im Hauptfenster anzeigen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Ansicht der unfertigen Blöcke im Hauptfenster"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Unterfenster \"Gegenstellen\" im Hauptfenster anzeigen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Liste der Gegenstellen anzeigen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Liste der &Blöcke anzeigen, die gerade heruntergeladen werden"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Liste der Tracker anzeigen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP-Blockierungseinstellungen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "PeerGuardian-Filterdatei auswählen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardian-Filter benutzen?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP-Filterdatei:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Heru&nterladen/Umwandeln"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2913,25 +2913,25 @@ msgstr ""
- "Hinweis: Die ZIP-Datei von bluetack.co.uk wird unterstützt."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Ebene-1-Filteradresse"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Ebene-1-Filter benutzen?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Umwandlung läuft ..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2943,61 +2943,61 @@ msgstr ""
- "und KTorrent kann währenddessen nicht verwendet werden."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Aktualisierung"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Diagramm aktualisieren alle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Oberflächenaktualisierungen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Daten erfassen alle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "Millisekunden"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maximum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Skalierungsmodus der Maximalgeschwindigkeit:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exakt"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Siehe \"Was ist das\"-Hilfe für weitere Informationen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -3009,31 +3009,31 @@ msgstr ""
- "- Ekakt: Maximal erreichte, im Diagramm sichtbare, Geschwindigkeit"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Gegenstellengeschwindigkeit"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Gegenstellengeschwindigkeit:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "Aktualisierung alle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "Aktualisierungen der Diagrammdaten"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3041,133 +3041,133 @@ msgstr ""
- "Prozessorleistung in Anspruch nehmen."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Gegenstellen-Verbindungen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Hohe Werte können die Diagramme verbundener Gegenstellen verdecken."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Seeder in Schwärmen anzeigen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Leecher in Schwärmen anzeigen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Messzählung"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Verteilungen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Verbindungen"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Gegenstellen"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Geschwindigkeitsdiagramme der Gegenstellen umschalten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervall zwischen den Abfragen der Gegenstellengeschwindigkeit"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Anzeige von Leechern in Schwärmen umschalten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Anzeige von Seedern in Schwärmen umschalten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Download-Messzählung"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Gegenstellengeschwindigkeit-Messzählung"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Verteilungs-Messzählung"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Verbindungen-Messzählung"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "VHT-Messzählung"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Maximummodus der OY-Achse"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Bereits begonnen Transfer importieren"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Daten:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3176,684 +3176,684 @@ msgstr ""
- "Torrent an."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importieren"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "Standard"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-Quellen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Nachrichtenquellen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Löschen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Neu"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "Adresse (&URL)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artikel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Aut&omatisch aktualisieren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "TTL i&gnorieren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Aktualisieren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Artikel behalten (Tage)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiv"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filter"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Akzeptieren-Filter"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Ablehnen-Filter"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Reguläre Ausdrücke"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Als &Serie behandeln"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Ausführen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Kriterien für Serien"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Treffer ohne Episoden"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maximum an Episoden"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maximum an Staffeln"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Minimum an Staffeln"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Minimum an Episoden"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testte&xt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Testen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filterübereinstimmungen"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Bandbreitenplaner"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Linksklick-Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategorie &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Au&sschalten"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategorie &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategorie &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Rechtsklick-Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "K&ategorie 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategorie 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorien"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "Herunterladen:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "Hochladen:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 bedeutet keine Begrenzung"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "In Datei speichern"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "Aus Datei &laden"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Planer zurücksetzen"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&OK"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Einstellungsseite für Planer-Modul"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "&Bandbreitenplaner verwenden?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Bandbreitenplaner"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Farben statt &Graphiken verwenden?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Empfohlen für langsamere Systeme)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "&Planer bearbeiten"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Bandbreitenplaner aktivieren?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Farben statt Graphiken verwenden?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Rich Text für Protokoll verwenden"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Nachrichtenmarkierung von allgemeinen Informationen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Nachrichtenmarkierung von Verbindungen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Nachrichtenmarkierung von VHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Nachrichtenmarkierung von Tracker-Informationen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Nachrichtenmarkierung von Disk-IO-Informationen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Nachrichtenmarkierung vom IP-Filter-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Nachrichtenmarkierung vom Suche-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Nachrichtenmarkierung vom Teildatei-Import-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Nachrichtenmarkierung vom Infofenster-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Nachrichtenmarkierung vom UPnP-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Nachrichtenmarkierung vom Ordner-Durchsuchen-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Nachrichtenmarkierung vom Planer-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Nachrichtenmarkierung vom RSS-Modul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Nachrichtenmarkierung im Weboberflächen-Modul"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Einstellungen für Protokollbetrachter"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Module"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Alle"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Debug"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Hinweis"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Wichtig"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Keine"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-Filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Suchen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Ordner durchsuchen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planer:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Teildatei-Import:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Informationsfenster:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-Modul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Weboberflächen-Modul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "System"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Allgemein:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Verbindungen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk-I/O:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Rich Te&xt für Protokoll verwenden"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Externer Browser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Suche in externem Browser öffnen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Standard-Browser verwenden"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Pfad zu benutzerdefiniertem Browser:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Suchmaschinen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Name der Suchmaschine:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Hinzufügen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Suchmaschinen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "Adresse"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Alle &entfernen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Zie&l hinzufügen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Aktualisierung aus dem Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Suchen"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Suchmaschine:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Derzeitige Suchmaschine"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Benutzerdefinierten Browser verwenden"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Pfad zu benutzerdefiniertem Browser"
-@@ -4144,7 +4144,7 @@ msgstr "Daten werden geprüft"
- msgid "Stopped. No space left on device."
- msgstr "Angehalten. Auf dem Medium ist kein Speicherplatz mehr verfügbar."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4152,12 +4152,12 @@ msgstr ""
- "Sie haben nicht ausreichend Speicherplatz, um diesen Torrent herunterzuladen. "
- "Sind Sie sicher, dass Sie den Vorgang fortsetzen wollen?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Unzureichend Speicherplatz für %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4165,16 +4165,16 @@ msgstr ""
- "Torrent \"%1\" hat sein maximales Verteilungsverhältnis erreicht. Soll diese "
- "Begrenzung ignoriert und die Verteilung trotzdem gestartet werden?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Maximales Verteilungsverhältnis erreicht."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Der Transfer des Torrents %1 kann nicht gestoppt werden: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Der Transfer des Torrents %1 kann nicht gestartet werden: %2"
- 
-diff --git a/translations/el/messages/ktorrent.po b/translations/el/messages/ktorrent.po
-index d4109e1..0eef52f 100644
---- a/translations/el/messages/ktorrent.po
-+++ b/translations/el/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-08-12 20:48+0300\n"
- "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
- "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
-@@ -19,7 +19,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Καμία εισερχόμενη σύνδεση (μάλλον λόγω τείχους προστασίας)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Πληροφορίες"
-@@ -187,7 +187,7 @@ msgstr "Λανθασμένη URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Λήψεις"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Έγγραφο για άνοιγμα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -579,7 +579,7 @@ msgstr "Πηγές torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -621,7 +621,7 @@ msgid "Add to Group"
- msgstr "Προσθήκη στην ομάδα"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Όρια ταχύτητας"
-@@ -641,7 +641,7 @@ msgid "Malformed IP address."
- msgstr "Λανθασμένη διεύθυνση IP."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Προτιμήσεις"
-@@ -677,7 +677,7 @@ msgid "Advanced"
- msgstr "Προχωρημένα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Προχωρημένες επιλογές"
-@@ -688,7 +688,7 @@ msgstr "Ορατές στήλες"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Κατάσταση"
-@@ -710,7 +710,7 @@ msgstr "Απεσταλμένα"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Ταχύτητα λήψης"
-@@ -837,7 +837,7 @@ msgid "User"
- msgstr "Χρήστης"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Διαχειριστής λίστας αναμονής"
-@@ -1065,8 +1065,8 @@ msgid "Start torrent"
- msgstr "Εκκίνηση torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Λήψη"
-@@ -1120,13 +1120,13 @@ msgid "Encryption"
- msgstr "Κρυπτογράφηση"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Χρήση κρυπτογράφησης πρωτοκόλλου"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1136,13 +1136,13 @@ msgstr ""
- "να επιβραδύνουν τις συνδέσεις bittorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Να επιτρέπονται συνδέσεις χωρίς κρυπτογράφηση"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1151,7 +1151,7 @@ msgstr ""
- "υποστηρίζουν κωδικοποίηση."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1162,169 +1162,169 @@ msgstr ""
- "περισσότερες πληροφορίες."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Χρήση DHT για την λήψη επιπλέον υπολογιστών"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP θύρα για επικοινωνία DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Προσαρμοσμένη IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Αποστολή στο&ν ανιχνευτή μιας προσαρμοσμένης IP ή όνομα υπολογιστή"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Προσαρμοσμένη IP ή όνομα υπολογιστή:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Εικονίδιο πλαισίου συστήματος"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Εμφάνιση εικονιδίου πλαισίου σ&υστήματος"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Εμφάνιση γραμμής &ταχύτητας στο πλαίσιο συστήματος"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Εμφάνιση αναδυόμενων μηνυμάτων στο πλαισίου συστήματος"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Ταχύτητα αποστολής (σε kb/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Ταχύτητα λήψης (σε kb/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Φάκελοι"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Κατάλογος για αποθήκευση προσωρινών αρχείων:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Μετακίνηση των ολοκληρωμένων λήψεων στο:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Αυτόματη αποθήκευση λήψεων στο:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Αντιγραφή αρχείων .torrent σε:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Γραμμή εργαλείων λήψεων"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Ορισμός των ορίων ταχύτητας για το torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Μέγιστος ρυθμός αποστολής:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Μέγιστος ρυθμός λήψης:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/δευτ (το 0 σημαίνει απεριόριστο)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Προσθήκη ικανού υπολογιστή"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP υπολογιστή:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Θύρα:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Εισαγωγή IP και θύρας υπολογιστή."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Μαύρη λίστα του KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1335,188 +1335,188 @@ msgstr ""
- "πρόσθετο φίλτρου IP (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Απαγορευμένοι υπολογιστές"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Διεύθυνση IP υπολογιστή"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Προσθήκη υπολογιστή:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Προσθήκη ενός υπολογιστή στη μαύρη λίστα"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Αφαίρεση του επιλεγμένου υπολογιστή από τη μαύρη λίστα"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Καθαρισμός"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Καθαρισμός της λίστας"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Αποθήκευση &ως..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Αποθήκευση της μαύρης λίστας για χρήση με το πρόσθετο φίλτρου IP του KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Μέγιστος αριθμός λήψεων:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Μέγιστος αριθμός μοιράσματος:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Έναρξη λήψης σε δίσκο με λίγο χώρο:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Ελάχιστος χώρος στο δίσκο:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Να μην εκκινηθεί"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Να ερωτούμαι πάντα"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Εξαναγκασμός εκκίνησης"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(το 0 σημαίνει απεριόριστο)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Μέγιστος ρυθμός λήψης:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Καθολικό όριο συνδέσεων:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Μεγ. χρόνος μοιράσματος:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Μέγιστος αριθμός συνδέσεων ανά torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Αριθμός υποδοχέων αποστολής:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Θύρα UDP ανιχνευτή:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Μεγ. αναλογία κοινόχρηστων:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Μέγιστος ρυθμός αποστολής:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/δευτ (το 0 σημαίνει απεριόριστο)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Ώρες (το 0 σημαίνει απεριόριστο)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Συνέχεια μοιράσματος μετά την ολοκλήρωση της λήψης"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Προσοχή"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1526,284 +1526,284 @@ msgstr ""
- "διαμεταγωγέα. Το πρόσθετο UPnP μπορεί να το κάνει αυτό για σας."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Διάλογος λίστας αναμονής KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Κατάσταση:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Ανιχνευτής:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Αναλογία κοινόχρηστων:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Εναπομένοντα bytes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Ελεγχόμενο από"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Αποστολές"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Απεσταλμένα:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Μετακίνηση &πάνω"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Μετακίνηση &κάτω"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Μετακίνηση στην κορυφή"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Μετακίνηση στο &τέλος"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Ελεγχόμενο από &διαχειριστή αναμονής"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Ελεγχόμενο από &χρήστη"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Επικόλληση URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "Ε&ντάξει"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Ακύρωση"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Δημιουργία torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- "Το αρχείο ή φάκελος για το οποίο επιθυμείτε να δημιουργήσετε ένα torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Πρέπει να προσθέσετε τουλάχιστον έναν ανιχνευτή ή κόμβο."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Επιλογές αρχείων"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Μέγεθος κάθε κομματιού:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Εκκίνηση &μοιράσματος του torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Αποκεντρ&ωμένο (μόνο DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Ιδιωτικό torrent (δεν επιτρέπεται DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Σχόλια:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Δημιουργία"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Α&κύρωση"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Ανιχνευτές"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Κόμβοι DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Κόμβος:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP ή όνομα υπολογιστή"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Θύρα"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1814,19 +1814,19 @@ msgstr ""
- "torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Προχωρημένες προτιμήσεις"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1855,140 +1855,140 @@ msgstr ""
- "Χ δείγματα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Τρέχουσα ταχύτητα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Καθολική μέση ταχύτητα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Παράθυρο του Χ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Κινούμενος μέσος"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(ενεργοποιείται μετά από επανεκκίνηση)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Α&πενεργοποίηση προδέσμευσης χώρου στο δίσκο"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- "Πλήρης προδέ&σμευση χώρου (αποφεύγεται η τμηματική αποθήκευση του αρχείου)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Βασικό (αργό)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Ειδικά του συστήματος αρχείου"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Επίδοση"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Χρήση μνήμης:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Χαμηλή"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Μεσαία"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Υψηλή"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Χρονικό διάστημα ενημέρωσης:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1δ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2δ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5δ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Γρήγορη ΚΜΕ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Αργή ΚΜΕ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Έλεγχος δεδομένων"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
-@@ -1996,19 +1996,19 @@ msgstr ""
- "από"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Εκτέλεση ελέγχου α&κεραιότητα μετά από"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "κατεστραμμένα κομμάτια"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
-@@ -2027,272 +2027,272 @@ msgstr ""
- "Χ δείγματα"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Μέγιστος αριθμός συνδέσεων ανά torrent ( 0 = απεριόριστος)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Αγνόηση του &διαμεσολαβητή του KDE για συνδέσεις ανιχνευτή μέσω HTTP"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Διαμεσολαβητής HTTP ανιχνευτή:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Σάρωση δεδομένων"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Σάρωση δεδομένων για το torrent :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Αριθμός κομματιών που βρέθηκαν:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Αριθμός αποτυχημένων/μη ληφθέντων κομματιών:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Δοκιμή"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Μέγιστος αριθμός λήψεων ( 0 = απεριόριστος)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Μέγιστος αριθμός μοιράσματος ( 0 = απεριόριστος)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Έναρξη λήψεων σε δίσκο με λίγο χώρο;㎎"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Μέγιστος αριθμός συνδέσεων ανά torrent ( 0 = απεριόριστος)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Μέγιστος αριθμός συνδέσεων για όλες τις λήψεις ( 0 = απεριόριστος)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Μέγιστη ταχύτητα αποστολής σε KB/δευτ ( 0 = απεριόριστη)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Μέγιστη ταχύτητα λήψης σε KB/δευτ ( 0 = απεριόριστη)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Μέγιστη αναλογία κοινόχρηστων (0 = απεριόριστη)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Μέγιστος χρόνος μοιράσματος σε ώρες (0 = απεριόριστος)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Εμφάνιση εικονιδίου στο πλαίσιο συστήματος"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Εμφάνιση γραμμής ταχύτητας στο πλαίσιο συστήματος"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Ταχύτητα λήψης (σε kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Ταχύτητα αποστολής (σε kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Εμφάνιση αναδυόμενων μηνυμάτων όταν ολοκληρωθεί η λήψη του torrent."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Συνέχεια μοιράσματος μετά την ολοκλήρωση της λήψης"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Φάκελος για αποθήκευση προσωρινών αρχείων"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Αν θα γίνεται αυτόματη αποθήκευση λήψεων στον κατάλογο αποθήκευσης"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Φάκελος για αποθήκευση ληφθέντων αρχείων"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Αν θα γίνεται αυτόματη αποθήκευση λήψεων στο completedDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Φάκελος για μετακίνηση ληφθέντων αρχείων"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Αν θα γίνεται αυτόματη αντιγραφή των αρχείων .torrent στο torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Φάκελος αντιγραφής των αρχείων .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Αν θα χρησιμοποιείται μία προσαρμοσμένη IP για αποστολή στον ανιχνευτή"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Ο τελευταίος κατάλογος που χρησιμοποιήθηκε για αποθήκευση"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP για αποστολή στον ανιχνευτή"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Χρήση μνήμης"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Χρονικό διάστημα ενημέρωσης"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Υποστήριξη DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Θύρα DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Αριθμός υποδοχέων αποστολής"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Οι στήλες που εμφανίζονται στο KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Αλγόριθμος ET"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2302,458 +2302,458 @@ msgstr ""
- "χώρος είναι λιγότερος από τον ελάχιστο, το torrent θα σταματήσει."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Διαχειριστής προσθέτων"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Φόρτωση"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Α&ποφόρτωση"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "&Φόρτωση όλων"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Αποφόρτωση όλων"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Προκαθορισμένη UPnP συσκευή για χρήση"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Ανιχνευμένες συσκευές:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Συσκευή"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Προωθημένες θύρες"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Σύνδεση WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Προώθηση &θυρών"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Αναίρεση προώθησης θυρών"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Επανασάρωση"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Ενεργοποίηση σάρωσης του φακέλου 1;"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Ενεργοποίηση σάρωσης του φακέλου 2;"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Ενεργοποίηση σάρωσης του φακέλου 3;"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Διαδρομή του φακέλου 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Διαδρομή του φακέλου 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Διαδρομή του φακέλου 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Αν τα torrent θα ανοίγονται χωρίς ειδοποίηση ή όχι."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Διαγραφή επιλεγμένης ενέργειας."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Μετακίνηση επιλεγμένης ενέργειας."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Προτιμήσεις σάρωσης φακέλων"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Σάρωση του φακέλου &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Σάρωση του φακέλου &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Σάρωση του φακέλου &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Μετακίνηση στον κατάλογο \"φορτωμένων'\" &μετά τη φόρτωση"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- "Μετακίνηση του torrent στον κατάλογο \"φορτωμένων\" μετά τη φόρτωσή του"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Άνοιγμα των torrent &χωρίς ειδοποίηση"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Να μην εμφανίζεται ο διάλογος επιλογής αρχείου για λήψη"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Διαγραφή μετά τη &φόρτωση"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Διαγράφει το torrent μετά τη φόρτωσή του"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Φάκελοι για σάρωση"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Φάκελος 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Φάκελος 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Φάκελος 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Προτιμήσεις αναζήτησης"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Εξυπηρετητής ιστού"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Προώθηση θύρας"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL συνεδρίας (σε δευτ):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Επιλογή διεπαφής:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Όνομα χρήστη:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Αλλαγή κωδικού πρόσβασης..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Διαδρομή εκτελέσιμου της Php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Αριθμός θύρας"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "προώθηση θύρας"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Χρόνος time to live της συνεδρίας"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Θέμα περιβάλλοντος"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "διαδρομή εκτελέσιμου της Php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "όνομα χρήστη"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "κωδικός πρόσβασης"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Τμήματα"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Σύνολο:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Τρέχουσα λήψη:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Ληφθέντα:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Εξαιρέσεις:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Απομένουν:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Μέγεθος:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Κομμάτι"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Πρόοδος"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Υπολογιστής"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Επιλεγμένοι υπολογιστές"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Χρήστες που μοιράζονται:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Χρήστες παράσιτα:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Μέση ταχύτητα λήψης:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Μέση ταχύτητα αποστολής:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Επόμενη ενημέρωση σε:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Κατάσταση ανιχνευτή:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Τμήματα του αρχείου torrent που λήφθηκαν:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Τμήματα του αρχείου torrent που είναι διαθέσιμα:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Κοινόχρηστα"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2762,145 +2762,145 @@ msgstr ""
- "Το μηδέν σημαίνει ότι δεν υπάρχει όριο."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Η αποστολή θα σταματήσει αφού έχει παραμείνει ενεργή για τόσες ώρες."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Ώρες"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Όριο αναλογίας μοιράσματος:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Περιορισμός εργασιών σε λειτουργία μοιράσματος"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Όριο &χρόνου:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Ενημέρωση ανιχνευτή"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Ελάχιστο μεσοδιάστημα ενημέρωσης - 60 δευτερόλεπτα"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "&Προσθήκη ανιχνευτή"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Αφαίρεση ανιχνευτή"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Τροποποίηση ανιχνευτή"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Επαναφορά προκαθορισμένων"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Εμφάνιση καρτέλας προβολής υπολογιστών στο κύριο παράθυρο"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Εμφάνιση καρτέλας προβολής κομματιών λήψης στο κύριο παράθυρο"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Εμφάνιση καρτέλας προβολής ανιχνευτών στο κύριο παράθυρο"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Εμφάνιση λίστας υπολογιστών"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Εμφάνιση λίστας των κομματιών που &γίνεται λήψη"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Εμφάνιση λίστας ανιχνευτών"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Προτιμήσεις μπλοκαρίσματος IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Επιλογή αρχείου φίλτρου PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Χρήση φίλτρου PeerGuardian;"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Αρχείο φίλτρων IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&Λήψη/μετατροπή"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2911,25 +2911,25 @@ msgstr ""
- "ΣΗΜΕΙΩΣΗ: Υποστηρίζεται το αρχείο ZIP από το bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Url Level1 φίλτρου"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Χρήση φίλτρου level1;"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Μετατροπή..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2941,61 +2941,61 @@ msgstr ""
- "της οποίας δε θα μπορείτε να χρησιμοποιήσετε το KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Ενημέρωση"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Ενημέρωση γραφημάτων κάθε"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Ενημέρωση γραφικού περιβάλλοντος"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Συγκέντρωση δεδομένων κάθε"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "miliseconds"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Μέγιστο"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Μέγιστος αριθμός μοιράσματος:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Ακριβής"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Δείτε το 'Τι είναι αυτό' για περισσότερες πληροφορίες"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -3004,31 +3004,31 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Ταχύτητα υπολογιστών"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Ταχύτητα υπολογιστών:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "Ενημέρωση κάθε"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3036,61 +3036,61 @@ msgstr ""
- "φορτώσει την KME."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Συνδέσεις υπολογιστών:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Εμφάνιση γραμμής ταχύτητας στο πλαίσιο συστήματος"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Αποστολή"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Συνδέσεις"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Υπολογιστές"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Εναλλαγή γραφημάτων ταχύτητας υπολογιστών"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
-@@ -3098,73 +3098,73 @@ msgstr ""
- "υπολογιστών"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Λήψη torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "Σημαία μηνυμάτων συνδέσεων"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Εισαγωγή μιας υπάρχουσας λήψης"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Δεδομένα:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3172,684 +3172,684 @@ msgstr ""
- "Παρακαλώ ορίστε το torrent καθώς και τα ήδη ληφθέντα δεδομένων για το torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "Ε&ισαγωγή"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "προκαθορισμένο"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Ροές ειδήσεων Rss"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Ροές ειδήσεων"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Δια&γραφή"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Νέο"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Άρθρα"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Αυτόματη ανανέ&ωση"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Α&γνόηση TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Ανανέωση"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Τίτλος"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Διατήρηση άρθρων (ημέρες)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Ενεργό"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Φίλτρα"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Αποδοχή φίλτρων"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Απόρριψη φίλτρων"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Κανονικές εκφράσεις"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Χειρισμός ως μια &σειρά"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Διεργασία"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Κριτήρια σειράς"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, fuzzy, no-c-format
- msgid "Match Without Episode"
- msgstr "Λήψη ταιριασμάτων χωρίς επεισόδιο"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Μέγιστος επεισόδιο"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Μέγιστη περίοδος"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Ελάχιστη περίοδος"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Ελάχιστο επεισόδιο"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Δοκιμή &κειμένου"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Δοκιμή"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Ταιριάσματα φίλτρου"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Προγραμματιστής εύρους δικτύου"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Αριστερό κλικ σε κατηγορία"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Κ&ατηγορία 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Κ&λείσιμο"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Κανονικό"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Κατηγορία &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Κατηγορία &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Δεξί κλικ σε κατηγορία"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Κατηγορία &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Κατηγορία 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Κατηγορίες"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Κατηγορία</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Κατηγορία</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "λήψη:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "απεστάλη:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Κατηγορία</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* το 0 σημαίνει χωρίς όριο"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Αποθήκευση σε αρχείο"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Φόρτωση από αρχείο"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Μηδενισμός προγραμματισμού"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "Ε&ντάξει"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Σελίδα προτιμήσεων πρόσθετου προγραμματιστή"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Χρήση του προγραμματιστή εύ&ρους δικτύου;"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Προγραμματιστής εύρους δικτύου"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "&Χρήση χρωμάτων αντί εικόνων;"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Προτείνεται για αργά συστήματα)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Επεξεργασία &προγράμματος"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Ενεργοποίηση προγραμματιστή εύρους δικτύου;"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Χρήση χρωμάτων αντί εικόνων;"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Χρήση εμπλουτισμένου κειμένου στην καταγραφή"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Σημαία μηνυμάτων γενικών πληροφοριών"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Σημαία μηνυμάτων συνδέσεων"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Σημαία μηνυμάτων DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Σημαία μηνυμάτων πληροφοριών ανιχνευτή"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Σημαία μηνυμάτων πληροφοριών χρήσης δίσκου"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου αναζήτησης"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου ScanFolder"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου Scheduler"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Σημαία μηνυμάτων προσθέτου διασύνδεσης ιστού"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Επιλογές προβολέα καταγραφής"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Πρόσθετα"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Όλες"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Αποσφαλμάτωση"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Ειδοποίηση"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Σημαντικές"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Καμία"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Φίλτρο IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Αναζήτηση:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Σάρωση φακέλων:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Προγραμματιστής χρόνου:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Συστατικό εισαγωγής αρχείων:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Συστατικό πληροφοριών:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Πρόσθετο RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Πρόσθετο διασύνδεσης ιστού:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Σύστημα"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Γενικά:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Συνδέσεις:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Χρήση δίσκου:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "&Χρήση εμπλουτισμένου κειμένου στην καταγραφή"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Εξωτερικός περιηγητής"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Άνοιγμα αναζητήσεων σε εξωτερικό περιηγητή"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Χρήση εξωτερικού περιηγητή"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Διαδρομή προσαρμοσμένου περιηγητή:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Μηχανές αναζήτησης"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Όνομα μηχανής αναζήτησης:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Προσθήκη"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Μηχανές"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Αφαίρεση όλων"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Προσθήκη &προκαθορισμένης"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Ενημέρωση από το Διαδίκτυο"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Αναζήτηση"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Μηχανή αναζήτησης:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Τρέχουσα μηχανή αναζήτησης"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Χρήση προσαρμοσμένου περιηγητή"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Διαδρομή εκτελέσιμου προσαρμοσμένου περιηγητή"
-@@ -4139,7 +4139,7 @@ msgstr "Έλεγχος δεδομένων"
- msgid "Stopped. No space left on device."
- msgstr "Σταματημένο. Δεν υπάρχει ελεύθερος χώρος στη συσκευή."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4147,12 +4147,12 @@ msgstr ""
- "Δεν έχετε αρκετό ελεύθερο χώρο στο δίσκο για τη λήψη αυτού του torrent. "
- "Επιθυμείτε σίγουρα τη συνέχεια;"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Μη επαρκής χώρος στο δίσκο για το %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4160,16 +4160,16 @@ msgstr ""
- "Το torrent \"%1\" έφτασε στο μέγιστη αναλογία κοινόχρηστων του. Να παραβλεφθεί "
- "αυτό το όριο και να ξεκινήσει το μοίρασμά του;"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Συμπληρώθηκε η μέγιστη αναλογία κοινόχρηστων."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Σφάλμα κατά το σταμάτημα του torrent %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Σφάλμα κατά την εκκίνηση του torrent %1 : %2"
- 
-diff --git a/translations/en_GB/messages/ktorrent.po b/translations/en_GB/messages/ktorrent.po
-index f9eef54..55744cf 100644
---- a/translations/en_GB/messages/ktorrent.po
-+++ b/translations/en_GB/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-01-16 22:31+0000\n"
- "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
- "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -198,7 +198,7 @@ msgstr "Malformed URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Downloads"
-@@ -321,7 +321,7 @@ msgid "Document to open"
- msgstr "Document to open"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -607,7 +607,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -654,7 +654,7 @@ msgid "Add to Group"
- msgstr "Custom IP"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -673,7 +673,7 @@ msgid "Malformed IP address."
- msgstr "Malformed URL."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferences"
-@@ -710,7 +710,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "File Options"
-@@ -721,7 +721,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -743,7 +743,7 @@ msgstr "Uploaded"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Down Speed"
-@@ -870,7 +870,7 @@ msgid "User"
- msgstr "User"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Queue Manager"
-@@ -1063,8 +1063,8 @@ msgid "Start torrent"
- msgstr "Start seedin&g the torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Download"
-@@ -1118,13 +1118,13 @@ msgid "Encryption"
- msgstr "Description"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1132,20 +1132,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1153,169 +1153,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Custom IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Send the tracker a c&ustom IP or hostname"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Custom IP or hostname:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, fuzzy, no-c-format
- msgid "Folders"
- msgstr "Fi&les"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Folder to store temporary files:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Download"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Automatically save downloads to:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "torrent files"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Download Toolbar"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Start seedin&g the torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximum upload rate:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Maximum download rate:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/sec (0 is no limit)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Peer"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Torrent files"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1323,187 +1323,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "Assigned Peers"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximum downloads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximum seeds:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "Not started"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Not started"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 is no limit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximum download rate:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Share ratio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, fuzzy, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximum connections per download:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP tracker port:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Share ratio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximum upload rate:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sec (0 is no limit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(0 is no limit)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Keep seeding after download is finished"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Attention"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1513,283 +1513,283 @@ msgstr ""
- "can do this for you."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT Queue Dialogue"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "Tracker"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Share ratio:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlled by"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Uploaded"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Uploaded"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, fuzzy, no-c-format
- msgid "M&ove up"
- msgstr "Move &up"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Move dow&n"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "Move &up"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, fuzzy, no-c-format
- msgid "&QM Controlled"
- msgstr "&QM controlled"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, fuzzy, no-c-format
- msgid "&User Controlled"
- msgstr "&User controlled"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Paste URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancel"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Create Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "The file or folder of which you want to create a torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "You must add at least one tracker."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "File Options"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Size of each chunk:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Start seedin&g the torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comments:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Cre&ate"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncel"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackers"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Name:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "Custom IP or hostname:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1797,19 +1797,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Search Preferences"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1825,427 +1825,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Current search engine"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Preferences"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Memory usage:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Low"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Medium"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "High"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "GUI update interval:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximum number of connections per download (0 = no limit)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "UDP tracker port:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr ""
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximum number of downloads (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximum number of seeds (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, fuzzy, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximum number of connections per download (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, fuzzy, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maximum number of connections per download (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximum upload speed in KB/sec (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximum download speed in KB/sec (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximum number of seeds (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maximum number of seeds (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Show a system tray icon"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Keep seeding after download has finished"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Folder to store temporary files"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "&Automatically save downloads to:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Folder to store downloaded files"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "&Automatically save downloads to:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Folder to store downloaded files"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "&Automatically save downloads to:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Folder to store temporary files"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, fuzzy, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "IP to pass to the tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP to pass to the tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Memory usage"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "GUI update interval"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2253,602 +2253,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Plugin Manager"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Load"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "U&nload"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Load All"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Unload All"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Default UPnP device to use"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Detected devices:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Device"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Ports Forwarded"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Forward Ports"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Undo Port Forwarding"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Rescan"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Unable to open torrent file %1: %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Search Preferences"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, fuzzy, no-c-format
- msgid "Alt+2"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, fuzzy, no-c-format
- msgid "Alt+3"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "torrent files"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Search Preferences"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "Forward Ports"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Select &None"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "User"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "Forward Ports"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "General Options"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Chunks"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Currently downloading:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Downloaded:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Excluded:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, fuzzy, no-c-format
- msgid "Size:"
- msgstr "Size"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Chunk"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Progress"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Assigned Peers"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Seeders:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Leechers:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "Average Speed"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "Average Speed"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Next update in:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Trackers"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Parts of the file which have been downloaded:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Parts of the file which are available:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Sharing"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "IP to pass to the tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, fuzzy, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Gui update interval"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr "Add Defau&lt"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Show peer view tab in main window"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Show chunk download view tab in main window"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, fuzzy, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Show peer view tab in main window"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Show list of peers"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Show list of chunks currentl&y downloading"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, fuzzy, no-c-format
- msgid "Show list of trackers"
- msgstr "Show list of peers"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP Blocking Preferences"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Use KTorrent filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Use KTorrent filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP filter file:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Dow&nload/Convert"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2856,25 +2856,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Level 1 filter URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Use level1 filter?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Converting..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2883,61 +2883,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "GUI update interval"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Maximum seeds:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maximum seeds:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2946,163 +2946,163 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "Peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Show s&ystem tray icon"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Uploaded"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Download Torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Import an Existing Download"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "Torrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, fuzzy, no-c-format
- msgid "Data:"
- msgstr "Data"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3110,684 +3110,684 @@ msgstr ""
- "Please specify the torrent and the data already downloaded for that torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, fuzzy, no-c-format
- msgid "&Import"
- msgstr "Impo&rt"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "Add Defau&lt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Seeders:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "IP filter file:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "All Files"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Progress"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Share ratio:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Download"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "Uploaded"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "(0 is no limit)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, fuzzy, no-c-format
- msgid "O&k"
- msgstr "&Ok"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Plugin Options"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "File Options"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Plugin Options"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Plugin Options"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Plugin Options"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "File Options"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugins"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, fuzzy, no-c-format
- msgid "Debug"
- msgstr "Debug mode"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, fuzzy, no-c-format
- msgid "Important"
- msgstr "Impo&rt"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "IP filter file:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "Search"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, fuzzy, no-c-format
- msgid "UPnP:"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Fi&les"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "Seeders:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, fuzzy, no-c-format
- msgid "InfoWidget:"
- msgstr "Information Widget"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "General Options"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "General"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "Custom IP"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Search Engines"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Search engine name:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Add"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Engines"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "R&emove All"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Add Defau&lt"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "GUI update interval"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Search"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Search engine:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Current search engine"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4078,33 +4078,33 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Error stopping torrent %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Error starting torrent %1: %2"
- 
-diff --git a/translations/es/messages/ktorrent.po b/translations/es/messages/ktorrent.po
-index 8619673..c252e11 100644
---- a/translations/es/messages/ktorrent.po
-+++ b/translations/es/messages/ktorrent.po
-@@ -1,17 +1,18 @@
-+# Translation of ktorrent.po to Spanish
- # Translation of ktorrent to Spanish
- # This file is distributed under the same license as the KTorrent package.
- # Copyright (C) 2005 Joris Guisson <joris.guisson@gmail.com>
- #
- # Pablo de Vicente <pablo.devicente@gmail.com>, 2005.
--# Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2005, 2006, 2007.
-+# Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2005, 2006, 2007, 2008.
- # Jaime Robles <jaime@kde.org>, 2007.
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2007-12-23 11:26+0100\n"
--"Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
--"Language-Team: Spanish <es@li.org>\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-09-09 14:37+0200\n"
-+"Last-Translator: Enrique Matias Sanchez <cronopios@gmail.com>\n"
-+"Language-Team: Spanish <kde-l10n-es@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -23,7 +24,7 @@ msgstr ""
- "No hay conexiones entrantes (posiblemente esté detrás de un cortafuegos)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Información"
-@@ -191,7 +192,7 @@ msgstr "URL mal formado."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Descargas"
-@@ -307,14 +308,14 @@ msgstr "Modo de depuración"
- 
- #: apps/ktorrent/main.cpp:109
- msgid "Silently save torrent given on URL"
--msgstr ""
-+msgstr "Guardar silenciosamente el torrent dado en el URL"
- 
- #: apps/ktorrent/main.cpp:110
- msgid "Document to open"
- msgstr "Documento a abrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -446,9 +447,8 @@ msgid "Patch to fix free diskspace calculation on FreeBSD"
- msgstr "Parche para arreglar el cálculo del espacio libre en disco en FreeBSD"
- 
- #: apps/ktorrent/main.cpp:167
--#, fuzzy
- msgid "Patch to load torrents silently from the command line"
--msgstr "Parche de carga silenciosas con una ubicación de grabación"
-+msgstr "Parche para cargar torrents silenciosamente desde la línea de órdenes"
- 
- #: apps/ktorrent/torrentcreatordlg.cpp:64
- msgid "You must select a file or a folder."
-@@ -580,7 +580,7 @@ msgstr "Fuentes de compañeros del torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -622,7 +622,7 @@ msgid "Add to Group"
- msgstr "Añadir al grupo"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Límites de velocidad"
-@@ -641,7 +641,7 @@ msgid "Malformed IP address."
- msgstr "Dirección IP mal formada."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferencias"
-@@ -678,7 +678,7 @@ msgid "Advanced"
- msgstr "Avanzado"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Opciones avanzadas"
-@@ -689,7 +689,7 @@ msgstr "Columnas visibles"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Estado"
-@@ -711,7 +711,7 @@ msgstr "Enviado"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Velocidad de descarga"
-@@ -835,7 +835,7 @@ msgid "User"
- msgstr "Usuario"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Gestor de cola"
-@@ -1063,8 +1063,8 @@ msgid "Start torrent"
- msgstr "Iniciar el torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Descarga"
-@@ -1118,13 +1118,13 @@ msgid "Encryption"
- msgstr "Cifrado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usar cifrado del protocolo"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1134,13 +1134,13 @@ msgstr ""
- "conexiones bittorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permitir conexiones no cifradas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1148,7 +1148,7 @@ msgstr ""
- "Si no está marcado, sólo podrá conectarse a clientes que admitan cifrado."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1159,170 +1159,170 @@ msgstr ""
- "información en el manual."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usar DHT para obtener compañeros adicionales"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Puerto UDP para la comunicación de DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP personalizada"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- "E&nviar al localizador una dirección IP o nombre de máquina personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Dirección IP o nombre de máquina personalizado:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Icono de la bandeja del sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostrar el icono en la bandeja del &sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Mostrar la &barra de velocidad en la bandeja del sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mostrar mensajes emergentes en la bandeja del sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Ancho de banda de envío (en kB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Ancho de banda de descarga (en kB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Carpetas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Carpeta en la que guardar los ficheros temporales:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Mover las descargas finalizadas a:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Guardar &automáticamente las descargas en:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Copiar los ficheros .torrent a:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra de descargas"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Establecer los límites de velocidad para el torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Tasa máxima de envío:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Tasa máxima de descarga:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "kB/s (0 = sin límite)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Añadir un compañero potencial"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP del compañero:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Puerto:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Introduzca la IP y puerto del compañero."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Lista negra de KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1332,55 +1332,55 @@ msgstr ""
- "guardar sus entradas o use el complemento de filtro IP (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Compañeros prohibidos"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Dirección IP del compañero"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Añadir un compañero:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Añade un compañero a la lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Elimina el compañero seleccionado de la lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Limpiar"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Limpia esta lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Gu&ardar como..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
-@@ -1388,133 +1388,133 @@ msgstr ""
- "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Número máximo de descargas:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Número máximo de semillas:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Iniciar la descarga con poco espacio en disco:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Espacio mínimo en disco:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "No iniciar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Preguntar siempre"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Forzar el inicio"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = sin límite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Tasa máxima de descarga:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Límite global de conexiones:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Tiempo máximo de siembra:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Número máximo de conexiones por torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Número de bloques de envío:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Puerto UDP del sistema de localización:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Proporción máxima de compartición:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Tasa máxima de envío:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "kB/s (0 = sin límite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Horas (0 = sin límite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Seguir haciendo de semilla después de que la descarga haya terminado"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Atención"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1524,283 +1524,283 @@ msgstr ""
- "encaminador. El complemento de UPnP puede hacerlo por usted."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Ventana de cola de KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Estado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Sistema de localización:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Proporción de compartición:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Bytes restantes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlado por"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Envío&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Enviado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "&Subir"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "&Bajar"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Mover arriba del todo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Mover a&bajo del todo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controlado por el &GC"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controlado por el &usuario"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Pegar URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&Aceptar"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Crear torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "El fichero o carpeta del que quiere crear un torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Debe añadir al menos un localizador o nodo."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opciones del fichero"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Tamaño de cada bloque:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "kB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Empezar a &sembrar el torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Descentrali&zado (sólo DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrent privado (no se permite DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comentarios:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Crear"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Sistemas de localización"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Nodos DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Nodo:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP o nombre de máquina"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Puerto"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1810,19 +1810,19 @@ msgstr ""
- "insertar su propia dirección IP y puerto si piensa sembrar este torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferencias avanzadas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
--msgstr ""
-+msgstr "Algoritmo de estimación del tiempo restante:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1851,175 +1851,175 @@ msgstr ""
- "X muestras"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Velocidad actual"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Velocidad media global"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Ventana de X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Media móvil"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(surte efecto tras reiniciar)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Inha&bilitar la reserva previa de espacio en disco"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Preasignar &totalmente el espacio en disco (evita la fragmentación)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Básico (lento)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Específico del sistema de ficheros"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Rendimiento"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Uso de la memoria:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Baja"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Media"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Intervalo de actualización de la interfaz:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "CPU rápida"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "CPU lenta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Verificación de datos"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Durante el envío, &no volver a verificar los bloques mayores de"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Realizar una verificación de &integridad de datos tras"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "bloques dañados"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Red"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Número máximo de configuraciones de conexión:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP para paquetes IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
-@@ -2027,255 +2027,255 @@ msgstr ""
- "localizador"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Proxy HTTP al localizador:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Analizando los datos"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Analizando los datos del torrent:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Número de bloques encontrado:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Número de bloques fallidos/no descargados:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Probar"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Número máximo de descargas (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Número máximo de semillas (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "¿Iniciar las descargar si hay poco espacio en disco?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Número máximo de conexiones por torrent (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Número máximo de conexiones para todos los torrents (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocidad máxima de subida en kB/s (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocidad máxima de descarga en kB/s (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Proporción máxima de compartición (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Tiempo máximo de siembra en horas (0 = sin límite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostrar un icono en la bandeja del sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostrar la barra de velocidad en la bandeja del sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Ancho de banda de descarga (en kB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Ancho de banda de envío (en kB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostrar un mensaje emergente cuando finalice un torrent."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Seguir haciendo de semilla cuando la descarga ha terminado"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Carpeta donde guardar los ficheros temporales"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Se debe grabar automáticamente las descargas en la carpeta de grabación"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Carpeta en la que guardar los ficheros descargados"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Se deben mover automáticamente las descargas finalizadas a completedDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Carpeta a la que mover los ficheros totalmente descargados"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Se deben copiar automáticamente los ficheros .torrent a torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Carpeta a la que copiar los ficheros .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Se debe pasar una IP personalizada al localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Último directorio usado como directorio de grabación"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP a pasar al localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Utilización de la memoria"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Intervalo de actualización de la interfaz"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Soporte para DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Puerto DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Número de bloques de envío"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Columnas mostradas en KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritmo de ET"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2285,457 +2285,457 @@ msgstr ""
- "menor que minDiskSpace, el torrent se detendrá."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Gestor de complementos"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Cargar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Descargar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "C&argar todo"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Descargar todo"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositivo UPnP a usar por omisión"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositivos detectados:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositivo"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Puertos redireccionados"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Conexión WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Redireccion&ar los puertos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Deshacer la redirección de puertos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Explorar de nuevo"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "¿Habilitar el análisis de la carpeta1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "¿Habilitar el análisis de la carpeta2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "¿Habilitar el análisis de la carpeta3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Ruta de la carpeta1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Ruta de la carpeta2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Ruta de la carpeta3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Si desea abrir el torrent de forma silenciosa o no."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Marcada la acción de borrado."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Marcada la acción de movimiento."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferencias de la búsqueda de carpetas"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Buscar la carpeta &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Buscar la carpeta &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Buscar la carpeta &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Mover al directorio «loaded» tr&as la carga"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Mover el torrent al directorio «loaded» después de cargarlo"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Abrir los torrents &silenciosamente"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "No mostrar la ventana «Seleccionar los ficheros a descargar»"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Borrar tras la &carga"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Borra el torrent después de la carga"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Carpetas a buscar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Carpeta 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Carpeta 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Carpeta 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferencias de búsqueda"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Servidor web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Puerto de redirección"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL de la sesión (en s):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Seleccionar la interfaz:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Usuario:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Cambiar la contraseña..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Ruta del ejecutable «php»:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Número del puerto"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Puerto de redirección"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Tiempo de vida de la sesión"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Piel de la interfaz"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Ruta del ejecutable «php»"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "usuario"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "contraseña"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Bloques"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Descargando actualmente:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Descargado:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Excluido:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Queda:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Tamaño:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Bloque"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Progreso"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Compañero"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Compañeros asignados"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Sembradores:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Sanguijuelas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocidad media de descarga:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocidad media de envío:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Siguiente actualización en:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Estado del localizador:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Partes del torrent que han sido descargadas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Partes del torrent que están disponibles:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Compartido"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2744,7 +2744,7 @@ msgstr ""
- "Cero significa sin límite."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2752,139 +2752,139 @@ msgstr ""
- "horas."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Horas"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Límite de proporciones:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "El límite sólo funciona en el modo semilla"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Límite de tiempo:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Act&ualizar el localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Intervalo mínimo de actualización - 60 segundos"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Añadir un lo&calizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Eliminar el localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "C&ambiar el localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Restaurar los valores predefinidos"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostrar la solapa de compañeros en la ventana principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Mostrar la solapa de bloques descargados en la ventana principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Mostrar la solapa de localizadores en la ventana principal"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostrar lista de compañeros"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostrar la lista de bloques descargándose &actualmente"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostrar lista de localizadores"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferencias de bloqueo de IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Seleccione el fichero del filtro de PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "¿Usar el filtro de PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Fichero de filtro de IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&Descargar/Convertir"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2894,25 +2894,25 @@ msgstr ""
- "NOTA: Se admite el fichero ZIP de bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL del filtro de nivel 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "¿Usar el filtro de nivel 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Convirtiendo..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2924,61 +2924,61 @@ msgstr ""
- "durante ese tiempo no podrá usar KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Actualizar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Actualizar las gráficas cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Actualizaciones de la interfaz"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Recoger datos cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisegundos"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Máximo"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Modo de escala de la velocidad máxima:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exacta"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Consulte «¿Qué es esto?» para obtener ayuda"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2990,31 +2990,31 @@ msgstr ""
- "- Exacta: La velocidad máxima alcanzada visible en la gráfica"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Velocidad de los compañeros"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Velocidad de los compañeros:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "actualizar cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "actualizaciones de los datos de la gráfica"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3022,13 +3022,13 @@ msgstr ""
- "CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Conexiones de compañeros"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
-@@ -3036,805 +3036,805 @@ msgstr ""
- "conectados"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostrar los sembradores en enjambres"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Mostrar las sanguijuelas en enjambres"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Cuenta de mediciones"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Envío"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Conexiones"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Compañeros"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Conmutar las gráficas de velocidad de los compañeros"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervalo de obtención de datos de la velocidad de los compañeros"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Conmutar el dibujo de sanguijuelas en enjambres"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Conmutar el dibujo de sembradores en enjambres"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Cuenta de mediciones de descarga"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Cuenta de mediciones de velocidades de los compañeros"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Cuenta de mediciones de envío"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Cuenta de mediciones de conexión"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Cuenta de mediciones de DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Modo de los máximos del eje OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importar una descarga existente"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Datos:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Indique el torrent y los datos ya descargados de ese torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importar"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "por omisión"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Fuentes RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Fuentes"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Borrar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nuevo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artículos"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Actualiza&r automáticamente"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnorar el TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Actualizar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Título"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Mantener los artículos (días)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Activo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Aceptar los filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Rechazar los filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Expresiones regulares"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tratar como &serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Proceso"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Criterio de la serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Coincidencia sin episodio"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Episodio mínimo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Temporada máxima"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Temporada mínima"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Episodio mínimo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Probar el te&xto"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Probar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Coincidencias del filtro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Planificador del ancho de banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoría del botón izquierdo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "&Categoría 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Desconectar"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoría &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoría &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoría del botón derecho"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoría &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoría 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categorías"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Categoría</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Categoría</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "descarga:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "envío:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "kB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Categoría</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* el cero significa ilimitado"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Guardar en un fichero"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Cargar de un fichero"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Reiniciar la planificación"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&Aceptar"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Página de preferencias del complemento de planificación"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "¿Usar el planificador del ancho de &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Planificador del ancho de banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "¿Usar colores en vez de &imágenes?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Recomendado para los sistemas más lentos)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Editar la planifi&cación"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "¿Habilitar el planificador del ancho de banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "¿Usar colores en vez de imágenes?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usar texto enriquecido en el registro"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Señal de mensajes de información general"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Señal de mensajes de conexión"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Señal de mensajes DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Señal de mensajes de información del localizador"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Señal de mensajes de información de E/S del disco"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Señal de mensajes del complemento IPfilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Señal de mensajes del complemento de búsqueda"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Señal de mensajes del complemento PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Señal de mensajes del complemento InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Señal de mensajes del complemento de UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Señal de mensajes del complemento de carpeta de búsquedas"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Señal de mensajes del complemento de planificación"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Señal de los mensajes del complemento de RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Señal de los mensajes del complemento de la interfaz web"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opciones del visualizador del registro"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Complementos"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Todo"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Depuración"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Aviso"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Importante"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ninguno"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtro de IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Buscar:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Carpeta de búsquedas:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planificador:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Complemento de RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Complemento de la interfaz web:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "General:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Conexiones:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "E/S de disco:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usar te&xto enriquecido en el registro"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Navegador externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Abrir las búsquedas en un navegador externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Usar el navegador predefinido"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Ruta al navegador personalizado:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Motores de búsqueda"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nombre del motor de búsqueda:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Añadir"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motores"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Eliminar todo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Añadir &predeterminado"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Actualizar por Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Buscar"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motor de búsqueda:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Motor de búsqueda actual"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Usar un navegador personalizado"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Ruta del ejecutable del navegador personalizado"
-@@ -4123,7 +4123,7 @@ msgstr "Verificando los datos"
- msgid "Stopped. No space left on device."
- msgstr "Detenido. No queda espacio en el dispositivo."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4131,12 +4131,12 @@ msgstr ""
- "No tiene suficiente espacio en disco para descargar este torrent. ¿Seguro que "
- "desea continuar?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Espacio en disco insuficiente para %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4144,16 +4144,16 @@ msgstr ""
- "Este torrent «%1» ha alcanzado su proporción de compartición máxima. ¿Desea "
- "ignorar el limite y comenzar a sembrar de todas formas?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Se ha alcanzado el límite de proporción de compartición."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Error al detener el torrent %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Error al iniciar el torrent %1: %2"
- 
-@@ -4915,6 +4915,3 @@ msgid ""
- msgstr ""
- "Encontrar compañeros ejecutando ktorrent en la red local con los que compartir "
- "torrents"
--
--#~ msgid "ETA algorithm:"
--#~ msgstr "Algoritmo de ETA:"
-diff --git a/translations/et/messages/ktorrent.po b/translations/et/messages/ktorrent.po
-index c43ee72..a93d9e4 100644
---- a/translations/et/messages/ktorrent.po
-+++ b/translations/et/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-03-23 22:27+0300\n"
- "Last-Translator: Marek Laane <bald@starman.ee>\n"
- "Language-Team: Estonian <kde-et@linux.ee>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Sisenevaid ühendusi pole (tulemüüri taga?)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -188,7 +188,7 @@ msgstr "Vigane URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Allalaadimised"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Avatav dokument"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -574,7 +574,7 @@ msgstr "Torrenti lähtemasinad:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -616,7 +616,7 @@ msgid "Add to Group"
- msgstr "Lisa gruppi"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Kiiruse piirangud"
-@@ -635,7 +635,7 @@ msgid "Malformed IP address."
- msgstr "Vigane IP-aadress."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Seadistused"
-@@ -671,7 +671,7 @@ msgid "Advanced"
- msgstr "Muud"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Muud valikud"
-@@ -682,7 +682,7 @@ msgstr "Nähtavad veerud"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Olek"
-@@ -704,7 +704,7 @@ msgstr "Üleslaaditud"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Tõmbamiskiirus"
-@@ -828,7 +828,7 @@ msgid "User"
- msgstr "Kasutaja"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Järjekorrahaldur"
-@@ -1051,8 +1051,8 @@ msgid "Start torrent"
- msgstr "Alusta torrentit"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Allalaadimine"
-@@ -1106,13 +1106,13 @@ msgid "Encryption"
- msgstr "Krüptimine"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Krüptimise kasutamine"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1122,13 +1122,13 @@ msgstr ""
- "ühendusi."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Krüptimata ühenduste lubamine"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1136,7 +1136,7 @@ msgstr ""
- "Märkimata jätmisel saab ühendust luua ainult krüptimist toetavate klientidega."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1147,169 +1147,169 @@ msgstr ""
- "sellest käsiraamat."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "DHT kas&utamine lisamasinate hankimiseks"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP port DHT suhtluseks:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Kohandatud IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Tracker'isse saadetakse koha&ndatud IP või masinanimi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Kohandatud IP või masinanimi:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Süsteemse salve ikoon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Ikoon &süsteemses salves"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Kiiruseri&ba näitamine süsteemses salves"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Süsteemse salve hüpikteadete näitamine"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Üleslaadimise ribalaius (KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Allalaadimise ribalaius (KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Kataloogid"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Ajutiste failide salvestamise kataloog:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Lõpetatud allalaadimised liigutatakse asukohta:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Allalaadimised salvestatakse automaatselt kataloogi:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr ".torrent-failid kopeeritakse asukohta:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Allalaadimisriba"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Torrenti kiirusepiirangute määramine"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maks. üleslaadimise kiirus:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maks. allalaadimise kiirus:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 tähendab piirangu puudumist)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Võimaliku masina lisamine"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Masina IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Sisesta masina IP ja port."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrenti must nimekiri"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1319,188 +1319,188 @@ msgstr ""
- "salvesta nimekiri või kasuta IP filtri pluginat."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Keelatud masinad"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Masina IP aadress"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Masina lisamine:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Lisab masina musta nimekirja"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Eemaldab valitud masina mustast nimekirjast"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Puhasta"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Puhastab nimekirja"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "&Salvesta kui..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Salvestab musta nimekirja, et KTorrenti IP filtri plugin saaks seda kasutada"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maks. allalaaditavate torrentite arv:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maks. levitatavate torrentite arv:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Allalaadimise alustamine napi kettaruumi korral: "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimaalne kettaruum:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Ei alustata"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Alati küsitakse"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Alati alustatakse"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 tähendab piirangu puudumist)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maks. allalaadimise kiirus:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Globaalne ühenduste piirang:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maks. levitamisaeg:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maks. ühenduste arv torrenti kohta:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Üleslaadimispesade arv:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Tracker'i UDP port:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maks. üles- ja allalaadimise suhe:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maks. üleslaadimise kiirus:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sek (0 tähendab piirangu puudumist)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "tundi (0 tähendab piirangu puudumist)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Pärast allalaadimise lõpetamist jätkatakse torrenti levitamist"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Tähelepanu"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1510,283 +1510,283 @@ msgstr ""
- "sinu eest teha UPnP plugin."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KTorrenti tööjärjekorra dialoog"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Olek:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Üles- ja allalaadimise suhe:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Baite jäänud:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontrollija"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Üle&slaadimised"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Üleslaaditud:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "L&iiguta üles"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Lii&guta alla"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Liiguta ette"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Liiguta ta&ha"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Kontrollib &järjekorrahaldur"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Kontrollib kasutaja"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL-i asetamine"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Loobu"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrenti loomine"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Fail või kataloog, millest torrentit luua soovid:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Lisada tuleb vähemalt üks tracker või sõlm."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Failivalikud"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Tükkide suurus:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Alusta torrenti le&vitamist"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "&Detsentraliseeritud (ainult DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privaattorrent (DHT pole lubatud)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentaarid:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Loo"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Katkesta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Tracker'id"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT sõlmed"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Sõlm:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP või masinanimi"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1796,19 +1796,19 @@ msgstr ""
- "torrentit levitada, tuleb tõenäoliselt lisada ka enda IP-aadress ja port."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Muud seadistused"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "Kuluva aja hindamise algoritm:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1836,428 +1836,428 @@ msgstr ""
- "näidete põhjal"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Praegune kiirus"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Globaalne keskmine kiirus"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "X-aken"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Liigutamise keskmine"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(rakendub pärast taaskäivitamist)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Ketta&ruumi eeleraldamise keelamine"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Kettar&uumi täielik eeleraldamine (väldib defragmenteerumist)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Elementaarne (aeglane)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Failisüsteemile omane"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Jõudlus"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Mälukasutus:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Väike"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Keskmine"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Suur"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Kasutajaliidese uuendamise intervall:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 msek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Kiire protsessor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Aeglane protsessor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Andmete kontroll"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Üleslaadimisel ei ko&ntrollita üle suuremaid tükke kui"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "A&ndmete terviklikkust kontrollitakse pärast"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "vigaseid tükke"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Võrk"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Ühenduste maksimaalne arv:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "IP-pakettide DSCP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "&HTTP-tracker'i ühendusteks ei kasutata KDE puhverserverit"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP puhverserver tracker'itele:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Andmete uurimine"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Torrenti andmete uurimine: "
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Leitud tükkide arv: "
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Ebaõnnestunud/allalaadimata tükkide arv: "
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Allalaadimiste maksimaalne arv (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Levitamiste maksimaalne arv (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Kas alustada allalaadimist napi kettaruumi korral?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Ühenduste maksimaalne arv torrenti kohta (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Ühenduste maksimaalne arv kõigi torrentide kohta (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Üleslaadimise maksimaalne kiirus KB/sek (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Allalaadimise maksimaalne kiirus KB/sek (0 = piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maks. jagamissuhe (0=piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maks. levitamisaeg tundides (0=piirang puudub)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Ikoon süsteemses salves"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Kiiruseriba näitamine süsteemses salves"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Allalaadimise ribalaius (KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Üleslaadimise ribalaius (KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Hüpikakna näitamine torrenti lõpetamisel."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Pärast allalaadimise lõpetamist jätkatakse torrenti levitamist"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Ajutiste failide salvestamise kataloog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Kas salvestada allalaadimised automaatselt salvestamiskataloogi"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Allalaaditud failide salvestamise kataloog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Kas salvestada allalaadimised automaatselt lõpetatud allalaadimiste kataloogi"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Lõpetatud allalaaditud failide salvestamise kataloog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Kas salvestada .torrent-failid automaatselt torrentite kataloogi"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr ".torrent-failide salvestamise kataloog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Kas lubada kohandatud IP saatmist tracker'isse"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Kataloog, mida kasutati viimati salvestamiskataloogina"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "Tracker'isse saadetav IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Mälukasutus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "GUI uuendamise intervall"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "DHT toetus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Üleslaadimispesade arv"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "KTorrenti vaates nähtavad veerud"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Ajahinnangu algoritm"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2267,457 +2267,457 @@ msgstr ""
- "kui minimaalse kettaruumiga määratud, torrent peatatakse."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Pluginahaldur"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Lülita sisse"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Lüli&ta välja"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Lüli&a kõik sisse"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Lülita &kõik välja"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Vaikimisi kasutatav UPnP seade"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Tuvastatud seadmed:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Seade"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Edasi suunatud pordid"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-ühendus:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Ed&astamispordid"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Tühista portide edasisuunamine"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Uuri uuesti"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Kas lubada kataloog1 uurimine?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Kas lubada kataloog2 uurimine?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Kas lubada kataloog3 uurimine?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Kataloog1 asukoht"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Kataloog2 asukoht"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Kataloog3 asukoht"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Kas avada torrent vaikselt või mitte."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Kustutamistoiming märgitud."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Liigutamistoiming märgitud."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Kataloogide uurimise seadistused"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Kataloogi &1 uurimine"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Kataloogi &2 uurimine"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Kataloogi &3 uurimine"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Liigut&amine pärast laadimist kataloogi \"laaditud\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Torrent liigutatakse pärast laadimist kataloogi \"laaditud\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "To&rrentide avamine vaikselt"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Dialoogi 'Allalaaditavate failide valik' ei näidata"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Kustutami&ne pärast laadimist"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Torrent kustutatakse pärast laadimist"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Uuritavad kataloogid"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Kataloog 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Kataloog 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Kataloog 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Otsingu seadistused"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Veebiserver"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Edastamisport"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Seansi elushoidmise aeg (sek):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Liides:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Kasutajanimi:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Muuda parooli..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "PHP programmi asukoht:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Pordinumber"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Edastamisport"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Seansi elushoidmise aeg"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Liides"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "PHP programmi asukoht"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "Kasutajanimi"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "Parool"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Tükid"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Kokku:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Parajasti allalaaditavad:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Allalaaditud:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Väljajäetavad:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Jäänud:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Suurus:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Tükk"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Edenemine"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Masin"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Määratud masinad"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Levitajad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Tõmbajad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Keskmine allalaadimise kiirus:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Keskmine üleslaadimise kiirus:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Järgmine uuendus:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Tracker'i olek:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Juba alla laaditud torrenti osad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Kättesaadavad torrenti osad:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Jagamine"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2726,145 +2726,145 @@ msgstr ""
- "piirangu puudumist."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Sinu üleslaadimine peatub, kui oled laadinud määratud arvu tunde."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "tundi"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Suhte piirang:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Piirang toimib ainult levitamisel"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "A&japiirang"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Uuend&a tracker'it"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Min. uuendamisintervall - 60 sekundit"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Lisa t&racker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Eemalda tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Muuda tracker'it"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Vaikeväärtused"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Masinate kaardi näitamine peaaknas"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Tükkide allalaadimise kaardi näitamine peaaknas"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Tracker'ite kaardi näitamine peaaknas"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Masinate nimekirja näitamine"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "&Parajasti allalaaditavate tükkide nimekirja näitamine"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Tracker'ite nimekirja näitamine"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP blokeerimise seadistused"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "PeerGuardiani filtri faili valimine "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardiani filtri kasutamine"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP filtri fail:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Laa&di alla/Teisenda"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2874,25 +2874,25 @@ msgstr ""
- "Märkus: toetatud on ka bluetack.co.uk ZIP-fail."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Level1 filtri URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Level1 filtri kasutamine"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Teisendamine..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2904,61 +2904,61 @@ msgstr ""
- "kasutada."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Uuendamine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Diagrammide uuendamise intervall"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "GUI uuendamine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Andmete kogumise intervall"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "msek"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maksimum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maks. kiiruse skaleerimise režiim:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Täpne"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Vaata lähemalt 'Mis see on?' abi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2970,848 +2970,848 @@ msgstr ""
- "- Täpne: diagrammil nähtav maksimaalselt saavutatud kiirus"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Masinate kiirus"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Masinate kiirus:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "uuendamise intervall"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "diagrammiandmete uuendamine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Andmete kogumine, kui palju ühendatud masinaid protsessor vastu peab."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Masinate ühendused"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- "Suured väärtused võivad muuta ühendatud masinate diagrammid ebaülevaatlikuks"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Levitajate näitamine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Tõmbajate näitamine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Mõõtmiste hulk"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Üleslaadimine"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Ühendused"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Masinad"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Masinate kiiruse diagrammide lülitamine"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervall masinate kiiruse andmete hankimise vahel"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Tõmbajate näitamise lülitamine"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Levitajate näitamise lülitamine"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Allalaadimise mõõtmiste hulk"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Masinate kiiruse mõõtmise hulk"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Üleslaadimise mõõtmiste hulk"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Ühenduste mõõtmiste hulk"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "DHT mõõtmiste hulk"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "0Y-telje maksimumi režiim"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Olemasoleva allalaadimise import"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Andmed:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Palun määra torrent ja selle juba allalaaditud andmed."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Impordi"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "vaikimisi"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-vood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Uudistevood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Kustuta"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Uus"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "U&RL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artiklid"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "A&utomaatne uuendamne"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Elus&hoidmise aega eiratakse"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Uuenda"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Pealkiri"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Artikleid hoitakse alles (päevades)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiivne"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtrid"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Nõustumine filtritega"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Keeldumine filtritest"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Regulaaravaldised"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Kohtlemine &sarjana"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Töötlemine"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Sarja kriteerium"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Episoodita sobivused"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maks. episood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maks. hooaeg"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Min. hooaeg"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Min. episood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Te&ksti tekstimine"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtri sobivus"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Ribalaiuse ajastaja"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Vasakklõpsu kategooria"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kate&gooria 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Väljas"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normaalne"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategooria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategooria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Paremklõpsu kategooria"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategooria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategooria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategooriad"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. kategooria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. kategooria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "allalaadimine:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "üleslaadimine:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. kategooria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 tähendab piirangu puudumist"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Salvesta faili"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "Laa&di failist"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Lähtesta ajastaja"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&OK"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Ajastamisplugina seadistustedialoog"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Ri&balaiuse ajastaja kasutamine"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Ribalaiuse ajastaja"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "&Värvide kasutamine piltide asemel"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Soovitatav aeglasematele masinatele)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Muuta a&jastamist"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Ribalaiuse ajastaja kasutamine"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Värvide kasutamine piltide asemel"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Vormindatud logi kasutamine"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Üldiste teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Ühendusteadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Tracker'i teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Ketta IO-teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IP filtri plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Otsimisplugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Osalise faili importimise plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Infoplugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnP plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Kataloogide uurimise plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Ajastamisplugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "RSS-plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Veebiliidese plugina teadete lipp"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Loginäitaja valikud"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Pluginad"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Kõik"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Silumine"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Märguanne"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Tähtis"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Puudub"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Otsing:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Kataloogi uurimine:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Ajastaja:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Osalise faili import:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Infoplugin:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-plugin:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Veebiliidese plugin:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Süsteem"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Üldine:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Ühendused:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Ketta IO:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "&Vormindatud teksti kasutamine logis"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Väline brauser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Otsin&gutulemused avatakse välises brauseris"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Vaikimisi brauseri kasutamine"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Kohandatud brauseri asukoht:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Otsingumootorid"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Otsingumootori nimi:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "Lis&a"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Mootorid"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Eemalda kõik"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Lisa vaikimisi"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Uuenda Internetist"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Otsing"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Otsingumootor:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Aktiivne otsingumootor"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Kohandatud brauseri kasutamine"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Kohandatud brauseri käivitatava faili asukoht"
-@@ -4100,7 +4100,7 @@ msgstr "Andmete kontroll"
- msgid "Stopped. No space left on device."
- msgstr "Peatatud. Kettal pole ruumi."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4108,12 +4108,12 @@ msgstr ""
- "Selle torrenti allalaadimiseks pole kettal piisavalt ruumi. Kas tõesti soovid "
- "jätkata?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "%1 jaoks napib kettaruumi"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4121,16 +4121,16 @@ msgstr ""
- "Torrent \"%1\" on jõudnud maksimaalse jagamissuhteni. Kas ignoreerida piirangut "
- "ja alustada sellele vaatamata levitamist?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Jõuti maksimaalse jagamissuhteni."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Viga torrenti %1 peatamisel: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Viga torrenti %1 käivitamisel: %2"
- 
-diff --git a/translations/fa/messages/ktorrent.po b/translations/fa/messages/ktorrent.po
-index f03da1d..1477a69 100644
---- a/translations/fa/messages/ktorrent.po
-+++ b/translations/fa/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-01-15 14:30+0330\n"
- "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
- "Language-Team: Persian <tde-i18n-fa@kde.org>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "اطلاعات"
-@@ -193,7 +193,7 @@ msgstr "نشانی وب بدشکل."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "بارگیریها"
-@@ -319,7 +319,7 @@ msgid "Document to open"
- msgstr "سند برای باز کردن"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr ""
-@@ -604,7 +604,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -647,7 +647,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, fuzzy, no-c-format
- msgid "Speed Limits"
- msgstr "حد سرعت بر حسب کیلوبایت/ثانیه"
-@@ -666,7 +666,7 @@ msgid "Malformed IP address."
- msgstr "نشانی وب بدشکل."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "تنظیمات"
-@@ -703,7 +703,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "گزینه‌های پویش پوشه"
-@@ -714,7 +714,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "وضعیت"
-@@ -736,7 +736,7 @@ msgstr "بارگذاری‌شده"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "سرعت پایین"
-@@ -861,7 +861,7 @@ msgid "User"
- msgstr "کاربر"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "مدیر صف"
-@@ -1069,8 +1069,8 @@ msgid "Start torrent"
- msgstr "آغاز &بذرافشانی torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "بارگیری"
-@@ -1124,13 +1124,13 @@ msgid "Encryption"
- msgstr "رمزبندی"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "استفاده از رمزبندی قرارداد"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1138,13 +1138,13 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "اجازه به اتصالهای رمزبندی‌نشده"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1153,7 +1153,7 @@ msgstr ""
- "پشتیبانی می‌کنند."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1164,169 +1164,169 @@ msgstr ""
- "مراجعه کنید."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&استفاده از DHT برای گرفتن جفتهای اضافی‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "درگاه UDP برای ارتباط DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP سفارشی‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "&ارسال یک IP یا نام میزبان سفارشی به ردیاب‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP یا نام میزبان سفارشی:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "پوشه‌ها"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "پوشه برای ذخیرۀ پرونده‌های موقت:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "عدم بارگیری"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "ذخیرۀ &خودکار بارگیریها در:‌"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "پرونده‌های torrent"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "میله ابزار بارگیری"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "آغاز &بذرافشانی torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "میزان بیشینۀ بارگذاری:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "میزان بیشینۀ بارگیری:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "کیلوبایت/ثانیه )۰ بدون حد است("
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "جفت"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "درگاه:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "پرونده‌های Torrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1334,187 +1334,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "جفتهای انتساب‌شده"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "بارگیریهای بیشینه:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "دانه‌های بیشینه:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, fuzzy, no-c-format
- msgid "Minimum disk space:"
- msgstr "اختصاص فضای دیسک"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "آغازنشده"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "آغازنشده"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr ")۰ بدون حد است("
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "میزان بیشینۀ بارگیری:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, fuzzy, no-c-format
- msgid "Global connection limit:"
- msgstr "حد اتصال سراسری"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "ضریب اشتراک:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "اتصالهای بیشینه در هر torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "تعداد شکافهای بارگذاری:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "درگاه ردیاب UDP:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "ضریب اشتراک:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "میزان بیشینۀ بارگذاری:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "کیلوبایت/ثانیه )۰ بدون حد است("
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr ")۰ بدون حد است("
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&حفظ بذرافشانی پس از اتمام بارگیری‌"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "توجه"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1524,283 +1524,283 @@ msgstr ""
- "کار را برای شما انجام دهد."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "محاورۀ صف KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "وضعیت:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "ردیاب:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "ضریب اشتراک:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "بایت باقی‌مانده:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "کنترل‌شده با"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&بارگذاریها‌"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "بارگذاری‌شده:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "&حرکت به بالا‌"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "حرکت به &پایین‌"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "&حرکت به بالا‌"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&QM کنترل شد"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&کاربر کنترل شد‌"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "چسباندن نشانی وب"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "نشانی وب:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&تأیید‌"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&لغو‌"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "ایجاد Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "پرونده یا پوشه‌ای که می‌خواهید یک torrent از آن ایجاد کنید:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "باید حداقل یک ردیاب اضافه کنید."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "گزینه‌های پرونده"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "اندازۀ هر توده:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "۳۲"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "۶۴"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "۱۲۸"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "۲۵۶"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "۵۱۲"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "۱۰۲۴"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "۲۰۴۸"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "۴۰۹۶"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "۸۱۹۲"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "کیلوبایت"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "آغاز &بذرافشانی torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "torrent خصوصی )DHT مجاز نیست("
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "توضیحات:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "&ایجاد‌"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&لغو‌"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "ردیابها"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "هیچ‌کدام"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "IP یا نام میزبان سفارشی:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "درگاه"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1808,19 +1808,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "تنظیمات جستجو"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1836,427 +1836,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "موتور جستجوی جاری"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "تنظیمات"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "کاربرد حافظه:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "کم"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "متوسط"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "زیاد"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "فاصلۀ به‌روزرسانی ونک:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "۵۰۰ میلی‌ثانیه‌"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "۱ ثانیه"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "۲ ثانیه"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "۵ ثانیه"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, fuzzy, no-c-format
- msgid "Data Checking"
- msgstr "بررسی داده"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "تعداد بیشینۀ اتصالها در هر torrent )۰ = بدون حد("
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "درگاه ردیاب UDP:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "دادۀ پویش"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, fuzzy, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "دادۀ پویش برای توده‌ها :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "تعداد توده‌های یافت‌شده :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "تعداد توده‌های خراب /  بارگیری‌نشده :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "۰"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "آزمون"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "تعداد بیشینۀ بارگیریها )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "تعداد بیشینۀ دانه‌ها )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "تعداد بیشینۀ اتصالها در هر torrent )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "تعداد بیشینۀ اتصالها برای همۀ torrentها )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "سرعت بارگذاری بیشینه بر حسب کیلوبایت/ثانیه )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "سرعت بارگیری بیشینه بر حسب کیلوبایت/ثانیه )۰ = بدون حد("
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "به حد ضریب اشتراک بیشینه رسید."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "به حد ضریب اشتراک بیشینه رسید."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "نمایش یک شمایل سینی سیستم"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "نمایش پیامهای بالاپر، هنگامی که torrent تمام می‌شود."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "حفظ بذرافشانی پس از اتمام بارگیری"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "پوشه برای ذخیرۀ پرونده‌های موقت"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr " آیا بارگیریها به طور خودکار در فهرست ذخیره، ذخیره شوند"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "پوشه برای ذخیرۀ پرونده‌های بارگیری‌شده"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr " آیا بارگیریها به طور خودکار در فهرست ذخیره، ذخیره شوند"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "پوشه برای ذخیرۀ پرونده‌های بارگیری‌شده"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr " آیا بارگیریها به طور خودکار در فهرست ذخیره، ذخیره شوند"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "پوشه برای ذخیرۀ پرونده‌های موقت"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr " آیا از یک IP سفارشی برای گذر به ردیاب استفاده شود"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP برای گذر به ردیاب"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "کاربرد حافظه"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "فاصلۀ به‌روزرسانی ونک"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "پشتیبان برای DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "درگاه DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "تعداد شکافهای بارگذاری"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2264,457 +2264,457 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "مدیر وصله"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "بار کردن"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&خالی کردن‌"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "بار کردن همه"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "خالی کردن همه"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "دستگاه UPnP پیش‌فرض مورد استفاده"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "دستگاههای آشکارشده:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "دستگاه"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "درگاههای پیش‌سوشده"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "اتصالها:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "پیش‌سو کردن درگاهها"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "واگرد پیش‌سوی درگاه"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "پویش مجدد"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "پویش پوشۀ ۱ فعال شود؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "پویش پوشۀ ۲ فعال شود؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "پویش پوشۀ ۳ فعال شود؟"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "مسیر پوشۀ ۱"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "مسیر پوشۀ ۲"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "مسیر پوشۀ ۳"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr " آیا torrent به صورت خاموش باز شود یا خیر."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "کنش حذف علامت خورد."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "کنش حرکت علامت خورد."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "تنظیمات پوشۀ پویش"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "پویش پوشۀ &۱‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "دگرساز+۱"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "پویش پوشۀ &۲‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "دگرساز+۲"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "پویش پوشۀ &۳‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "دگرساز+۳"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "حرکت به فهرست راهنمای »بارشده« &پس از بار کردن‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "حرکت torrent به فهرست راهنمای »بارشده« پس از بار کردن آن"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "باز کردن &خاموش torrentها‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "محاورۀ »برگزیدن پرونده‌ها برای بارگیری« را نمایش نده"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "حذف پس از &بار کردن‌"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "پس از بار کردن، torrent را حذف می‌کند"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "پوشه‌ها برای پویش"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "پوشۀ ۱:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "پوشۀ ۲:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "پوشۀ ۳:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "تنظیمات جستجو"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "پیش‌سو کردن درگاهها"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "برگزیدن &هیچ‌کدام‌"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "کاربر"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "پیش‌سو کردن درگاهها"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "توده‌ها"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "کل:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "بارگیری جاری:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "بارگیری‌شده:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "مستثنی:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "اندازه:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "توده"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "پیشرفت"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "جفت"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "جفتهای انتساب‌شده"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "بذرافشانها:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "سرعت متوسط پایین:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "سرعت متوسط بالا:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "به‌روزرسانی بعدی در:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "وضعیت ردیاب:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "اجزائی از torrent که بارگیری شده است:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "اجزائی از torrent که موجود است:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "اشتراک"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2722,146 +2722,146 @@ msgstr ""
- "بارگذاری شما زمانی می‌ایستد که ضریب اشتراک به این مقدار برسد. صفر یعنی بدون حد."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, fuzzy, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "بارگذاری شما زمانی می‌ایستد که ضریب اشتراک به این مقدار برسد. صفر یعنی بدون حد."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "حد اتصال سراسری"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "حد فقط در حالت دانه کار می‌کند"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "از حد &استفاده شود؟‌"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "&به‌روزرسانی ردیاب‌"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "فاصلۀ بیشینۀ به‌روزرسانی - ۶۰ ثانیه"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "افزودن &ردیاب‌"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "حذف ردیاب"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&تغییر ردیاب‌"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr "بازگردانی پیش‌فرضها"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "نمایش تب نمای جفت در پنجرۀ اصلی"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "نمایش تب نمای بارگیری توده در پنجرۀ اصلی"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "نمایش تب نمای ردیابها در پنجرۀ اصلی"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "نمایش فهرست جفتها"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "نمایش فهرست توده‌هایی که &در حال حاضر بارگیری می‌شوند‌"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "نمایش فهرست ردیابها"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "تنظیمات IPBlocking"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "از پالایۀ KTorrent استفاده شود؟"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "پروندۀ پالایۀ IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&بارگیری/تبدیل‌"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2869,25 +2869,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "نشانی وب پالایۀ سطح ۱"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "از پالایۀ سطح ۱ استفاده شود؟"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr " تبدیل..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2899,61 +2899,61 @@ msgstr ""
- "طول می‌کشید."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "فاصلۀ به‌روزرسانی ونک"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "دانه‌های بیشینه:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "دانه‌های بیشینه:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2962,163 +2962,163 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "جفتها"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "جفت"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "اتصالها:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "نمایش شمایل سینی &سیستم‌"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "بارگذاریها"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "اتصالها:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "جفتها"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Torrent بارگیری"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "پرچم پیامهای اتصالها"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "واردات یک بارگیری موجود"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "داده:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3126,684 +3126,684 @@ msgstr ""
- "لطفاً، torrent و داده‌ای که از قبل برای آن torrent بارگیری شده را مشخص کنید."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&واردات‌"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "افزودن &پیش‌فرض‌"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "بذرافشانها:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "نشانی وب"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "پالایۀ IP:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "همۀ پرونده‌ها"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "پیشرفت"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "ضریب بیشینه:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, fuzzy, no-c-format
- msgid "Te&st"
- msgstr "آزمون"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "مسیر پوشۀ ۱"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "زمان‌بند پهنای باند"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "فشار چپ دسته"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "&دستۀ ۱"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&خاموش‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&عادی‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "دستۀ &۳‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "دستۀ &۲‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "فشار راست دسته"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "دستۀ &۱‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&دستۀ ۳‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "دسته‌ها"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>۱. دسته</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>۳. دسته</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "بارگیری:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "بارگذاری:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "کیلوبایت/ثانیه *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>۲. دسته</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* صفر یعنی بدون حد"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "ذخیره در پرونده"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&بار کردن از پرونده‌"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "بازنشانی زمان‌بندی"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&تأیید‌"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "صفحۀ تنظیم وصلۀ زمان‌بند"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "از زمان‌بند &پهنای باند استفاده شود؟"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "زمان‌بند پهنای باند"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "به جای &نگاشتهای تصویردانه‌ای، از رنگها استفاده شود؟‌"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ")توصیه‌شده برای سیستمهای کندتر("
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "ویرایش &زمان‌بندی‌"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "زمان‌بند پهنای باند فعال شود؟"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "به جای نگاشتهای تصویردانه‌ای، از رنگها استفاده شود؟‌"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "استفاده از متن ثبت غنی"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "پرچم پیامهای اطلاعات عمومی"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "پرچم پیامهای اتصالها"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "پرچم پیامهای DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "پرچم پیامهای اطلاعات ردیاب"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "پرچم پیامهای اطلاعات IO دیسک"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ جستجو"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ ScanFolder"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ زمان‌بند"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ جستجو"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "پرچم پیامهای وصلۀ IPFilter"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "گزینه‌های LogViewer"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "وصله‌ها"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "همه"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "اشکال‌زدایی"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "اخطار"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "مهم"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "هیچ‌کدام"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "پالایۀ IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "جستجو:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "پویش پوشه:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "زمان‌بند:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "عنصر اطلاعات:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "سیستم"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "عمومی:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "اتصالها:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "دیسک ورودی/خروجی:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "استفاده از &متن غنی برای ثبت‌"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, fuzzy, no-c-format
- msgid "Use default browser"
- msgstr "بازگردانی پیش‌فرضها"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "موتورهای جستجو"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "نام موتور جستجو:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&افزودن‌"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "موتورها"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "نشانی وب"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&حذف همه‌"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "افزودن &پیش‌فرض‌"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "به‌روزرسانی از اینترنت"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "جستجو"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "موتور جستجو:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "موتور جستجوی جاری"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4091,18 +4091,18 @@ msgstr "بررسی داده"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy, c-format
- msgid "Insufficient disk space for %1"
- msgstr "اختصاص فضای دیسک"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4110,16 +4110,16 @@ msgstr ""
- "Torrent »%1« به ضریب اشتراک بیشینۀ خود رسیده است. در هر صورت از حد چشم‌پوشی "
- "کرده و بذرافشانی را آغاز می‌کنید؟"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "به حد ضریب اشتراک بیشینه رسید."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "خطای ایست torrent %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "خطای آغاز torrent %1 : %2"
- 
-diff --git a/translations/fr/messages/ktorrent.po b/translations/fr/messages/ktorrent.po
-index 0cde854..475ac2f 100644
---- a/translations/fr/messages/ktorrent.po
-+++ b/translations/fr/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2005-08-12 11:06+0100\n"
- "Last-Translator: Matthieu Robin <kde@macolu.org>\n"
- "Language-Team:  <kde-francophone@kde.org>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -195,7 +195,7 @@ msgstr ""
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Téléchargements"
-@@ -315,7 +315,7 @@ msgid "Document to open"
- msgstr "Document à ouvrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -601,7 +601,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -644,7 +644,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -662,7 +662,7 @@ msgid "Malformed IP address."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Préférences"
-@@ -696,7 +696,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Options du fichier"
-@@ -707,7 +707,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "État"
-@@ -729,7 +729,7 @@ msgstr "Envoyé"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Vitesse de réception"
-@@ -853,7 +853,7 @@ msgid "User"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr ""
-@@ -1049,8 +1049,8 @@ msgid "Start torrent"
- msgstr "Démarrer le parta&ge du torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Télécharger"
-@@ -1104,13 +1104,13 @@ msgid "Encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1118,20 +1118,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1139,169 +1139,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Dossier où placer les fichiers temporaires :"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Télécharger"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Enregistrer &automatiquement les téléchargements vers :"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Fichiers Torrent (« *.torrent »)"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barre d'outils de téléchargement"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Démarrer le parta&ge du torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Vitesse maximale d'envoi :"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Taux de téléchargement maximal :"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "ko/s (0 pour illimité)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Client"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port :"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Fichiers Torrent (« *.torrent »)"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1309,187 +1309,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "Clients connectés"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Nombre maximum de téléchargements :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, fuzzy, no-c-format
- msgid "Maximum seeds:"
- msgstr "Nombre maximum de téléchargements :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "Non démarré"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Non démarré"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 pour illimité)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Taux de téléchargement maximal :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Nombre maximum de téléchargements :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, fuzzy, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Nombre maximum de connexions par téléchargements :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, fuzzy, no-c-format
- msgid "UDP tracker port:"
- msgstr "Requête vers le pisteur en cours"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Vitesse maximale d'envoi :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "ko/s (0 pour illimité)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(0 pour illimité)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Garder en partage une fois le téléchargement terminé"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1497,283 +1497,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, fuzzy, no-c-format
- msgid "Status:"
- msgstr "État"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "Pisteurs"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, fuzzy, no-c-format
- msgid "Torrent"
- msgstr "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Envoyé"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Envoyé"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, fuzzy, no-c-format
- msgid "C&ancel"
- msgstr "An&nuler"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Créer un torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, fuzzy, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Le fichier ou le dossier sur lequel créer un torrent :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Vous devez ajouter au moins un pisteur."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Options du fichier"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Taille de chaque morceau :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "ko"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Démarrer le parta&ge du torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Commentaires :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Cré&er"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "An&nuler"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Pisteurs"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Nom :"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1781,19 +1781,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Préférences"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1809,427 +1809,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Moteur de recherche actuel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Préférences"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Nombre maximum de connexions par téléchargement (0 pour illimité)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Requête vers le pisteur en cours"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, fuzzy, no-c-format
- msgid "Number of chunks found :"
- msgstr "Nombre total de morceaux :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr ""
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Nombre maximum de téléchargements (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, fuzzy, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Nombre maximum de téléchargements (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, fuzzy, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Nombre maximum de connexions par téléchargement (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, fuzzy, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Nombre maximum de connexions par téléchargement (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Vitesse d'envoi maximale en ko/s (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, fuzzy, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Vitesse maximale de téléchargement en ko/s (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Nombre maximum de téléchargements (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Nombre maximum de téléchargements (0 pour illimité)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Afficher dans la boîte à miniatures"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Laisser en partage une fois le téléchargement terminé"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Dossier où placer les fichiers temporaires"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Enregistrer &automatiquement les téléchargements vers :"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, fuzzy, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Dossier où placer les fichiers téléchargés"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Enregistrer &automatiquement les téléchargements vers :"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Dossier où placer les fichiers téléchargés"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Enregistrer &automatiquement les téléchargements vers :"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Dossier où placer les fichiers temporaires"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2237,602 +2237,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "Télécharger"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Télécharger"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, fuzzy, no-c-format
- msgid "Ports Forwarded"
- msgstr "Téléchargé"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Impossible d'ouvrir le fichier « %1 » : %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Préférences"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Fichiers Torrent (« *.torrent »)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "Préférences"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, fuzzy, no-c-format
- msgid "Chunks"
- msgstr "Morceau&x"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "Morceaux en cours de téléchargement :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, fuzzy, no-c-format
- msgid "Downloaded:"
- msgstr "Téléchargé"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, fuzzy, no-c-format
- msgid "Excluded:"
- msgstr "Morceaux téléchargés :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, fuzzy, no-c-format
- msgid "Size:"
- msgstr "Taille"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Morceau"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Progression"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Client"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Clients connectés"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, fuzzy, no-c-format
- msgid "Seeders:"
- msgstr "Clients"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "Vitesse de réception"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "Vitesse d'envoi"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Pisteurs"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Parties du fichier qui ont été téléchargées :"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Parties du fichier qui ont été téléchargées :"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Pisteurs"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Pisteurs"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Pisteurs"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Pisteurs"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, fuzzy, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Morceaux en cours de téléchargement :"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Préférences"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Fichiers Torrent (« *.torrent »)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Fichiers Torrent (« *.torrent »)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Télécharger le torrent"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2840,25 +2840,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, fuzzy, no-c-format
- msgid "Converting..."
- msgstr "Création de %1..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2867,61 +2867,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Nombre maximum de téléchargements :"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Nombre maximum de téléchargements :"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2930,847 +2930,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "Clients"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Client"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Afficher dans la &boîte à miniatures"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Envoyé"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Clients"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Télécharger le torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "KTorrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Clients"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Préférences"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Progression"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Télécharger"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "Envoyé"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "(0 pour illimité)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, fuzzy, no-c-format
- msgid "Debug"
- msgstr "Mode de débogage"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Préférences"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "Chercher"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "Clients"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "Options du fichier"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "Moteur de recherche :"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "Moteur de recherche :"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Chercher"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Moteur de recherche :"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Moteur de recherche actuel"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4071,34 +4071,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "Impossible d'ouvrir le fichier « %1 » : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "Impossible d'ouvrir le fichier « %1 » : %2"
-diff --git a/translations/gl/messages/ktorrent.po b/translations/gl/messages/ktorrent.po
-index 37f784f..bc50afa 100644
---- a/translations/gl/messages/ktorrent.po
-+++ b/translations/gl/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-09-02 12:55+0200\n"
- "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
- "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
-@@ -18,7 +18,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informazón"
-@@ -191,7 +191,7 @@ msgstr "URL Non válido."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Recepzóns"
-@@ -317,7 +317,7 @@ msgid "Document to open"
- msgstr "O documento a abrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -604,7 +604,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -648,7 +648,7 @@ msgid "Add to Group"
- msgstr "Engadir ao Grupo"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, fuzzy, no-c-format
- msgid "Speed Limits"
- msgstr "Limite de velocidade en KB/s"
-@@ -667,7 +667,7 @@ msgid "Malformed IP address."
- msgstr "Enderezo IP do parceiro"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferéncias"
-@@ -704,7 +704,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Opzóns da Pesquisa en Cartafoles"
-@@ -715,7 +715,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Estado"
-@@ -737,7 +737,7 @@ msgstr "Enviado"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Veloc. Recepzón"
-@@ -872,7 +872,7 @@ msgid "User"
- msgstr "Usuário"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Xestor da Cola"
-@@ -1095,8 +1095,8 @@ msgid "Start torrent"
- msgstr "Comezar a comparti&r o torrente"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Obter"
-@@ -1150,13 +1150,13 @@ msgid "Encryption"
- msgstr "Cifraxe"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usar a cifraxe do protocolo"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1164,13 +1164,13 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permitir conexóns non-cifradas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1179,7 +1179,7 @@ msgstr ""
- "a cifraxe."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1191,169 +1191,169 @@ msgstr ""
- "manual para máis informazóns."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usar DHT para obter mais parceiros"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Porto de UDP para a comunicazón do DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP Personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Enviar ao localizador un IP o&u nome de máquina personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP ou nome de máquina personalizado:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Cartafoles"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Cartafol onde guardar os ficheiros temporáis:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Non obté-los"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Guardar &automaticamente os ficheiros obtidos en:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "torrentes"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra de Transferéncias"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Comezar a comparti&r o torrente"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Taxa máxima de envio:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Taxa máxima de obtenzón:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Parceiro"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porto:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Lista Negra de KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1363,55 +1363,55 @@ msgstr ""
- "guardar as entradas ou use a extensión de Filtro de IPs (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Parceiros Rexeitados"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Enderezo IP do parceiro"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Engadir parceiro:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Engade un parceiro á lista-negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Borra o parceiro actual da lista-negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Limpar"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Valeira esta lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Guardar &Como..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
-@@ -1419,133 +1419,133 @@ msgstr ""
- "KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Máximo de transferéncias:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Máximo de fontes:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, fuzzy, no-c-format
- msgid "Minimum disk space:"
- msgstr "A reservar o espazo en disco"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "Non iniciado"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Non iniciado"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Taxa máxima de obtenzón:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, fuzzy, no-c-format
- msgid "Global connection limit:"
- msgstr "Limite global de conexóns"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Taxa de compartizón:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Máximo de conexóns por torrente:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Número de envios concomitantes:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Porto UDP do localizador:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Taxa de compartizón:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Taxa máxima de envio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Continuar a compartir após completar a recepzón"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Aviso"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1555,283 +1555,283 @@ msgstr ""
- "extensión de UPnP poderá facer iso por si."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Diálogo da Cola de KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Estado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Localizador:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Taxa de compartizón:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Bytes restantes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrente"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlada por"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Envio&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Enviado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "S&ubir"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "&Baixar"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "S&ubir"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controlado por &QM"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controlado polo &Usuário"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Apegar o URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Criar Torrente"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "O ficheiro ou cartafol do cal desexa criar un torrente:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Debe engadir polo menos un localizador."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opzóns do Ficheiro"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Tamaño de cada anaco:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Comezar a comparti&r o torrente"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrente privado (non se permite o DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comentários:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Cri&ar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Localizadores"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Nada"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "IP ou nome de máquina personalizado:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porto"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1839,19 +1839,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferéncias de Procura"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1867,331 +1867,331 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Motor de procuras actual"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Preferéncias"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Utilizazón da memória:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Baixa"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Média"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Intervalo de actualizazón da interface:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, fuzzy, no-c-format
- msgid "Data Checking"
- msgstr "A verificar os dados"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Número máximo de conexóns por torrente (0 = sen limite)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Porto UDP do localizador:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "A analisar os dados"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, fuzzy, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "A analisar á procura de anacos :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Número de anacos achados:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Número de anacos fallados / non obtidos :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Verificar"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Número máximo de transferéncias (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Número máximo de fontes (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Número máximo de conexóns por torrente (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Número máximo de conexóns para todos os torrentes (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de envio en KB/s (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de recepzón en KB/s (0 = sen limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "A taxa máxima de compartizón foi atinxida."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "A taxa máxima de compartizón foi atinxida."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostrar un ícone na bandexa do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostra mensaxes ao rematar os torrentes."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Continuar a compartir após completar a obtenzón"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Cartafol onde guardar os ficheiros temporais"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
-@@ -2199,13 +2199,13 @@ msgstr ""
- "guardado"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Cartafol onde guardar os ficheiros obtidos"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2213,13 +2213,13 @@ msgstr ""
- "guardado"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Cartafol onde guardar os ficheiros obtidos"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
-@@ -2227,73 +2227,73 @@ msgstr ""
- "guardado"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Cartafol onde guardar os ficheiros temporais"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Indica se debe usar un IP personalizado a pasar ao localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP a pasar ao localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Utilizazón da memória"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Intervalo de actualizazón da interface"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Soporte para DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Porto do DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Número de envios concomitantes"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2301,457 +2301,457 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Xestor de extensións"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Carregar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "De&scarregar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Carregar Todos"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Descarregar Todos"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositivo UPnP a usar por omisión"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositivos detectados:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositivo"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Portos Re-encamiñados"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "Conexóns:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Re-encamiñar os Portos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Desfacer o re-encamiñamento de Portos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Pesquisar de Novo"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Activar a pesquisa do cartafol1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Activar a pesquisa do cartafol2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Activar a pesquisa do cartafol3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Rota ao cartafol 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Rota ao cartafol 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Rota ao cartafol 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Indica se se debe abrir o torrente de forma silenciosa ou non."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Foi sinalada a aczón de borrado."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Foi sinalada a aczón de mover."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferéncias do Exame de Cartafoles"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Examinar o cartafol &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Examinar o cartafol &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Examinar o cartafol &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Mover para o cartafol \"carregado\" &após carregar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Move o torrente para o cartafol \"carregado\" após te-la carregado"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Abrir silenc&iosamente os torrentes"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Non mostra o diálogo \"Escoller os ficheiros a obter\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Borrar após carre&gar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Borra o torrente após carregá-la"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Cartafoles a examinar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Cartafol 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Cartafol 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Cartafol 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferéncias de Procura"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "Re-encamiñar os Portos"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Escoller &Nada"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "Usuário"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "Re-encamiñar os Portos"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Opzóns Xerais"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Anacos"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "A receber:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Obtido:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Excluido:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Tamaño:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Anaco"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Evoluzón"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Parceiro"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Parceiros Asinados"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Parceiros Completos:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Parceiros Incompletos:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocidade Media de Recepzón:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocidade Media de Envio:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Próxima actualizazón en:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Estado do Localizador:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Partes do torrente que foron obtidas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Partes do torrente que están disponíbeis:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "A compartir"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2760,7 +2760,7 @@ msgstr ""
- "limites."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, fuzzy, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2768,139 +2768,139 @@ msgstr ""
- "limites."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "Limite global de conexóns"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "O limite só funciona no modo de fonte"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "&Usar límite?"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "&Actualizar o localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Intervalo mínimo de actualizazón - 60 segundos"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Engadi&r un localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Borrar o Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Cam&biar de Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Repor as predefinizóns"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostrar páxina de parceiros na fiestra principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Mostrar páxina de anacos obtidos na fiestra principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Mostrar a páxina de localizadores na fiestra principal"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostrar lista de parceiros"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostrar a l&ista de anacos a transferir actualmente"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostrar lista de localizadores"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferéncias do Bloqueo de IPs"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Escoller ficheiro de filtro de PeerGuardian"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Usar filtro PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Ficheiro de filtro de IPs:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Obter/Co&nverter"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2910,25 +2910,25 @@ msgstr ""
- "NOTA: Supon-se que se obterá un ficheiro zip de bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL de filtro de Nível 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Usar filtro de nível 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "A converter..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2940,61 +2940,61 @@ msgstr ""
- "tempo non poderá usar KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Intervalo de actualizazón da interface"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Máximo de fontes:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Máximo de fontes:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -3003,847 +3003,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "Parceiros"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Parceiro"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "Conexóns:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostrar o ícone na bande&xa do sistema"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Envios"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "Conexóns:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Parceiros"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Transferir Torrente"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "Sinal de mensaxes de conexóns"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importa unha transferéncia existente"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrente:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dados:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Indique o torrente e os dados xa transferidos para esa torrente."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importar"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "Engadir Prede&finizón"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Parceiros Completos:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Filtro de IP"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Todos os Ficheiros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Evoluzón"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Proporzón máxima:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, fuzzy, no-c-format
- msgid "Te&st"
- msgstr "Verificar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Rota ao cartafol 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Planificador do ancho de banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoria do botón esquerdo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Categor&ia 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Apagar"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoria do botón direito"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categorias"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "obtenzón:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "envio:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "*cero significa ilimitado"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Guardar nun ficheiro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Ler dun ficheiro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Reiniciar a planificazón"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Páxina de Preferéncias da Extensión de Planificazón"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Usar o planificador do ancho de &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Planificazón do Ancho de Banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Usar cores en ve&z de imaxes?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Recomendado para os sistemas máis lentos)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Editar a &planificazón"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Activar a planificazón do ancho de banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Usar cores en vez de imaxes?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usar texto formatado no rexisto"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Sinal de mensaxes de informazón xeral"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Sinal de mensaxes de conexóns"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Sinal de mensaxes DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Sinal de mensaxes de informazón do localizador"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Sinal de mensaxes de informazón da E/S do disco"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de pesquisa"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Sinal das mensaxes da extensión PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Sinal das mensaxes da extensión InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de Pesquisa de Cartafoles"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de Planificazón"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de pesquisa"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Sinal das mensaxes da extensión de IPFilter"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opzóns do Visor do Rexisto"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Extensións"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Todo"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Depurazón"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Aviso"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Importante"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nada"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtro de IPs:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Procurar:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Pesquisa de cartafoles:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planificador:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Opzóns Xerais"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Xeral:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Conexóns:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "E/S Disco:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usar te&xto formatado no rexisto"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "Grupos Personalizados"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Infra-estruturas de procura"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nome do motor de procuras:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Engadir"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motores"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "B&orrar todo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Engadir Prede&finizón"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "Actualizar de Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Procurar"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motor de pesquisas:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Motor de procuras actual"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4134,7 +4134,7 @@ msgstr "A verificar os dados"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
-@@ -4143,12 +4143,12 @@ msgstr ""
- "Se desmarca un ficheiro, perderá todos os dados dese ficheiro. Está seguro de "
- "que quer facer isto?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy, c-format
- msgid "Insufficient disk space for %1"
- msgstr "A reservar o espazo en disco"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4156,16 +4156,16 @@ msgstr ""
- "O torrente \"%1\" atinxiu a taxa máxima de compartizón. Desexa ignorar o limite "
- "e comezar a espallar ainda asi?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "A taxa máxima de compartizón foi atinxida."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Erro ao parar o torrente %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Erro ao iniciar o torrente %1 : %2"
- 
-diff --git a/translations/hu/messages/ktorrent.po b/translations/hu/messages/ktorrent.po
-index 1be3476..a5b5c66 100644
---- a/translations/hu/messages/ktorrent.po
-+++ b/translations/hu/messages/ktorrent.po
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: KTorrent \n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-01-06 17:30+0100\n"
- "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
- "Language-Team: Hungarian <hu@li.org>\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nincs bejövő kapcsolat (lehet, hogy egy tűzfal miatt)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Információ"
-@@ -191,7 +191,7 @@ msgstr "Hibás formátumú URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Letöltések"
-@@ -314,7 +314,7 @@ msgid "Document to open"
- msgstr "Megnyitandó dokumentum"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -580,7 +580,7 @@ msgstr "Torrent partnerforrások:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -622,7 +622,7 @@ msgid "Add to Group"
- msgstr "Hozzáadás a csoporthoz"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Sebességkorlátok"
-@@ -640,7 +640,7 @@ msgid "Malformed IP address."
- msgstr "Hibásan megadott IP-cím."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Beállítások"
-@@ -676,7 +676,7 @@ msgid "Advanced"
- msgstr "Speciális"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Speciális beállítások"
-@@ -687,7 +687,7 @@ msgstr "Látható oszlopok"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Állapot"
-@@ -709,7 +709,7 @@ msgstr "Feltöltve"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Sebesség le"
-@@ -830,7 +830,7 @@ msgid "User"
- msgstr "Egyedi"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Sorkezelő"
-@@ -1049,8 +1049,8 @@ msgid "Start torrent"
- msgstr "Indítás"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Letöltés"
-@@ -1104,13 +1104,13 @@ msgid "Encryption"
- msgstr "Titkosítás"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Titkosítás engedélyezése"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1120,13 +1120,13 @@ msgstr ""
- "a bittorrent kapcsolatokat."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Nem titkosított kapcsolatok engedélyezése"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1135,7 +1135,7 @@ msgstr ""
- "kapcsolódni."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1146,169 +1146,169 @@ msgstr ""
- "található."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "Partnerkeresés &DHT-vel is"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "A DHT-kommunikáció UDP-portja:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Egyéni IP-cím"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "A követőnek egyéni IP-cím vagy gépnév kül&dése"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Egyéni IP-cím vagy gépnév:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Rendszertálca-ikon"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Ikon megjelenítése a paneltál&cán"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Sebesség &megjelenítése a tálcán"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Felbukkanó üzenetek megjelenítése a rendszertálcán"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Feltöltési sebesség (KB/mp):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Letöltési sebesség (KB/mp):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Könyvtárak"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Az ideiglenes fájlok könyvtára:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "A befejezett letöltések átmozgatása ide:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "A letöltések &automatikus mentése ide:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "A torrentfájlok másolása ide:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Letöltési eszköztár"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "A torrent sebességkorlátozásainak beállítása"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximális feltöltési sebesség:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maximális letöltési sebesség:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/mp (0 esetén nincs korlát)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Lehetséges partner hozzáadása"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Partner IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Adja meg a partner IP-címét és portszámát."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent feketelista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1319,187 +1319,187 @@ msgstr ""
- "szűrő bővítményt (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Tiltott partnerek"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Tiltott partnerek IP-címei"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Cím hozzáadása:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Partner hozzáadása a feketelistához"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Eltávolítja a kijelölt partnert a feketelistáról"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Tö&rlés"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Lista törlése"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Mentés má&sként..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Ezen feketelista mentése a KTorrent IP szűrő bővítménye számára"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "A letöltések max. száma:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "A feltöltések max. száma:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Ha letöltés indításakor kevés a hely:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimális lemezterület:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Ne induljon el"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Kérjen megerősítést"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Induljon el"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 esetén nincs korlát)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximális letöltési sebesség:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Engedélyezett kapcsolatok összesen:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maximális megosztási idő:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "A kapcsolatok max. száma egy torrentnél:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Feltöltő pontok száma:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "A követő UDP-portja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maximális megosztási arány:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximális feltöltési sebesség:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/mp (0 esetén nincs korlát)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Óra (0 esetén nincs korlát)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "A megosztás &folytatása a letöltés befejeződése után"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Figyelem"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1509,283 +1509,283 @@ msgstr ""
- "bővítmény segítségével ez elvégezhető."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Sorkezelő párbeszédablak"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Állapot:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Követő:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Arány:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Hátravan (bájt):"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Vezérlő"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Feltöltések"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Feltöltve:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "&Mozgatás felfelé"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "M&ozgatás lefelé"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Mozgatás legfelülre"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Mozgatás leg&alulra"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&Sorkezelővel vezérelt"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Egyedi vezérlésű"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL beillesztése"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Mégsem"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent létrehozása"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Torrent létrehozása fájlból vagy könyvtárból:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Legalább egy követőt vagy csomópontot meg kell adnia."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Fájlbeállítások"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Darabméret:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Me&gosztás"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "El&osztott torrent (csak DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privát torrent (DHT letiltva)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Megjegyzés:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Létrehozás"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Mégsem"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Követők"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT csomópontok"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Csomópont:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP-cím vagy gépnév"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1796,19 +1796,19 @@ msgstr ""
- "szeretné mások számára a torrent elérését."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Speciális beállítások"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1835,427 +1835,427 @@ msgstr ""
- "<b>Mozgó átlag algoritmus:</b> X minta alapján számított mozgó átlagsebesség"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Aktuális sebesség"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Globális átlagsebesség"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "X ablak"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Mozgó átlag"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(újraindítás után lép életbe)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "&Lemezterület előzetes lefoglalásának letiltása"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Lemezterület teljes &előzetes lefoglalása (a töredezés elkerüléséhez)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Egyszerű (lassú)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "A fájlrendszer típusától függően"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Teljesítmény"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Memóriahasználat:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "kicsi"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "közepes"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "nagy"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "A felület frissítési időköze:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Gyors CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Lassú CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Adatellenőrzés"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Feltöltéskor &ne ellenőrizze az ennél nagyobb fájldarabokat"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Adat&integritási ellenőrzés"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "sérült fájldarab után"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Hálózatkezelés"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "A kapcsolatbeállítások max. száma:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP az IP-csomagokhoz:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Ne használja a KDE pro&xybeállításait HTTP követők eléréséhez"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP követő proxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Adatellenőrzés"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "A torrentadatok ellenőrzése:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "A megtalált fájldarabok száma:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Hibás vagy nem letöltött fájldarabok:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Próba"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "A letöltések max. száma (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "A feltöltések max. száma (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Letöltések elkezdése, ha kevés a hely?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "A kapcsolatok max. száma egy torrentnél (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "A kapcsolatok max. száma összesen (0 esetén nincs korlát) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximális feltöltési sebesség, KB/mp (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximális letöltési sebesség KB/mp-ben (0 = nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximális megosztási arány (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "A megosztás maximális ideje órában (0 esetén nincs korlát)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Ikon megjelenítése a paneltálcán"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Sebesség megjelenítése a tálcaikonban"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Letöltési sebesség (kb/mp):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Felöltési sebesség (kb/mp):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Értesítő üzenet megjelenítése torrent befejeződésekor."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "A megosztás folytatása a letöltés befejeződése után"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Az ideiglenes fájlok könyvtára"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "A letöltések automatikus mentése ide"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "A letöltött fájlok könyvtára"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "A befejezett letöltések áthelyezendők-e a completedDir könyvtárba"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "A letöltött fájlok áthelyezése ebbe a mappába"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "A torrentfájlok automatikusan másolandók-e a torrentCopyDir mappába"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "A torrentfájlok másolása ebbe a mappába"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Egyéni IP-cím küldése a követőnek"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Az utolsó mentési könyvtár"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "A követőnek jelzett IP-cím"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Memóriahasználat"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "felületfrissítési ciklus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "DHT-támogatás"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT-port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Feltöltési helyek száma"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Oszlopok megjelenítése KTorrentView-ban"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Időbecslési algoritmus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2265,457 +2265,457 @@ msgstr ""
- "kisebb, mint a minDiskSpace, akkor a torrent leállításra kerül."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Bővítménykezelő"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Elindítás"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Leállítás"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Mindegyik &elindítása"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Mindegyik &leállítása"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Használni kívánt alapértelmezett UPnP eszköz"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Felismert eszközök:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Eszköz"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Átirányított portok"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-kapcsolat"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "&Port átirányítása"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Portátirányítás visszavonása"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Újrakeresés"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Az 1. könyvtár ellenőrzése"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "A 2. könyvtár ellenőrzése"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "A 3. könyvtár ellenőrzése"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "1. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "2. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "3. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "A torrent megnyitása néma módban történjen-e."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Törlési művelet bejelölve."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Mozgatási művelet bejelölve."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "A bővítmény beállítása"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "&1. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "&2. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "&3. könyvtár"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Áthelyezés a \"betöltve\" könyv&tárba betöltés után"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "A torrent áthelyezése a \"betöltve\" könyvtárba betöltés után"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "A torrentek megnyitása néma mó&dban történjen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Ne jelenjen meg 'A letöltendő fájlok kiválasztása' ablak"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Törlés betöltés &után"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "A torrentek törlése betöltés után"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Átnézendő könyvtárak"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "1. könyvtár:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "2. könyvtár:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "3. könyvtár:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Keresési beállítások"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Webkiszolgáló"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Port átirányítása"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Munkamenet TTL (mp):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Felületstílus:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Felhasználónév:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Jelszó megváltoztatása..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "PHP programfájl útvonala:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portszám"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Port átirányítása"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Munkamenet élettartama"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "felület"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "PHP végrehajtható fájl útvonala"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "felhasználónév"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "jelszó"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Fájldarabok"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Összesen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Jelenlegi letöltés:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Letöltve:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Kizárva:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Hátravan:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Méret:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Darab"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Előrehaladás"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Partner"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Hozzárendelt partnerek"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Feltöltők:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Letöltők:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Átlagos letöltési sebesség:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Átlagos feltöltési sebesség:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Következő frissítés:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "A követő állapota:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Letöltött fájldarabok:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Elérhető fájldarabok:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Megosztva"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2724,145 +2724,145 @@ msgstr ""
- "nincs korlátozás."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "A feltöltés leáll ennyi órán át történő feltöltés után."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "óra"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Aránykorlát:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "A korlátozás csak feltöltő módban működik"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "I&dőkorlát:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Követő frissítése"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimális frissítési időköz - 60 másodperc"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "&Követő hozzáadása"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Követő eltávolítása"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Követő &módosítása"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Alapértelmezések visszaállítása"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Partnerek lap létrehozása a főablakban"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Darabok lap létrehozása a főablakban"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Követők lap létrehozása a főablakban"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Partnerlista megjelenítése"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "A letöltés alatt álló fájl&darabok megjelenítése"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Követőlista megjelenítése"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP-szűrési beállítások"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Válasszon PeerGuardian szűrőfájlt "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardian szűrőt használata"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Szűrőfájl:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Letöltés/Ko&nvertálás"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2872,25 +2872,25 @@ msgstr ""
- "MEGJEGYZÉS: A bluetack.co.uk helyről származó ZIP fájl támogatott."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Level1 szűrő URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Level1 szűrő használata?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konvertálás..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2902,61 +2902,61 @@ msgstr ""
- "használható."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Frissítés"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Grafikonok frissítése minden"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "GUI frissítés"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Adatok gyűjtése minden"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "ezredmásodpercben"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maximum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Méretezési mód a maximális sebességnél:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Pontos"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Segítségért használja a \"Mi ez?\" menüpontot"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2968,164 +2968,164 @@ msgstr ""
- "- Pontos: A grafikonon látható legnagyobb elért sebesség"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Partnerek sebessége"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Partnerek sebessége:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "frissítés minden"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "grafikonadat-frissítés"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Sok partner adatainak összegyűjtése processzorigényes lehet."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Partnerek kapcsolatai"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- "A nagy értékek olvashatatlanná tehetik a csatlakozott partnerek grafikonjait"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Források megjelenítése a rajokban"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Letöltők megjelenítése a rajokban"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Skálázási egység"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Feltöltés"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Kapcsolatok"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Partnerek"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Partnerek sebességgrafikonjának átváltása"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "A partnerek sebességéről történő adatkérések közti idő"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "A letöltők a rajokban történő rajzolásának átváltása"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "A források a rajokban történő rajzolásának átváltása"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "A letöltés mérőszámai"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Partnerek sebességének mérőszámai"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Feltöltés mérőszámai"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Kapcsolatok mérőszámai"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "DHT mérőszámai"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "OY tengely maximális mód"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Korábbi letöltés importálása"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrentfájl:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Adatok (fájl vagy könyvtár):"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3134,684 +3134,684 @@ msgstr ""
- "tartalmazó könyvtárt)."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importálás"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "alapértelmezés"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS hírcsatornák"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Csatornák"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Törlés"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "Ú&j"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Hírek"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Automatikus &frissítés"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Frissítés a&dott időközönként"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Frissítés"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Cím"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Hírek megtartási ideje (nap)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktív"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Szűrők"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Elfogadási szűrők"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Kihagyási szűrők"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Reguláris kifejezések"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Kezelés &sorozatként"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Feldolgozás"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Sorozatfeltétel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Egyezés epizód nélkül"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Max. epizód"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Max. évad"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Min. évad"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Min. epizód"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "&Tesztszöveg"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Próba"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "A szűrő illeszkedik"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Sávszélesség-ütemező"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Bal kattintás a kategóriára"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "&1. kategória"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "K&ikapcsolás"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "N&ormál"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "&3. kategória"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "&2. kategória"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Jobb kattintás a kategóriára"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "&1. kategória"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&3. kategória"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategóriák"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "letöltés:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "feltöltés:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/mp *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 esetén nincs korlát"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Mentés fájlba"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "Be&töltés fájlból"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Az ütemezés alapállapotba"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Beállítóoldal - Sávszélesség-ütemező"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Sá&vszélesség-ütemezés használata"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Sávszélesség-ütemező"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Színek használata ké&pek helyett"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Lassú gépeknél ajánlott)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Az ütemezés b&eállítása"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Bekapcsolja a sávszélesség-ütemezőt?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Színek használata képek helyett"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Formázott naplóüzenetek"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Általános üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Kapcsolódási üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Követőinformáció üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Lemezinformáció üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IP-szűrő üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Keresőmodul üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Részleges fájlimportáló üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "InfoWidget üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnP üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Helyi torrentkereső üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Ütemező üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "RSS bővítmény üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Webes felület bővítmény üzenetjelző"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Beállítások - Naplónézegető"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Bővítmények"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Mind"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Nyomkövetés"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Tájékoztató üzenetek"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Fontos üzenetek"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nincs"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-szűrő:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Keresés:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Helyi torrentkereső:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Ütemező:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Fájlimportáló:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Információs ablak:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-kezelő:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Webes felület:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Rendszer"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Általános:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Kapcsolatok:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Lemezműveletek:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "&Formázott naplóüzenetek"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Külső böngésző"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Külső böngészőben történjen a keresés"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Alapértelmezett böngésző"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Más böngésző:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Keresők"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Név:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Hozzáadás"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Név"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Az összes &eltávolítása"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Ala&plista hozzáadása"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Frissítés az internetről"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Keresés"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Kereső:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "A jelenlegi kereső"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Egyéni böngésző használata"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Egyéni böngésző elérési útja"
-@@ -4098,19 +4098,19 @@ msgstr "Adatellenőrzés"
- msgid "Stopped. No space left on device."
- msgstr "Leállítva. nincs több hely az eszközön."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- "Nincs elegendő lemezterület a torrent letöltéséhez. Biztosan folytatni akarja?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "a lemezterület kevés a következőhöz: %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4118,16 +4118,16 @@ msgstr ""
- "A(z) \"%1\" torrent elérte a megengedett maximális megosztási arányt. Ennek "
- "ellenére el szeretné kezdeni a feltöltést?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Elérte a maximális megosztási arányt."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Nem sikerült leállítani a(z) %1 torrentfájlt: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Nem sikerült elindítani a(z) %1 torrentfájlt: %2"
- 
-diff --git a/translations/it/messages/ktorrent.po b/translations/it/messages/ktorrent.po
-index d0f38ee..faaa290 100644
---- a/translations/it/messages/ktorrent.po
-+++ b/translations/it/messages/ktorrent.po
-@@ -1,12 +1,12 @@
- # translation of ktorrent.po to Italian
- #
- # Nicola Ruggero <nixprog.adsl@tiscali.it>, 2005, 2006.
--# Nicola Ruggero <nicola@nxnt.org>, 2006, 2007.
-+# Nicola Ruggero <nicola@nxnt.org>, 2006, 2007, 2008.
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2007-07-09 15:09+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-08-18 14:39+0200\n"
- "Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
- "Language-Team: Italian <tde-i18n-it@kde.org>\n"
- "MIME-Version: 1.0\n"
-@@ -19,7 +19,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nessuna connessione in ingresso (probabilmente sei dietro un firewall)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informazioni"
-@@ -127,11 +127,11 @@ msgstr "Tutti i torrent"
- 
- #: apps/ktorrent/filterbar.cpp:52
- msgid "Find:"
--msgstr ""
-+msgstr "Trova:"
- 
- #: apps/ktorrent/filterbar.cpp:65
- msgid "Case sensitive"
--msgstr ""
-+msgstr "Distringui maiuscole"
- 
- #: apps/ktorrent/newui/ddockwindow.cpp:88
- msgid "Move to left dock"
-@@ -187,7 +187,7 @@ msgstr "URL non corretto."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Scaricamenti"
-@@ -258,9 +258,8 @@ msgstr ""
- "ricrearlo?"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1069
--#, fuzzy
- msgid "Do Not Recreate"
--msgstr "Ricrea"
-+msgstr "Non ricreare"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1078
- #, c-format
-@@ -304,14 +303,14 @@ msgstr "Modalità debug"
- 
- #: apps/ktorrent/main.cpp:109
- msgid "Silently save torrent given on URL"
--msgstr ""
-+msgstr "Salva senza avvisi il torrent indicato nell'URL"
- 
- #: apps/ktorrent/main.cpp:110
- msgid "Document to open"
- msgstr "Documento da aprire"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -349,11 +348,12 @@ msgid ""
- "Country locator for InfoWidget plugin (This product includes GeoLite data "
- "created by MaxMind, available from http://www.maxmind.com/). "
- msgstr ""
-+"Localizzatore paese per plugin Informazioni (Questo prodotto include dati "
-+"GeoLite creato da MaxMind, disponibile all'indirizzo http://www.maxmind.com/). "
- 
- #: apps/ktorrent/main.cpp:144
--#, fuzzy
- msgid "Country flags"
--msgstr "Paese"
-+msgstr "Bandiere"
- 
- #: apps/ktorrent/main.cpp:145
- msgid "File prioritization"
-@@ -416,40 +416,35 @@ msgstr "Parecchie patch"
- 
- #: apps/ktorrent/main.cpp:160
- msgid "Patch to hide the menubar"
--msgstr ""
-+msgstr "Patch per nascondere la barra dei menu"
- 
- #: apps/ktorrent/main.cpp:161
- msgid "Patch to modify file priorities in the webgui"
--msgstr ""
-+msgstr "Patch per modificare la priorità dei file nell'interfaccia web"
- 
- #: apps/ktorrent/main.cpp:162
--#, fuzzy
- msgid "Several webgui patches"
--msgstr "Parecchie patch"
-+msgstr "Parecchie patch per l'interfaccia web"
- 
- #: apps/ktorrent/main.cpp:163
--#, fuzzy
- msgid "Filterbar patch"
--msgstr "Corrispondenze filtro"
-+msgstr "Patch per la barra del filtro"
- 
- #: apps/ktorrent/main.cpp:164
- msgid "Non threaded fileview update patch"
--msgstr ""
-+msgstr "Patch per aggiornare la vista file senza processi"
- 
- #: apps/ktorrent/main.cpp:165
- msgid "Optimization to SHA1 hash generation"
--msgstr ""
-+msgstr "Ottimizzazione della generazione dell'hash SHA1"
- 
- #: apps/ktorrent/main.cpp:166
- msgid "Patch to fix free diskspace calculation on FreeBSD"
--msgstr ""
-+msgstr "Patch per correggere il calcolo dello spazio libero in FreeBSD"
- 
- #: apps/ktorrent/main.cpp:167
--#, fuzzy
- msgid "Patch to load torrents silently from the command line"
--msgstr ""
--"Patch per caricare senza avvisi un torrent specificando la posizione in cui è "
--"salvato"
-+msgstr "Patch per caricare senza avvisi un torrent dalla riga di comando"
- 
- #: apps/ktorrent/torrentcreatordlg.cpp:64
- msgid "You must select a file or a folder."
-@@ -569,22 +564,20 @@ msgid "Remove Torrent and Data"
- msgstr "Rimuovi torrent e dati"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:59
--#, fuzzy
- msgid "Add Peers"
--msgstr "Aggiungi nodi..."
-+msgstr "Aggiungi nodi"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:63
- msgid "Additional Peer Sources"
- msgstr "Fonti nodi addizionali"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:64
--#, fuzzy
- msgid "Torrent Peer Sources:"
- msgstr "Fonti nodi torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -602,9 +595,8 @@ msgid "Preview"
- msgstr "Anteprima"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:81
--#, fuzzy
- msgid "Open Directory"
--msgstr "Apri cartella..."
-+msgstr "Apri cartella"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:82
- msgid "Data Directory"
-@@ -615,9 +607,8 @@ msgid "Temporary Directory"
- msgstr "Cartella temporanea"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:87
--#, fuzzy
- msgid "Set Download Location"
--msgstr "Imposta posizione scaricamento..."
-+msgstr "Imposta posizione scaricamento"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:90
- msgid "Remove From Group"
-@@ -628,7 +619,7 @@ msgid "Add to Group"
- msgstr "Aggiungi al gruppo"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Limiti velocità"
-@@ -646,7 +637,7 @@ msgid "Malformed IP address."
- msgstr "Indirizzo IP non corretto."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferenze"
-@@ -682,7 +673,7 @@ msgid "Advanced"
- msgstr "Avanzate"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Opzioni avanzate"
-@@ -693,7 +684,7 @@ msgstr "Colonne visibili"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stato"
-@@ -715,7 +706,7 @@ msgstr "Inviati"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Velocità scaricamento"
-@@ -838,7 +829,7 @@ msgid "User"
- msgstr "Utente"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Gestione coda"
-@@ -1067,8 +1058,8 @@ msgid "Start torrent"
- msgstr "Avvia il torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Scaricamento"
-@@ -1122,13 +1113,13 @@ msgid "Encryption"
- msgstr "Cifratura"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usa la cifratura del protocollo"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1138,13 +1129,13 @@ msgstr ""
- "connessioni BitTorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permetti comunicazioni non cifrate"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1153,7 +1144,7 @@ msgstr ""
- "crittografia."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1164,169 +1155,169 @@ msgstr ""
- "consulta il manuale."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usa DHT per avere nodi aggiuntivi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Porta UDP per le comunicazioni DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP personalizzato"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "I&nvia al server traccia un indirizzo IP o nome host personalizzato"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Indirizzo IP o nome host personalizzato:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Icona nel vassoio di sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostra icona nel vassoio di s&istema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Mostra &barra velocità nel vassoio di sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mostra messaggi a comparsa nel vassoio di sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Larghezza di banda in invio (in KB/sec):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Larghezza di banda in scaricamento (in KB/sec):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Cartelle"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Cartella per i file temporanei:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Sposta scaricamenti completati in:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Salva &automaticamente gli scaricamenti in:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Copia file .torrent in:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra degli strumenti degli scaricamenti"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Imposta limiti di velocità per il torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Livello massimo di invio:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Livello massimo di scaricamento:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 è illimitato)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Aggiungi nodo potenziale"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP nodo:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porta:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Inserisci IP nodo e porta."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Lista nera KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1336,188 +1327,188 @@ msgstr ""
- "salvare le voci oppure usa il plugin Filtro IP (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Nodi al bando"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Indirizzo IP nodo"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Aggiungi nodo:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Aggiungi un nodo alla lista nera"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Rimuove i nodi selezionati dalla lista nera"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Pu&lisci"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Pulisce questa lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Salva &come..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Salva questa lista nera per essere usato con il plugin Filtro IP per KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Scaricamenti massimi:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Semi massimi:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Avvio scaricamento con poco spazio su disco:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Spazio su disco minimo:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Non avviare"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Chiedi sempre"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Forza avvio"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 è illimitato)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Livello massimo di scaricamento:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Limite globale connessioni:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Tempo massimo distribuzione:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Connessioni massime per torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Numero slot di invio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Porta UDP del server traccia:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Livello massimo condivisione:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Livello massimo di invio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sec (0 è illimitato)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Ore (0 è illimitato)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Mantieni il seme dopo il termine dello scaricamento"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Attenzione"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1527,283 +1518,283 @@ msgstr ""
- "UPnP può farlo al posto tuo."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Gestione coda - KTorrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stato:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Server traccia:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Livello condivisione:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Byte rimanenti:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controllato da"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Invi&i"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Byte inviati:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Sposta &su"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Sposta &giù"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Sposta all'inizio"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Sposta alla &fine"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controllato da G&C"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controllato dall'&utente"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Incolla URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Annulla"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Crea torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Il file o la cartella della quale vuoi creare un torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Devi aggiungere almeno un server traccia o un nodo."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opzioni file"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Dimensione di ogni parte:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Avvia la distribuzione s&eme del torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Decentrali&zzato (solo DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrent privato (DHT non permesso)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Commenti:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Crea"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "An&nulla"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Server traccia"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Nodi DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Nodo:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "Indirizzo IP o nome host"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1814,19 +1805,19 @@ msgstr ""
- "distribuire il seme di questo torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferenze avanzate"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
--msgstr ""
-+msgstr "Algoritmo di stima del tempo rimanente:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1855,175 +1846,175 @@ msgstr ""
- "campioni"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Velocità attuale"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Velocità media globale"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Finestra di X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Media commovente"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(ha effetto dopo il riavvio)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Disa&bilita preallocazione spazio su disco"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Preall&oca interamente lo spazio su disco (evita la frammentazione)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Base (lento)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Specifico per il filesysten"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Prestazioni"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Uso memoria:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Basso"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Medio"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alto"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Intervallo aggiornamento interfaccia:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "CPU veloce"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "CPU lenta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Controllo dati"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Durante l'invio &non ricontrollare le parti più grandi di"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Fai un controllo &integrità dei dati dopo"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "parti danneggiate"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Rete"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
--#, fuzzy, no-c-format
-+#: rc.cpp:623
-+#, no-c-format
- msgid "Maximum number of connection setups:"
--msgstr "Numero massimo di connessioni per torrent (0 = illimitate)"
-+msgstr "Numero massimo di connessioni impostate:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
--msgstr ""
-+msgstr "DSCP per i pacchetti IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
-@@ -2031,254 +2022,254 @@ msgstr ""
- "traccia"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Proxy HTTP del server traccia:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Analisi dei dati"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Analisi dei dati del torrent:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Numero di parti trovate:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Numero di parti danneggiate / non scaricate:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Prova"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Numero massimo di scaricamenti (0 = illimitati)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Numero massimo di semi (0 = illimitati)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Avvio gli scaricamenti anche con poco spazio libero?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Numero massimo di connessioni per torrent (0 = illimitate)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Numero massimo di connessioni per tutti i torrent (0 = illimitate)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocità massima di invio in KB/sec (0 = illimitata)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocità massima di scaricamento in KB/sec (0 = illimitata)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Livello massimo di condivisione (0=illimitato)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Durata massima distribuzione seme in ore (0=illimitata)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostra l'icona nel vassoio di sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostra barra velocità nel vassoio di sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Larghezza di banda in scaricamento (in kb/sec):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Larghezza di banda in invio (in kb/sec):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostra messaggi a comparsa quando un torrent è completato."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Mantieni il seme dopo il termine dello scaricamento"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Cartella per salvare i file temporanei"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Se salvare automaticamente gli scaricamenti nella cartella impostata"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Cartella nella quale salvare i file scaricati"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Se spostare automaticamente gli scaricamenti completi nella cartella impostata"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Cartella nella quale spostare i file scaricati"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Se copiare automaticamente i file .torrent nella cartella impostata"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Cartella per copiare i file .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Se usare un indirizzo IP personalizzato da passare al server traccia"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Cartella usata come ultima cartella di salvataggio"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP da passare al server traccia"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Uso memoria"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Intervallo aggiornamento interfaccia"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Supporto per DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Porta DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Numero slot di invio"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Colonne mostrate nella vista KTorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritmo ET"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2288,457 +2279,457 @@ msgstr ""
- "libero è meno del valore impostato, il torrent verrà fermato."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Gestore plugin"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Attiva"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Disa&ttiva"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "&Attiva tutti"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Disattiva tutti"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositivo UPnP predefinito da usare"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositivi rilevati:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositivo"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Porte mappate"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Connessione WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "M&appa porte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Annulla mappatura porte"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Rileva nuovamente"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Abilitare la scansione della cartella 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Abilitare la scansione della cartella 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Abilitare la scansione della cartella 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Percorso cartella 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Percorso cartella 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Percorso cartella 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Se aprire un file torrent senza avvisi oppure no."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Azione elimina marcata."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Azione sposta marcata."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferenze scansione cartella"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Scansione cartella &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Scansione cartella &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Scansione cartella &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Sposta nella cartella \"caricati\" &dopo il caricamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Sposta il torrent nella cartella \"caricati\" dopo il caricamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Apri i torrent senza avvis&i"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
--#, fuzzy, no-c-format
-+#: rc.cpp:881
-+#, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Non mostra la finestra \"Seleziona i file da scaricare\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Cancella dopo il caricame&nto"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Cancella i torrent dopo il caricamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Cartelle nelle quali effettuare la scansione"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Cartella 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Cartella 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Cartella 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferenze di ricerca"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Server web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Mappa porta"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Sessione TTL (in sec):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Seleziona interfaccia:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Nome utente:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Cambia password..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Percorso eseguibile PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Numero porta"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "mappa porta"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Durata sessione"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "skin interfaccia"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "percorso eseguibile PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "nome utente"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "password"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Parti"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Totale:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Attualmente in scaricamento:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Scaricate:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Escluse:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Rimaste:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Dimensione:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Parte"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Avanzamento"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Nodo"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Nodi assegnati"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Distributori:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Ricettori:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocità media scaricamento:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocità media invio:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Prossimo aggiornamento in:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Stato server traccia:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Parti del torrent che sono state scaricate:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Parti del torrent che sono disponibili:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Condivisione"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2747,148 +2738,148 @@ msgstr ""
- "Zero significa senza limite."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "L'invio si fermerà quando avrai inviato questo torrent per diverse ore."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Ore"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Limite livello:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Il limite funziona solo in modalità distribuzione seme"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Limite di tempo:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Aggiorna server traccia"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Intervallo minimo aggiornamento - 60 secondi"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Aggiungi server t&raccia"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Rimuovi server traccia"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "C&ambia server traccia"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Ripristina valori predefiniti"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostra la linguetta della vista nodi nella finestra principale"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- "Mostra la linguetta della vista scaricamento parti nella finestra principale"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- "Mostra la linguetta della vista server traccia nella finestra principale"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostra lista dei nodi"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostra lista delle parti attualment&e in scaricamento"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostra lista dei server traccia"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferenze Blocco IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Seleziona file filtro PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Uso il filtro PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "File filtro IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Sca&rica/Converti"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2898,91 +2889,91 @@ msgstr ""
- "Nota: Il file zip di bluetack.co.uk è supportato."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL filtro livello 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Uso filtro di livello 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Conversione..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
--#, fuzzy, no-c-format
-+#: rc.cpp:1122
-+#, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
- "process could take a while even on fast machines and during that time you will "
- "not be able to use KTorrent."
- msgstr ""
--"Fai clic sul pulsante converti per avviare la conversione del file antip2p. "
-+"Fai clic sul pulsante \"converti\" per avviare la conversione del file antip2p. "
- "NOTA: Questo processo può impiegare del tempo anche in macchine veloci e in "
- "questo periodo non è possibile usare KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Aggiorna"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Aggiorna grafici ogni"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "aggiornamenti dell'interfaccia"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Raccogli dati ogni"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "millisecondi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Massimo"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Modalità scala velocità massima:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Esatto"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Vedi \"Che cos'è?\" per maggiori informazioni"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2994,164 +2985,164 @@ msgstr ""
- "- Esatto: Velocità massima raggiunta visibile nel grafico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Velocità nodi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Velocità nodi:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "aggiorna ogni"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "aggiornamenti dati grafico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "La raccolta di dati provenienti da molti nodi connessi utilizza molta CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Connessioni nodi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Valori grandi possono oscurare i grafici dei nodi connessi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostra distributori in sciami"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Mostra ricettori in sciami"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Conteggi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Invio"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Connessioni"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Nodi"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Mostra/Nascondi grafici velocità nodi"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervallo raccolta dati sulla velocità dei nodi"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Mostra/Nascondi ricettori in sciami"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Mostra/Nascondi distributori in sciami"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Conteggio scaricamenti"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Conteggio velocità nodi"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Conteggio invii"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Conteggio connessioni"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Conteggio DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Modalità massimo dell'asse Y"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importa uno scaricamento esistente"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dati:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3159,684 +3150,684 @@ msgstr ""
- "Per favore specifica il torrent e i dati già scaricati di quel torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importa"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "predefinito"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Fonti RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Fonti"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "E&limina"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nuovo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Articoli"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Aggio&rnamento automatico"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnora TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Aggiorna"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titolo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Mantieni articoli (giorni)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Attiva"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtri"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filtri di accettazione"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filtri di rifiuto"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Espressioni regolari"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tratta come &serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Elabora"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Criteri serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Corrispondenza senza episodio"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Episodio massimo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Stagione massima"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Stagione minima"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Episodio minimo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Prova te&sto"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Prova"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Corrispondenze filtro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Pianificatore banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoria impostata con il pulsante sinistro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Categor&ia 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Spent&o"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normale"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoria impostata con il pulsante destro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "scarica:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "invia:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* zero è illimitato"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Salva su file"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Carica da file"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Azzera pianificazione"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Preferenze plugin pianificatore"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Uso il pianificatore &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Pianificatore banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Uso i colori al posto delle immagini (pi&xmap)?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Raccomandato per sistemi lenti)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Modifica pianifi&cazione"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Abilito pianificatore banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Uso i colori al posto delle pixmap?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usa rich text nel registro"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Messaggi info generali"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Messaggi connessioni"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Messaggi DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Messaggi info server traccia"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Messaggi info I/O disco"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Messaggi plugin Filtro IP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Messaggi plugin Ricerca"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Messaggi plugin Importazione file parziali"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Messaggi plugin Pannello informazioni"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Messaggi plugin UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Messaggi plugin Scansione cartella"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Messaggi Pianificatore banda"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Flag messaggi plugin RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Flag messaggi plugin Interfaccia web"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opzioni visore registro"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugin"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Tutto"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Debug"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Avviso"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Importante"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nessuno"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtro IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Ricerca:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Scansione cartella:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Pianificatore:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Importazione file parziali:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Pannello informazioni:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Plugin RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Plugin Interfaccia web:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Generale:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Connessioni:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "I/O disco:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usa rich te&xt per il registro"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Browser esterno"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Apri le ricerche in un browser esterno"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Usa browser predefinito"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Percorso browser personalizzato:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Motori di ricerca"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nome motore di ricerca:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Aggiungi"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motori"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Rimu&ovi tutto"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Aggiungi predefi&nito"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Aggiorna da internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Cerca"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motore di ricerca:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Motore di ricerca corrente"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Usa browser personalizzato"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Percorso eseguibile browser personalizzato"
-@@ -3955,7 +3946,7 @@ msgstr "Impossibile scrivere oltre la fine del buffer mmap!"
- 
- #: libktorrent/pluginmanagerprefpage.cpp:54
- msgid "%1<br>Status: <b>%2</b><br>Author: %3"
--msgstr ""
-+msgstr "%1<br>Stato: <b>%2</b><br>Autore: %3"
- 
- #: libktorrent/pluginmanagerprefpage.cpp:55
- msgid "Loaded"
-@@ -4125,7 +4116,7 @@ msgstr "Controllo dati"
- msgid "Stopped. No space left on device."
- msgstr "Fermato. Non c'è spazio rimanente sul dispositivo"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4133,12 +4124,12 @@ msgstr ""
- "Non hai sufficiente spazio sul disco per poter scaricare questo torrent. Sei "
- "sicuro di voler continuare?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Spazio su disco insufficiente per %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4146,16 +4137,16 @@ msgstr ""
- "Il torrent \"%1\" ha raggiunto il livello massimo di condivisione. Ignoro il "
- "limite e inizio ugualmente la distribuzione seme?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Livello massimo di condivisione raggiunto."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Errore nell'arresto del torrent %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Errore nell'avvio del torrent %1: %2"
- 
-@@ -4196,14 +4187,12 @@ msgid "Cannot open %1 for writing : readonly filesystem"
- msgstr "Impossibile aprire %1 in scrittura: filesystem in sola lettura"
- 
- #: libktorrent/torrent/cachefile.cpp:240
--#, fuzzy
- msgid "Cannot expand file %1 : %2"
--msgstr "Impossibile espandere il file: %1"
-+msgstr "Impossibile espandere il file %1 : %2"
- 
- #: libktorrent/torrent/cachefile.cpp:242
--#, fuzzy
- msgid "Cannot expand file %1 : incomplete write"
--msgstr "Impossibile espandere il file %1"
-+msgstr "Impossibile espandere il file %1 : scrittura incompleta"
- 
- #: libktorrent/torrent/cachefile.cpp:255
- #, c-format
-@@ -4290,7 +4279,6 @@ msgstr ""
- "file torrent."
- 
- #: plugins/scanfolder/scanfolderplugin.cpp:52
--#, fuzzy
- msgid "Scan Folder"
- msgstr "Scansione cartella"
- 
-@@ -4324,7 +4312,6 @@ msgid "WebInterface Options"
- msgstr "Opzioni Interfaccia web"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:70
--#, fuzzy
- msgid "Php executable is not in default path, please enter the path manually"
- msgstr ""
- "L'eseguibile PHP non è nel percorso predefinito, per favore inserisci il "
-@@ -4339,12 +4326,10 @@ msgid "%1 exists and it is executable"
- msgstr "%1 esiste ed è eseguibile"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:120
--#, fuzzy
- msgid "%1 does not exist"
- msgstr "%1 non esiste"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:124
--#, fuzzy
- msgid "%1 is not executable"
- msgstr "%1 non è eseguibile"
- 
-@@ -4353,12 +4338,10 @@ msgid "%1 is a directory"
- msgstr "%1 è una cartella"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:132
--#, fuzzy
- msgid "%1 is not php executable path"
- msgstr "%1 non è il percorso dell'eseguibile PHP"
- 
- #: plugins/webinterface/webinterfaceplugin.cpp:44
--#, fuzzy
- msgid "Web Interface"
- msgstr "Interfaccia web"
- 
-@@ -4533,7 +4516,6 @@ msgid "Filters out unwanted peers based on their IP address"
- msgstr "Filtra i nodi indesiderati basandosi sul loro indirizzo IP"
- 
- #: plugins/ipfilter/ipfilterplugin.cpp:46
--#, fuzzy
- msgid "IP Filter"
- msgstr "Filtro IP"
- 
-@@ -4720,7 +4702,7 @@ msgstr "Fonti RSS"
- #: plugins/rssfeed/rsslinkdownloader.cpp:183
- #, c-format
- msgid "Failed to find and download a valid torrent for %1"
--msgstr ""
-+msgstr "Impossibile trovare e scaricare un torrent valido da %1"
- 
- #: plugins/rssfeed/rssfeedmanager.cpp:78
- msgid "Title"
-@@ -4917,7 +4899,7 @@ msgstr "Scarica"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid "Zeroconf"
--msgstr ""
-+msgstr "Zeroconf"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid ""
-@@ -4925,32 +4907,3 @@ msgid ""
- msgstr ""
- "Trova i nodi che eseguono KTorrent nella rete locate con cui poter condividere "
- "i torrent"
--
--#~ msgid "ETA algorithm:"
--#~ msgstr "Algoritmo ETA:"
--
--#~ msgid "Cannot load chunk %1"
--#~ msgstr "Impossibile caricare la parte %1"
--
--#, fuzzy
--#~ msgid "Alt+X"
--#~ msgstr "Alt+1"
--
--#, fuzzy
--#~ msgid "TrackerViewBase"
--#~ msgstr "Server traccia"
--
--#~ msgid "Type of service field of IP packets"
--#~ msgstr "Campo \"tipo di sevizio\" nei pacchetti IP"
--
--#~ msgid "Alt+N"
--#~ msgstr "Alt+N"
--
--#, fuzzy
--#~ msgid "Alt+S"
--#~ msgstr "Alt+N"
--
--#~ msgid "Country locator for InfoWidget plugin. Flags are taken from http://flags.blogpotato.de/ so thanks to them too."
--#~ msgstr ""
--#~ "Localizzatore paesi per plugin pannello informazioni.\n"
--#~ "Le bandiere sono prese da http://flags.blogpotato.de/ quindi un grazie anche a loro."
-diff --git a/translations/ja/messages/ktorrent.po b/translations/ja/messages/ktorrent.po
-index cb5dd93..04d5d19 100644
---- a/translations/ja/messages/ktorrent.po
-+++ b/translations/ja/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-11-25 22:00+0900\n"
- "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
- "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
-@@ -18,7 +18,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "着信接続がありません (ファイアウォールで遮断されている可能性があります)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "情報"
-@@ -185,7 +185,7 @@ msgstr "URL の形式が不正です。"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "ダウンロード"
-@@ -300,7 +300,7 @@ msgid "Document to open"
- msgstr "開くドキュメント"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -563,7 +563,7 @@ msgstr "torrent のピア取得先:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -605,7 +605,7 @@ msgid "Add to Group"
- msgstr "グループに追加"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "速度制限"
-@@ -623,7 +623,7 @@ msgid "Malformed IP address."
- msgstr "IP アドレスの形式が不正です。"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "設定"
-@@ -659,7 +659,7 @@ msgid "Advanced"
- msgstr "詳細"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "詳細オプション"
-@@ -670,7 +670,7 @@ msgstr "表示するカラム"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "ステータス"
-@@ -692,7 +692,7 @@ msgstr "アップロード済み"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "下り速度"
-@@ -807,7 +807,7 @@ msgid "User"
- msgstr "ユーザ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "QM (キューマネージャ)"
-@@ -1011,8 +1011,8 @@ msgid "Start torrent"
- msgstr "torrent を開始"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "ダウンロード"
-@@ -1066,13 +1066,13 @@ msgid "Encryption"
- msgstr "暗号化"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "プロトコル暗号化を使う"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1080,20 +1080,20 @@ msgid ""
- msgstr "プロトコル暗号化は ISP に bittorrent 接続の速度を制限されないようにするために使用します。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "暗号化されていない接続を許可する"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr "このチェックを外すと、暗号化をサポートしていないクライアントには接続できなくなります。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1103,170 +1103,170 @@ msgstr ""
- "<br>分散型ピア交換プロトコル。詳しくはマニュアルをご覧ください。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "ピアを追加するために DHT を使う(&U)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "DHT コミュニケーションのための UDP ポート:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "カスタム IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "トラッカーにカスタム IP アドレス/ホスト名を送る(&N)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "カスタム IP アドレスまたはホスト名:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "システムトレイアイコン"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "システムトレイアイコンを表示する(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "トレイアイコンに速度バーを表示する(&B)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "システムトレイのポップアップメッセージを表示する"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "アップロード帯域幅 (KB/秒):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "ダウンロード帯域幅 (KB/秒):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "フォルダ"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "一時ファイルを保存するフォルダ:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "完了したダウンロードの移動先:"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "ダウンロードを自動的に次に保存する(&S):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr ".torrent ファイルのコピー先:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "ダウンロードツールバー"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "torrent の速度制限を設定"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "最大アップロード速度:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "最大ダウンロード速度:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/秒 (0 は無制限)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "見込みピアを追加"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "ピア IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "ポート:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "ピアの IP とポートを入力してください。"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent ブラックリスト"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1276,187 +1276,187 @@ msgstr ""
- "を使ってください。"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "禁止したピア"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "ピアの IP アドレス"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "ピアを追加:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "ブラックリストにピアを追加"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "選択したピアをブラックリストから削除"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "クリア(&L)"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "このリストをクリア"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "名前を付けて保存(&A)..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "このブラックリストを KTorrent IPFilter プラグインで使用するために保存"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "最大ダウンロード数:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "最大シード数:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "ディスク容量が少ない場合のダウンロードの開始:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "最小ディスク容量:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "開始しない"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "常に尋ねる"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "強制的に開始"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 は無制限)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "最大ダウンロード速度:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "全体の接続制限:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "最大シード時間:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "torrent あたりの最大接続数:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "アップロードスロットの数:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP トラッカーポート:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "最大共有比率:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "最大アップロード速度:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/秒 (0 は無制限)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "時間 (0 は無制限)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "ダウンロード完了後シードを続ける(&K)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "注意"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1464,283 +1464,283 @@ msgid ""
- msgstr "ルータの背後にいる場合は、上のポートもフォワードする必要があります。UPnP プラグインはこれを自動的に行います。"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT キューダイアログ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "ステータス:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "トラッカー:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "共有比率:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "残りバイト:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "コントロール"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "アップロード(&S)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "アップロード済み:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "上に移動(&O)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "下に移動(&N)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "一番上に移動"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "一番下に移動(&B)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "QM がコントロール(&Q)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "ユーザがコントロール(&U)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL を貼り付け"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "キャンセル(&A)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "torrent を作成"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "torrent を作成するファイルまたはフォルダ:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "トラッカーまたはノードを最低一つ追加してください。"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "ファイルのオプション"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "各ピースのサイズ:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "torrent のシードを開始する(&G)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "分散型(&Z) (DHT のみ)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "非公開 torrent (DHT は使えません)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "コメント:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "作成(&C)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "キャンセル(&N)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "トラッカー"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT ノード"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "ノード:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP またはホスト名"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "ポート"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1750,19 +1750,19 @@ msgstr ""
- "アドレスとポートも挿入した方がいいでしょう。"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "詳細設定"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "残り時間を計算するアルゴリズム:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1787,427 +1787,427 @@ msgstr ""
- "移動平均アルゴリズム: X サンプルから速度の移動平均を計算"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "現在の速度"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "全体の平均速度"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "X のウィンドウ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "移動平均"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(再起動後に適用)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "ディスク領域の事前割り当てを無効にする(&B)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "事前にディスク領域を完全に割り当てる(&U) (断片化を防ぐ)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "基本的 (遅い)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "ファイルシステム専用"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "パフォーマンス"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "メモリの使用:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "低"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "中"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "高"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "GUI の更新間隔:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ミリ秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "高速 CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "低速 CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "データチェック"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "アップロード中に次より大きいピースは再チェックしない(&N)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "壊れたピースが次の数あればデータの整合性をチェックする(&Y)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "ピース"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "ネットワーキング"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "最大接続数の設定:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "IP パケットの DSCP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "HTTP トラッカー接続に KDE のプロキシ設定を使わない(&X)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP トラッカープロキシ:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "データをスキャン"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "torrent のデータをスキャン :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "見つかったピースの数 :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "失敗した/未ダウンロードのピースの数 :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "テスト"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "最大ダウンロード数 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "最大シード数 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "ディスク容量が不足していてもダウンロードを開始しますか？"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "torrent あたりの最大接続数 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "すべての torrent の最大接続数 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "最大アップロード速度 KB/秒 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "最大ダウンロード速度 KB/秒 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "最大共有比率 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "最大シード時間 (0 = 無制限)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "システムトレイアイコンを表示"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "トレイアイコンに速度バーを表示"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "ダウンロード帯域幅 (kb/秒):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "アップロード帯域幅 (kb/秒):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "torrent が完了したときにポップアップメッセージを表示します。"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "ダウンロード完了後シードを続ける"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "一時ファイルを保存するフォルダ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "ダウンロードを自動的に saveDir に保存するかどうか"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "ダウンロードしたファイルを保存するフォルダ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "完了したダウンロードを自動的に completedDir に移動するかどうか"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "ダウンロードが完了したファイルを移動するフォルダ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ".torrent ファイルを自動的に torrentCopyDir にコピーするかどうか"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr ".torrent ファイルをコピーするフォルダ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "トラッカーにカスタム IP を送るかどうか"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "最後に保存先として使用されたディレクトリ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "トラッカーに送る IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "メモリの使用"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "GUI の更新間隔"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "DHT サポート"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT ポート"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "アップロードスロットの数"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "KTorrentView に表示するカラム"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ET アルゴリズム"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2215,603 +2215,603 @@ msgid ""
- msgstr "ダウンロードを完了するために必要な容量がなく、ディスクの空き容量が minDiskSpace より少ない場合、torrent を停止します。"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "プラグインマネージャ"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "ロード"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "アンロード(&N)"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "すべてロード(&A)"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "すべてアンロード(&U)"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "デフォルトで使用する UPnP デバイス"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "検出したデバイス:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "デバイス"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "フォワードされたポート"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN 接続"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "ポートをフォワード(&A)"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "ポートフォワーディングを元に戻す"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "再スキャン"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "フォルダ 1 のスキャンを有効にしますか？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "フォルダ 2 のスキャンを有効にしますか？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "フォルダ 3 のスキャンを有効にしますか？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "フォルダ 1 のパス"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "フォルダ 2 のパス"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "フォルダ 3 のパス"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "質問せずに torrent を開くかどうか。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "削除アクションがチェックされています。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "移動アクションがチェックされています。"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "ScanFolder の設定"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "フォルダ &1 をスキャン"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "フォルダ &2 をスキャン"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "フォルダ &3 をスキャン"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "ロード後に「ロード済み」ディレクトリに移動する(&M)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "ロード後に torrent を「ロード済み」ディレクトリに移動します"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "質問せずに torrent を開く(&Y)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "ダウンロードするファイルを選択するダイアログを表示しません"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "ロード後に削除する(&G)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "ロード後に torrent を削除します"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "スキャンするフォルダ"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "フォルダ 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "フォルダ 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "フォルダ 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "検索オプション"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "ウェブサーバ"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "ポートをフォワード"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "セッション TTL (秒):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "インターフェースを選択:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "ユーザ名:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "パスワードを変更..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "PHP 実行ファイルへのパス:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "ポート番号"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "ポートをフォワード"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "セッションを有効と見なす時間"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "インターフェースのスキン"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "PHP 実行ファイルへのパス"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "ユーザ名"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "パスワード"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "ピース"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "合計:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "ダウンロード中:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "ダウンロード済み:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "対象外:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "残り:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "サイズ:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "ピース"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "進捗"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "ピア"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "割り当てられたピア"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "シーダー:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "リーチャー:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "下り平均速度:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "上り平均速度:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "次の更新までの時間:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "トラッカーの状態:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "ダウンロード済みの torrent のピース:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "ダウンロード可能な torrent のピース:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "共有"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr "共有比率がこの値に達するとアップロードを中止します。0 にすると無制限に続けます。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "この時間だけアップロードするとアップロードを中止します。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "時間"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "共有比率制限:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "シードモードでのみ制限する"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "時間制限(&L):"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "トラッカーを更新(&U)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "最小更新間隔 - 60 秒"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "トラッカーを追加(&K)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "トラッカーを削除"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "トラッカーを変更(&A)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "標準に戻す"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "ピアビュータブをメインウィンドウに表示"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "ピースビュータブをメインウィンドウに表示"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "トラッカービュータブをメインウィンドウに表示"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "ピアの一覧を表示する"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "ダウンロード中のピースの一覧を表示する(&Y)"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "トラッカーの一覧を表示する"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IPBlocking の設定"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "PeerGuardian フィルタファイルを選択 "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardian フィルタを使う"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP フィルタファイル:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "ダウンロード/変換(&N)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2821,25 +2821,25 @@ msgstr ""
- "注意: bluetack.co.uk の ZIP ファイルはサポートしていません。"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Level1 フィルタの URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Level1 フィルタを使う"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "変換..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2850,61 +2850,61 @@ msgstr ""
- "KTorrent を使用できません。"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "更新"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "チャートの更新間隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "GUI の更新ごと"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "データの収集間隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "ミリ秒"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "最大"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "速度スケールの最大モード:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "正確"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "詳しくは「これは何？」を参照"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2916,852 +2916,852 @@ msgstr ""
- "- 正確: チャートに表示される最大速度"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "ピアの速度"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "ピアの速度:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "更新間隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "チャートデータの更新ごと"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "たくさんのピアのデータを収集すると、CPU を多く消費することがあります。"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "ピアの接続数"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "値が大きくなると接続中のピアのチャートが分かりにくくなることがあります"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "スウォームのシーダーを表示する"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "スウォームのリーチャーを表示する"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "測定数"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "アップロード"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "接続"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "ピア"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "ピアの速度チャートを切り替え"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "ピアの速度データを収集する間隔"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "スウォームのリーチャーを表示するかどうか"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "スウォームのシーダーを表示するかどうか"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "ダウンロードの測定数"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "ピアの速度の測定数"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "アップロードの測定数"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "接続の測定数"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "DHT の測定数"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "OY 軸の最大モード"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "既存のダウンロードをインポート"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "データ:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "torrent とその torrent のダウンロード済みのデータを指定してください。"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "インポート(&I)"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "デフォルト"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS フィード"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "フィード"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "削除(&L)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "新規(&N)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "記事"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "自動更新(&R)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "TTL を無視する(&G)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "更新"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "タイトル(&T)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "記事を保持する日数"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "有効(&A)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "フィルタ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "許可フィルタ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "拒否フィルタ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "正規表現"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "シリーズとして扱う(&S)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "プロセス"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "シリーズの基準"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "最大エピソード"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "最大シーズン"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "最小シーズン"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "最小エピソード"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "テストテキスト(&X)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "テスト(&S)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "フィルタ結果"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "帯域幅スケジューラ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "左クリックカテゴリ"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "カテゴリ &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "オフにする(&U)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "標準(&N)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "カテゴリ &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "カテゴリ &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "右クリックカテゴリ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "カテゴリ &1"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "カテゴリ &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "カテゴリ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. カテゴリ</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. カテゴリ</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "ダウンロード:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "アップロード:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/秒 *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. カテゴリ</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 は無制限"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "ファイルに保存"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "ファイルからロード(&L)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "スケジュールをリセット"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "スケジューラプラグイン設定ページ"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "帯域幅スケジューラを使う(&B)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "帯域幅スケジューラ"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "ピックスマップの代わりに色を使う(&X)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(遅いシステムに推奨)"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "スケジュールを編集(&S)"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "帯域幅スケジューラを有効にする"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "ピックスマップの代わりに色を使う"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "リッチログテキストを使う"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "一般情報メッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "接続メッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT メッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "トラッカー情報メッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "ディスク IO 情報メッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IPFilter プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "検索プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "PartFileImport プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "情報ウィジェットプラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnP プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "ScanFolder プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "スケジューラプラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "RSS プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "WebInterface プラグインメッセージフラグ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "ログビューアのオプション"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "プラグイン"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "すべて"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "デバッグ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "通知"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "重要"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "なし"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IPFilter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "検索:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "ScanFolder:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "スケジューラ:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "情報ウィジェット:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS プラグイン:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "WebInterface プラグイン:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "システム"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "一般:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "接続:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "ディスク I/O:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "ログにリッチテキストを使う(&X)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "外部ブラウザ"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "検索結果を外部ブラウザで開く"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "標準のブラウザを使う"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "次のブラウザを使う (パスを指定):"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "検索エンジン"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "検索エンジン名:"
- 
- # ACCELERATOR changed by translator
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "追加(&D)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "エンジン"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "すべて削除(&E)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "標準エンジンを追加(&L)"
- 
- # ACCELERATOR added by translator
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "インターネットから更新(&U)"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "検索"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "検索エンジン:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "現在の検索エンジン"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "使用するブラウザを指定する"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "使用するブラウザの実行ファイルへのパス"
-@@ -4042,33 +4042,33 @@ msgstr "データをチェック"
- msgid "Stopped. No space left on device."
- msgstr "停止しました。デバイスに容量が残っていません。"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr "この torrent をダウンロードするために必要なディスク容量がありません。本当に続けますか？"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "%1 に必要なディスク容量がありません"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr "torrent \"%1\" は最大共有比率に達しました。制限を無視してシードを開始しますか？"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "最大共有比率に達しました。"
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "torrent %1 の停止エラー: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "torrent %1 の開始エラー: %2"
- 
-diff --git a/translations/ka/messages/ktorrent.po b/translations/ka/messages/ktorrent.po
-index 41edb5a..6558d40 100644
---- a/translations/ka/messages/ktorrent.po
-+++ b/translations/ka/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-03-28 01:25+0400\n"
- "Last-Translator: Giasher <giasher@telenet.ge>\n"
- "Language-Team:  <www.gia.ge>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "ინფორმაცია"
-@@ -197,7 +197,7 @@ msgstr "უვარგისი URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "ჩამოქაჩვები"
-@@ -320,7 +320,7 @@ msgid "Document to open"
- msgstr "გასახსნელი დოკუმენტი"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -606,7 +606,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -653,7 +653,7 @@ msgid "Add to Group"
- msgstr "სხვა IP"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -672,7 +672,7 @@ msgid "Malformed IP address."
- msgstr "უვარგისი URL."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "პარამეტრები"
-@@ -709,7 +709,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "ფაილის პარამეტრები"
-@@ -720,7 +720,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "სტატუსი"
-@@ -742,7 +742,7 @@ msgstr "ატვირთული"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "ქვემოთ სიჩქარე"
-@@ -866,7 +866,7 @@ msgid "User"
- msgstr "მომხმარებელი"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "როგის მმართველი"
-@@ -1059,8 +1059,8 @@ msgid "Start torrent"
- msgstr "ტორენტის &დამარცვლის დაწყება"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "ჩამოტვირთვა"
-@@ -1114,13 +1114,13 @@ msgid "Encryption"
- msgstr "აღწერა"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1128,20 +1128,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1149,169 +1149,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "სხვა IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "გაგზავნა IP ან"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "სხვა IP ან ჰოსტის სახელი:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, fuzzy, no-c-format
- msgid "Folders"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "საქაღალდე დროებითი ფაილებისთვის:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "ჩამოტვირთვა"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "torrent ფაილები"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "ჩამოტვირთვის ხელსაწყოთა პანელი"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "ტორენტის &დამარცვლის დაწყება"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "მაქსიმალური აქაჩვის დონე:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "მაქსიმალური ჩამოქაჩვის დონე:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "კბ/წმ (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "პორტი:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Torrent ფაილები"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1319,187 +1319,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "მაქსიმალური ჩამოქაჩვები:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "მაქსიმალური მარცვლები:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "არაა დაწყებული"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "არაა დაწყებული"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "მაქსიმალური ჩამოქაჩვის დონე:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "საზიარო სკალა:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, fuzzy, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "მაქსიმალური კავშირები ჩამოქაჩვისას:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP პორტი:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "საზიარო სკალა:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "მაქსიმალური აქაჩვის დონე:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "კბ/წმ (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&ჩამოქაჩვის დასრულების შემდეგ მარცვლების დატოვება"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "ყურადღება"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1509,283 +1509,283 @@ msgstr ""
- "მოდილს შეუძლია ამის გაკეთება."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT რიგის დიალოგი"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "მდგომარეობა:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "საზიარო სკალა:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "კონტროლირებადია"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "ატვირთული"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "ატვირთული"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, fuzzy, no-c-format
- msgid "M&ove up"
- msgstr "&ზემოთ აწევა"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "&ქვემოთ ჩაწევა"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "&ზემოთ აწევა"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, fuzzy, no-c-format
- msgid "&QM Controlled"
- msgstr "&QM კონტროლირებადია"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, fuzzy, no-c-format
- msgid "&User Controlled"
- msgstr "&მომხმარებელი კონტროლირებადია"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL-ს ჩასმა"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "გა&უქმება"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent შექმნა"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "საქაღალდე ან ფაილი, რომლისგანაც გსურთ ტორენტის შექმნა:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "თქვენ ერთი ძაფი მაინც უნდა დაამატოთ."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "ფაილის პარამეტრები"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "ჯაჭვის ყოველი ნაკვეთის ზომა:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "კბ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "ტორენტის &დამარცვლის დაწყება"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "კომენტარები:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "შე&ქმნა"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "გა&უქმება"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "სახელი:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "სხვა IP ან ჰოსტის სახელი:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "პორტი"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1793,19 +1793,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "ძიების პარამეტრები"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1821,427 +1821,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "მიმდინარე საძიებო სისტემა"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "პარამეტრები"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "მეხსიერების გამოყენება:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "დაბალი"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "საშუალო"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "მაღალი"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "GUI განახლების ინტერვალი:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500მწ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1წ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2წ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5წ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "UDP პორტი:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr ""
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "ჩამოქაჩვათა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "მარცვლების მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, fuzzy, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, fuzzy, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "ჩამოქაჩვისას კავშირთა მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "აქაჩვის მაქსიმალური სიჩქარე ბბ/წმ-ში (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "ჩამოაქაჩვის მაქსიმალური სიჩქარე ბბ/წმ-ში (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "მარცვლების მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "მარცვლების მაქსიმალური რაოდენობა (0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "სისტემური პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "ჩამოქაჩვის დასრულების შემდეგ მარცვლების დატოვება"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "დროებითი ფაილების შესანახი საქაღალდე"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "ჩამოქაჩული ფაილების შესანახი საქაღალდე"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "ჩამოქაჩული ფაილების შესანახი საქაღალდე"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "ჩამოქაჩვების &ავრომატურად აქ შენახვა:"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "დროებითი ფაილების შესანახი საქაღალდე"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, fuzzy, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "მეხსიერების გამოყენება"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "GUI-ს განახლების ინტერვალი"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2249,602 +2249,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "მოდულთა მმართველი"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "ჩატვირთვა"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "ა&მოტვირთვა"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "ყველას ჩატვირთვა"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "ყველას ამოტვირთვა"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "გამოსაყენებელი ნაგულისხმები UPnP მოწყობილობა"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "მოწყობილობების ამოცნობა:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "მოწყობილობა"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "გადამისამართებული პორტები"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "პორტების გადამისამართება"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "პორტების გადამისამართების გაუქმება"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "თავიდან სკანირება"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "%1 ტორენტ ფაილის გახსნა ვერ განხორციელდა: %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "ძიების პარამეტრები"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, fuzzy, no-c-format
- msgid "Alt+2"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, fuzzy, no-c-format
- msgid "Alt+3"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "torrent ფაილები"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "ძიების პარამეტრები"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "პორტების გადამისამართება"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "&არაფრის ამორჩევა"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "მომხმარებელი"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "პორტების გადამისამართება"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "საერთო პარამეტრები"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "ჯაჭვის ნაწილები"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "სულ:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "მიმდინარე ჩამოქაჩვა:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "იქაჩება:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "გამორიცხულია:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, fuzzy, no-c-format
- msgid "Size:"
- msgstr "ზომა"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "ჯაჭვის ნაწილი"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "პროგრესი"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "მარცვლები:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "წურბელები:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "საშუალო სიჩქარე"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "საშუალო სიჩქარე"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "შემდეგი განახლება:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "მდგომარეობა:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "ფაილის ნაწილები, რომლებიც ჩამოიქაჩა:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "ფაილის ხელმისაწვდომი ნაწილები:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "გაზიარება"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "IP -სკენ -სკენ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr "ნაგულისხმევის &დამატება"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "ჩვენება"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "ნაწილების ჩამოქაჩვის ხედის მთავარ ფანჯარაში ჩვენება"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, fuzzy, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "ჩვენება"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "ჩვენება სია"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "მიმდინარე ჩამოქაჩვის ჯაჭვების სიის ჩვენება"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, fuzzy, no-c-format
- msgid "Show list of trackers"
- msgstr "ჩვენება სია"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IPBlocking პარამეტრები"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "გსურთ KTorrent ფილტრის გამოყენება?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "გსურთ KTorrent ფილტრის გამოყენება?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP ფილტრის ფაილი:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "ჩამო&ტვირთვა/კონვერტირება"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2852,25 +2852,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "დონე1 url-ს ფილტრი"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "გსურთ 1 დონის ფილტრის გამოყენება?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "კონვერტაცია..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2879,61 +2879,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "GUI-ს განახლების ინტერვალი"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "მაქსიმალური მარცვლები:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "მაქსიმალური მარცვლები:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2942,163 +2942,163 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "სისტემური &პანელის ხატულის ჩვენება"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "ატვირთული"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "ჩამოტვირთვა Torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "არსებული ჩამოქაჩვის იმპორტირება"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "Torrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, fuzzy, no-c-format
- msgid "Data:"
- msgstr "მონაცემები"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3106,684 +3106,684 @@ msgstr ""
- "გთხოვთ განსაზღვროთ ტორენტი და ამ ტორენტისთვის უკვე ჩამოქაჩული მონაცემები."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, fuzzy, no-c-format
- msgid "&Import"
- msgstr "იმპო&რტი"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "ნაგულისხმევის &დამატება"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "მარცვლები:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "IP ფილტრის ფაილი:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "ყველა ფაილი"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "პროგრესი"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "საზიარო სკალა:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "ჩამოტვირთვა"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "ატვირთული"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "(0 = შეზღუდვის გარეშე)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, fuzzy, no-c-format
- msgid "O&k"
- msgstr "&ოკ"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "მოდულის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "ფაილის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "მოდულის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "მოდულის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "მოდულის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "ფაილის პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "მოდულები"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, fuzzy, no-c-format
- msgid "Debug"
- msgstr "განბზიკვის რეჟიმი"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, fuzzy, no-c-format
- msgid "Important"
- msgstr "იმპო&რტი"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "IP ფილტრის ფაილი:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "ძიება"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, fuzzy, no-c-format
- msgid "UPnP:"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "ფა&ილები"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "მარცვლები:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, fuzzy, no-c-format
- msgid "InfoWidget:"
- msgstr "ინფორმაციის ელემენტი"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "საერთო პარამეტრები"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "საერთო"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "სხვა IP"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "საძიებო სისტემები"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "საძიებო სისტემის სახელი:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&დამატება"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "სისტემები"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "ყველას &წაშლა"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "ნაგულისხმევის &დამატება"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "GUI-ს განახლების ინტერვალი"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "ძიება"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "საძიებო სისტემა:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "მიმდინარე საძიებო სისტემა"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4074,33 +4074,33 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "%1 ტორენტის შეჩერების შეცდომა : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "%1 ტორენტის გაშვების შეცდომა: %2"
- 
-diff --git a/translations/lt/messages/ktorrent.po b/translations/lt/messages/ktorrent.po
-index 499f9fc..0ad6566 100644
---- a/translations/lt/messages/ktorrent.po
-+++ b/translations/lt/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-09-03 13:21+0300\n"
- "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
- "Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nėra įeinančių prisijungimų (greičiausiai dėl ugniasienės)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informacija"
-@@ -199,7 +199,7 @@ msgstr "Blogas URL"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Atsiuntimai"
-@@ -319,7 +319,7 @@ msgid "Document to open"
- msgstr "Atidaryti dokumentą"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr ""
-@@ -608,7 +608,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -652,7 +652,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -671,7 +671,7 @@ msgid "Malformed IP address."
- msgstr "Blogas URL"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Pasirinkimai"
-@@ -706,7 +706,7 @@ msgid "Advanced"
- msgstr "Sudėtingesnės"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Sudėtingesnės parinktys"
-@@ -717,7 +717,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Būsena"
-@@ -739,7 +739,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr ""
-@@ -867,7 +867,7 @@ msgid "User"
- msgstr "Naudotojas"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr ""
-@@ -1065,8 +1065,8 @@ msgid "Start torrent"
- msgstr "Stabdyti dokumento krovimą"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Parsisiųsti"
-@@ -1126,13 +1126,13 @@ msgid "Encryption"
- msgstr "Šifravimas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1140,20 +1140,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1161,169 +1161,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Sistemos dėklo ženkliukas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, fuzzy, no-c-format
- msgid "Folders"
- msgstr "Aplankai"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Aplankas, kuriame K3b laiko laikinas bylas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, fuzzy, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "A&utomatiškai pažymės ženkliukus"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Esama byla"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Stabdyti dokumento krovimą"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Maksimalus bitų kiekis per sekundę:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Maksimalus bitų kiekis per sekundę:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Prievadas:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Esama byla"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1331,187 +1331,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Iš&valyti"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Įrašyti &kaip..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Takeliai"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, fuzzy, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maksimalus bitų kiekis per sekundę:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Dydžių santykis:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, fuzzy, no-c-format
- msgid "UDP tracker port:"
- msgstr "Popieriaus formatas:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Dydžių santykis:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Dėmesio"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1519,283 +1519,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, fuzzy, no-c-format
- msgid "Status:"
- msgstr "Būsena:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "Takelis"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, fuzzy, no-c-format
- msgid "Share ratio:"
- msgstr "Dydžių santykis:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, fuzzy, no-c-format
- msgid "Torrent"
- msgstr "Esama byla"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, fuzzy, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, fuzzy, no-c-format
- msgid "C&ancel"
- msgstr "Atš&aukti"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, fuzzy, no-c-format
- msgid "Create Torrent"
- msgstr "Sukurtas:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Turite nurodyti bent vieną spausdintuvą."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, fuzzy, no-c-format
- msgid "Size of each chunk:"
- msgstr "Fono krepšio dydis:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, fuzzy, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, fuzzy, no-c-format
- msgid "256"
- msgstr "16"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, fuzzy, no-c-format
- msgid "512"
- msgstr "12"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, fuzzy, no-c-format
- msgid "1024"
- msgstr "224"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, fuzzy, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Stabdyti dokumento krovimą"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, fuzzy, no-c-format
- msgid "Comments:"
- msgstr "Komentarai:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "&Sukurti"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, fuzzy, no-c-format
- msgid "Ca&ncel"
- msgstr "A&tšaukti"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, fuzzy, no-c-format
- msgid "Trackers"
- msgstr "Takeliai"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Vardas:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Prievadas"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1803,19 +1803,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Sinchronizavimo pasirinkimai"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1831,427 +1831,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "&Numatytasis paieškos variklis:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Pasirinkimai"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Žemas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Vidutinis"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Aukštas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, fuzzy, no-c-format
- msgid "GUI update interval:"
- msgstr "Tik &kitas šablonas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Tinklai"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Popieriaus formatas:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Testas"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Aplankas, kuriame K3b laiko laikinas bylas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "A&utomatiškai pažymės ženkliukus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, fuzzy, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Aplankas, kuriame reikia generuoti bylas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "A&utomatiškai pažymės ženkliukus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Aplankas, kuriame reikia generuoti bylas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "A&utomatiškai pažymės ženkliukus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Aplankas, kuriame K3b laiko laikinas bylas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, fuzzy, no-c-format
- msgid "GUI update interval"
- msgstr "Tik &kitas šablonas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2259,271 +2259,271 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Priedų tvarkyklė"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Įkelti"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, fuzzy, no-c-format
- msgid "Device"
- msgstr "Įrenginys"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Nepavyksta atidaryti bylos %1."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Sinchronizavimo pasirinkimai"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Esama byla"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "Sinchronizavimo pasirinkimai"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr ""
-@@ -2535,254 +2535,254 @@ msgstr ""
- "Pasirinkti nieko"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Naudotojo vardas:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Bendros parinktys"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, fuzzy, no-c-format
- msgid "Chunks"
- msgstr "Chorus"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, fuzzy, no-c-format
- msgid "Total:"
- msgstr "Iš viso:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "Esama eilutė:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, fuzzy, no-c-format
- msgid "Excluded:"
- msgstr "I&šskyrus ruožą:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, fuzzy, no-c-format
- msgid "Size:"
- msgstr "Dydis:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Eiga"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, fuzzy, no-c-format
- msgid "Seeders:"
- msgstr "Siuntėjas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, fuzzy, no-c-format
- msgid "Leechers:"
- msgstr "SSL šifras:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "Vidutinis"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "Vidutinis"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, fuzzy, no-c-format
- msgid "Next update in:"
- msgstr "Tik &kitas šablonas"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Takeliai"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Valandos"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Takelis"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Takelis"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Takelis"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Takelis"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr ""
-@@ -2800,79 +2800,79 @@ msgstr ""
- "numatytas"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, fuzzy, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Esama eilutė:"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Pasirinkimai"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Esama byla"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Esama byla"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Tik atsiųsti"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2880,25 +2880,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, fuzzy, no-c-format
- msgid "Converting..."
- msgstr "Valoma %1..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2907,61 +2907,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Atnaujinti"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Tik &kitas šablonas"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Tiksliai"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2970,804 +2970,804 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Įkelti"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Tik atsiųsti"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "Esama byla"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importuoti"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "įprastas"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Kanalai"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Ištrinti"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Naujas"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Atnaujinti"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "Ant&raštė"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Filtrai"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Eiga"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Dydžių santykis:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&stas"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normalus"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorijos"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "Parsisiųsti"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Išsaugoti į bylą"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, fuzzy, no-c-format
- msgid "O&k"
- msgstr "Ge&rai"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Bylos parinktys"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Priedai"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Visi"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Išriktuoti"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Svarbus"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nieko"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Pasirinkimai"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "Ieškoti:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Visos bylos"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "Siuntėjas:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Bendros parinktys"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "Bendra"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "&Iškoti kanalų"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "Ieškoti &paslaugų teikėjo vardą:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, fuzzy, no-c-format
- msgid "&Add"
- msgstr "&Pridėti"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, fuzzy, no-c-format
- msgid "Engines"
- msgstr "Anglų"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, fuzzy, no-c-format
- msgid "R&emove All"
- msgstr ""
-@@ -3781,7 +3781,7 @@ msgstr ""
- "&Pašalinti"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, fuzzy, no-c-format
- msgid "Add Defau&lt"
- msgstr ""
-@@ -3799,38 +3799,38 @@ msgstr ""
- "numatytas"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "Tik &kitas šablonas"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Ieškoti"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, fuzzy, no-c-format
- msgid "Search engine:"
- msgstr "Ieškoti &tik:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, fuzzy, no-c-format
- msgid "Current search engine"
- msgstr "&Numatytasis paieškos variklis:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4126,34 +4126,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "Nepavyksta atidaryti bylos %1."
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "Nepavyksta atidaryti bylos %1."
-diff --git a/translations/ms/messages/ktorrent.po b/translations/ms/messages/ktorrent.po
-index 5103563..68cb285 100644
---- a/translations/ms/messages/ktorrent.po
-+++ b/translations/ms/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-02-13 12:57+0730\n"
- "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
- "Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
-@@ -17,7 +17,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Maklumat"
-@@ -205,7 +205,7 @@ msgstr "URL Autokonfigurasi:"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr ""
-@@ -325,7 +325,7 @@ msgid "Document to open"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -618,7 +618,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -666,7 +666,7 @@ msgid "Add to Group"
- msgstr "Tambah Bar Alatan ke '%1'"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -685,7 +685,7 @@ msgid "Malformed IP address."
- msgstr "URL Autokonfigurasi:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Keutamaan"
-@@ -720,7 +720,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Opsyen Sistem Fail"
-@@ -731,7 +731,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -755,7 +755,7 @@ msgstr "Tetapan berjaya dimuatnaik"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, fuzzy, no-c-format
- msgid "Down Speed"
- msgstr "Kelajuan Failover"
-@@ -884,7 +884,7 @@ msgid "User"
- msgstr "Pengguna"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, fuzzy, no-c-format
- msgid "Queue Manager"
- msgstr "Pengurus Pencetak"
-@@ -1080,8 +1080,8 @@ msgid "Start torrent"
- msgstr "Fail torrent awam"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, fuzzy, no-c-format
- msgid "Download"
- msgstr "Muat Turun"
-@@ -1135,13 +1135,13 @@ msgid "Encryption"
- msgstr "Huraian"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, fuzzy, no-c-format
- msgid "Use protocol encryption"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1149,20 +1149,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1170,169 +1170,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, fuzzy, no-c-format
- msgid "Custom IP"
- msgstr "%1 (widget tersendiri)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Namahos atau Alamat IP/Subnet:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Namahos atau Alamat IP/Subnet:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Comment=Pengurus Sistem Kawalan Versi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Aplet Amaran Dulang Sistem"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Aplet Amaran Dulang Sistem"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, fuzzy, no-c-format
- msgid "Folders"
- msgstr "Lo-Fi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Muat Turun"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, fuzzy, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Berbalik ke yang Ter_akhir Disimpan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Fail torrent awam"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, fuzzy, no-c-format
- msgid "Download Toolbar"
- msgstr "Tambah Bar Alatan"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Fail torrent awam"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "<b>Kadar Ke_segaran Menegak:</b>"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "<b>Kadar Ke_segaran Menegak:</b>"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "(tiada tetikus dikonfigurasikan)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, fuzzy, no-c-format
- msgid "Add potential peer"
- msgstr "Tambah Bar Alatan ke '%1'"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Alamat rakan jauh:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Fail torrent awam"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1340,187 +1340,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, fuzzy, no-c-format
- msgid "Add peer:"
- msgstr "Tambah Bar Alatan"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, fuzzy, no-c-format
- msgid "Maximum downloads:"
- msgstr "Volum Logikal Maksimum:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, fuzzy, no-c-format
- msgid "Maximum seeds:"
- msgstr "Volum Logikal Maksimum:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "$prog tidak dimulakan..."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "$prog tidak dimulakan..."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, fuzzy, no-c-format
- msgid "(0 is no limit)"
- msgstr "(tiada tetikus dikonfigurasikan)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, fuzzy, no-c-format
- msgid "Maximum download rate:"
- msgstr "<b>Kadar Ke_segaran Menegak:</b>"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Nama Perkongsian"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, fuzzy, no-c-format
- msgid "Number of upload slots:"
- msgstr "Papar nombor baris"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, fuzzy, no-c-format
- msgid "UDP tracker port:"
- msgstr "Amerika/Port_of_Spain"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Nama Perkongsian"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, fuzzy, no-c-format
- msgid "Maximum upload rate:"
- msgstr "<b>Kadar Ke_segaran Menegak:</b>"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(tiada tetikus dikonfigurasikan)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, fuzzy, no-c-format
- msgid "Attention"
- msgstr "Perhatian!"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1528,283 +1528,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, fuzzy, no-c-format
- msgid "KT Queue Dialog"
- msgstr "dialog telah dibatalkan"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "Maklumat penjejak"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, fuzzy, no-c-format
- msgid "Share ratio:"
- msgstr "Nama Perkongsian"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, fuzzy, no-c-format
- msgid "Controlled by"
- msgstr "Diperlukan oleh"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Tetapan berjaya dimuatnaik"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Tetapan berjaya dimuatnaik"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, fuzzy, no-c-format
- msgid "M&ove up"
- msgstr "Menetapkan"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, fuzzy, no-c-format
- msgid "Move dow&n"
- msgstr "/Mudah Alih"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, fuzzy, no-c-format
- msgid "Move to &bottom"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, fuzzy, no-c-format
- msgid "&QM Controlled"
- msgstr "Diperlukan oleh"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, fuzzy, no-c-format
- msgid "&User Controlled"
- msgstr "Edit Pengguna"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, fuzzy, no-c-format
- msgid "Paste URL"
- msgstr "URL Autokonfigurasi:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, fuzzy, no-c-format
- msgid "Create Torrent"
- msgstr "Pemilih torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Anda mesti masukkan sekurang-kurangnya satu Sistem Operasi"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, fuzzy, no-c-format
- msgid "File Options"
- msgstr "Fail Wujud"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, fuzzy, no-c-format
- msgid "Size of each chunk:"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, fuzzy, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Fail torrent awam"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, fuzzy, no-c-format
- msgid "Ca&ncel"
- msgstr "Lokasi sijil CA SSL."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Nama:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "Namahos atau Alamat IP/Subnet:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1812,19 +1812,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Lebih Keutamaan"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1840,427 +1840,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Hasil pencarian bagi "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Keutamaan"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, fuzzy, no-c-format
- msgid "Memory usage:"
- msgstr "penggunaan: %s [pilihan]"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Rendah"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Sederhana"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Tinggi"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, fuzzy, no-c-format
- msgid "GUI update interval:"
- msgstr "Pereka GUI KDE"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Amerika/Port_of_Spain"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, fuzzy, no-c-format
- msgid "Number of chunks found :"
- msgstr "Papar nombor baris"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, fuzzy, no-c-format
- msgid "Show a system tray icon"
- msgstr "Aplet Amaran Dulang Sistem"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Aplet Amaran Dulang Sistem"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Berbalik ke yang Ter_akhir Disimpan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Berbalik ke yang Ter_akhir Disimpan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Berbalik ke yang Ter_akhir Disimpan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Tidak menjumpai fail comps."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, fuzzy, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Hantar kepada Skrip CGI"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, fuzzy, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "Hantar kepada Skrip CGI"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, fuzzy, no-c-format
- msgid "Memory usage"
- msgstr "penggunaan: %s [pilihan]"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, fuzzy, no-c-format
- msgid "GUI update interval"
- msgstr "Pereka GUI KDE"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, fuzzy, no-c-format
- msgid "Support for DHT"
- msgstr "Tetap Buddy untuk %1"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, fuzzy, no-c-format
- msgid "Number of upload slots"
- msgstr "Papar nombor baris"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2268,602 +2268,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, fuzzy, no-c-format
- msgid "Plugin Manager"
- msgstr "Pengurus Pencetak"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, fuzzy, no-c-format
- msgid "Load"
- msgstr "Muatan"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Semua Pakej"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Semua Pakej"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, fuzzy, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Masukkan peranti yang anda hendak guna."
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, fuzzy, no-c-format
- msgid "Detected devices:"
- msgstr "Peranti Rangkaian"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Peranti"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, fuzzy, no-c-format
- msgid "Ports Forwarded"
- msgstr "Port lain"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Port lain"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, fuzzy, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Amerika/Port_of_Spain"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, fuzzy, no-c-format
- msgid "Rescan"
- msgstr "Ulangkesan Pe_ranti"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Tidak menjumpai fail comps."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Lebih Keutamaan"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "Lebih Keutamaan"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "Port lain"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Pilih Partisyen"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "Namapengguna"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, fuzzy, no-c-format
- msgid "Change password ..."
- msgstr "Tukar Susunan Tab"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, fuzzy, no-c-format
- msgid "Port number"
- msgstr "Nombor baris:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "Port lain"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Pilihan Umum"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, fuzzy, no-c-format
- msgid "username"
- msgstr "Namapengguna"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, fuzzy, no-c-format
- msgid "password"
- msgstr "Katalaluan"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, fuzzy, no-c-format
- msgid "Total:"
- msgstr "Jumlah   :"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "Muatturun pakej `%s' (%s/%s)..."
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, fuzzy, no-c-format
- msgid "Downloaded:"
- msgstr "Pakej sudah dimuatturun"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Saiz:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Perkembangan"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, fuzzy, no-c-format
- msgid "Peer"
- msgstr "Alamat rakan jauh:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "Kelajuan Failover"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "Kelajuan Failover"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, fuzzy, no-c-format
- msgid "Next update in:"
- msgstr "Naikkan halaman berikut '%2'"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Maklumat penjejak"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Perkongsian"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Hantar kepada Skrip CGI"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Tambah Bar Alatan ke '%1'"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Maklumat penjejak"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Maklumat penjejak"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, fuzzy, no-c-format
- msgid "Show list of peers"
- msgstr "Papar nombor baris"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, fuzzy, no-c-format
- msgid "Show list of trackers"
- msgstr "Papar nombor baris"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Lebih Keutamaan"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Lokaliti Tapisan Efektif"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, fuzzy, no-c-format
- msgid "IP filter file:"
- msgstr "Comment=Fail Projek KDevelop"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Tukar Teks ke Postscript"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2871,25 +2871,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, fuzzy, no-c-format
- msgid "Level1 filter url"
- msgstr "Kaedah Url tidak diketahui %s"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, fuzzy, no-c-format
- msgid "Use level1 filter?"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2898,61 +2898,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Sumber Cakera Kemaskini"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Volum Logikal Maksimum:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Volum Logikal Maksimum:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2961,847 +2961,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Alamat rakan jauh:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Aplet Amaran Dulang Sistem"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Tetapan berjaya dimuatnaik"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Pemilih torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, fuzzy, no-c-format
- msgid "Import an existing download"
- msgstr "Muatturun fail BitTorrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "Torrent"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "default"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, fuzzy, no-c-format
- msgid "&New"
- msgstr "Baru"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, fuzzy, no-c-format
- msgid "&Title"
- msgstr "Tajuk"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Pemindahan Fail (FTP)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "kemaskini semua fail tetapan"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Name=Proses berjaya"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Nama Perkongsian"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, fuzzy, no-c-format
- msgid "Left click category"
- msgstr "Klik pada borang untuk memasukkan %1..."
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, fuzzy, no-c-format
- msgid "Right click category"
- msgstr "Klik pada borang untuk memasukkan %1..."
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Muat Turun"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "Tetapan berjaya dimuatnaik"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "(tiada tetikus dikonfigurasikan)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, fuzzy, no-c-format
- msgid "Save to file"
- msgstr "Dokumen yang hendak dibuka"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, fuzzy, no-c-format
- msgid "&Load from file"
- msgstr "Comment=Fail Projek KDevelop"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, fuzzy, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, fuzzy, no-c-format
- msgid "Edit s&chedule"
- msgstr "Ubah sambungan..."
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Opsyen RAID"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Opsyen Sistem Fail"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Opsyen RAID"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Opsyen RAID"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Opsyen RAID"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Opsyen Sistem Fail"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugin"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Semua"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Nyahpepijat"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Pemindahan Fail (FTP)"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "Cari"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "Opsyen Sistem Fail"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, fuzzy, no-c-format
- msgid "InfoWidget:"
- msgstr "<i>info_label</i>"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Pilihan Umum"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "Umum"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, fuzzy, no-c-format
- msgid "Connections:"
- msgstr "Ubah sambungan..."
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, fuzzy, no-c-format
- msgid "Use default browser"
- msgstr "Guna Hint Saiz"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "Comment=Projek Tersendiri"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "Tapi_san pencarian:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "Name=KDevelop: KDE/C++"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, fuzzy, no-c-format
- msgid "&Add"
- msgstr "Tambah Bar Alatan"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, fuzzy, no-c-format
- msgid "R&emove All"
- msgstr "Laras Semua..."
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, fuzzy, no-c-format
- msgid "Add Defau&lt"
- msgstr "Tambah Bar Alatan ke '%1'"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Cari"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, fuzzy, no-c-format
- msgid "Search engine:"
- msgstr "Tapi_san pencarian:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, fuzzy, no-c-format
- msgid "Current search engine"
- msgstr "Hasil pencarian bagi "
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, fuzzy, no-c-format
- msgid "Use custom browser"
- msgstr "Comment=Projek Tersendiri"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4111,34 +4111,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "Name=Ralat proses"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "Name=Ralat proses"
-diff --git a/translations/nb/messages/ktorrent.po b/translations/nb/messages/ktorrent.po
-index 5cff1e5..904b99d 100644
---- a/translations/nb/messages/ktorrent.po
-+++ b/translations/nb/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-10-23 01:56+0200\n"
- "Last-Translator: Alexander Nicolaysen Sørnes <alex@thehandofagony.com>\n"
- "Language-Team:  <nb@li.org>\n"
-@@ -18,7 +18,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Ingen innkommende forbindelser (brannmur?)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informasjon"
-@@ -186,7 +186,7 @@ msgstr "Misformet URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Nedlastinger"
-@@ -310,7 +310,7 @@ msgid "Document to open"
- msgstr "Dokument som skal åpnes"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -579,7 +579,7 @@ msgstr "Strømmens kilder for personer:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -621,7 +621,7 @@ msgid "Add to Group"
- msgstr "Legg til gruppe"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Fartsgrenser"
-@@ -639,7 +639,7 @@ msgid "Malformed IP address."
- msgstr "Misformet IP-adresse."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Innstillinger"
-@@ -675,7 +675,7 @@ msgid "Advanced"
- msgstr "Avansert"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Avanserte innstillinger"
-@@ -686,7 +686,7 @@ msgstr "Synlige kolonner"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -708,7 +708,7 @@ msgstr "Lastet opp"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Nedhastighet"
-@@ -832,7 +832,7 @@ msgid "User"
- msgstr "Bruker"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Købehandler"
-@@ -1053,8 +1053,8 @@ msgid "Start torrent"
- msgstr "Start strøm"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Last ned"
-@@ -1108,13 +1108,13 @@ msgid "Encryption"
- msgstr "Kryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Bruk protokollkryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1124,20 +1124,20 @@ msgstr ""
- "farten på BitTorrent-forbindelser."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Tillat ukrypterte forbindelser"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr "Hvis dette er av kan du kun koble til klienter som støtter kryptering."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1147,169 +1147,169 @@ msgstr ""
- "<br>Protokoll for desentralisert deling. Se manualen for mer informasjon."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "Br&uk DHT for å få flere likemenn"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-port for DHT-kommunikasjon:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Selvvalgt IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Sen&d selvvalgt IP eller vertsnavn til sporeren"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Selvvalgt IP eller vertsnavn:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikon i systemkurven"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Vis ikon i s&ystemkurven"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Vis &fartslinje i systemkurven."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Vis sprettoppmeldinger i systemkurven"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Båndbredde for opplastinger (i KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Båndbredde for nedlastinger (i KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Mapper"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Katalog for lagring av midlertidige filer:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Flytt ferdige nedlastinger til:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "L&agre nedlastinger automatisk til:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopier .torrent-filer til:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Nedlastingsverktøylinje"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Sett fartsgrense for denne strømmen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Høyeste opplastingshastighet:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Høyeste nedlastingshastighet:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 = ubegrenset)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Legg til mulig person"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Personens IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Skriv inn personens IP og port."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrents svarteliste"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1319,187 +1319,187 @@ msgstr ""
- "oppføringene eller bruk IP-filtermodulen (Personvokter)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Bannlyste personer"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Personens IP-adresse"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Legg til person:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Legger en person til i svartelisten"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Fjerner valgte person fra svartelisten"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Tøm"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Tømmer listen"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "L&agre som . . ."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Lagre denne svartelista for bruk med KTorrents IP-filtermodul"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Høyeste antall nedlastinger:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Høyeste antall frø:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Start nedlasting med lite displass:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minste diskplass:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Ikke start"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Alltid spør"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Tving start"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = ubegrenset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Høyeste nedlastingshastighet:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Begrensning av totale forbindelser:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Høyeste delingstid:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Høyeste antall forbindelser per strøm:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Antall opplastingsplasser:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP-sporerport:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Høyeste delingsforhold:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Høyeste opplastingshastighet:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 = ubegrenset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Timer (0 = ubegrenset)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Fortsett å dele etter at nedlasting er ferdig"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Følg med"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1509,283 +1509,283 @@ msgstr ""
- "gjøre dette for deg."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT kødialog"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Sporer:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Delingsforhold:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Byte igjen:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Strøm"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontrollert av"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Oppla&stinger"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Lastet opp:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Flytt &opp"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Flytt &ned"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Flytt øverst"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Flytt til &bunnen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&Kontrollert av købehandleren"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Br&ukerkontrollert"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Lim inn URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Avbryt"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Lag strøm"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Fila eller katalogen du vil lage en strøm av:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Du må legge til minst én sporer eller node."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Filinnstillinger"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Størrelse på hver bit:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Starte delin&g av strømmen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "&Desentralisert (kun DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privat strøm (DHT ikke tillat)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentarer:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "L&ag"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Avbryt"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Sporere"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT-noder"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Node:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP eller vertsnavn"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1795,19 +1795,19 @@ msgstr ""
- "inn din egen IP-adresse og port også hvis du vil dele denne strømmen."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Avanserte innstillinger"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1834,431 +1834,431 @@ msgstr ""
- "X antall prøver"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Gjeldende fart"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Total gjennomsnittsfart"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Utvalgte prøver"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Flyttende gjennomsnitt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(tar effekt etter omstart)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Ytelse"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Minnebruk:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Lavt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Middels"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Høyt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Oppdateringsintervall for grensesnittet:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Datakontroll"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Ikke kontroller biter større en&n dette ved opplasting"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "&Kontroller data etter"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "korrupte biter"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Nettverk"
- 
- # | msgid "Maximum number of connections per torrent (0 = no limit)"
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Høyeste antall forbindelser per strøm (0 = ubegrenset)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, fuzzy, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Ikke bruk KDE-&mellomtjeneren for HTTP-sporerforbindelser"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Mellomtjener for HTTP-sporer:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Undersøker data"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Undersøker data for strømmen:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Antall biter funnet:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Antall biter som feilet/ikke ble lastet ned:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Høyeste antall nedlastinger (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Høyeste antall frø (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Høyeste antall forbindelser per strøm (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Høyeste antall forbindelser alle strømmer (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Høyeste opplastingshastighet i KB/s (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Høyeste nedlastingshastighet i KB/s (0 = ingen grense)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Høyeste delingsforhold (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Høyeste delingsforhold (0 = ubegrenset)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Vis ikon i systemkurven"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Vis fartslinje i systemkurven"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Båndbredde for nedlastinger (i KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Båndbredde for opplastinger (i KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Vis sprettoppmeldinger når en strøm er ferdig."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Fortsett å dele etter at nedlasting er ferdig"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Katalog for lagring av midlertidige filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Hvorvidt nedlastinger automatisk skal lagres i standard nedlastingskatalog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Katalog for lagring av nedlastede filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Hvorvidt nedlastinger automatisk skal lagres i standard nedlastingskatalog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Katalog for lagring av nedlastede filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Hvorvidt nedlastinger automatisk skal lagres i standard nedlastingskatalog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Katalog for lagring av midlertidige filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Hvorvidt sporeren skal gis en selvvalgt IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP som skal gis til sporeren"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Minnebruk"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Oppdateringsintervall for grensesnittet"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Støtte for DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT-port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Antall opplastingsplasser"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Kolonner som vises i KTorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2266,457 +2266,457 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Tilleggsbehandler"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Slå på"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Slå &av"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Slå på alle"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Slå av alle"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Standard UPnP-enhet"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Oppdagete enheter:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Enhet"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Videresendte porter"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-forbindelse"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "&Videresend porter"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Angre videresending av porter"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Søk på nytt"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Skru på undersøking av mappe1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Skru på undersøking av mappe2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Skru på undersøking av mappe3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Sti til «mappe1»"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Sti til «mappe2»"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Sti til «mappe3»"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Hvorvidt strømmer skal åpnes stille eller ikke."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Slettehandling på."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Flyttehandling på."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Innstillinger for mappeundersøking"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Undersøk mappe &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt + 1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Undersøk mappe &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt + 2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Undersøk mappe &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt + 3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Flytt til «lastet»-katalog etter l&asting"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Flytt strøm til «lastet»-katalogen etter den er lastet"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "&Åpne strømmer stille"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Ikke vis vinduet for velging av hvilke filer som skal lastes ned"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Slett etter lastin&g"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Sletter strøm etter lasting"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Mapper å undersøke"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Mappe 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Mappe 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Mappe 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Søkeinnstillinger"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Internettjener"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Videresend port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Økt-TTL (i sekunder)"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Velg tilkobling"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Brukernavn:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Endre passord . . ."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Sti til PHP-programfilen:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "videresend port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Levetid for økten"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "tema for brukergrensesnittet"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "sti til PHP-programfilen"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "brukernavn"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "passord"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Biter"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Totalt:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Laster ned nå:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Lastet ned:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Ekskludert:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Igjen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Størrelse:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Klump"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Framgang"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Person"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Oppnevnte personer"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Delere:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Nedlastere:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Gjennomsnittsfart ned:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Gjennomsnittsfart opp:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Neste oppdatering om:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Sporerstatus:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Delene av strømmen som er lastet ned:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Delene av strømmen som er tilgjengelige:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Deler"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2725,7 +2725,7 @@ msgstr ""
- "ingen grense."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, fuzzy, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2733,139 +2733,139 @@ msgstr ""
- "ingen grense."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "Begrensning av totale forbindelser:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Begrensning virker bare i delemodus"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "Br&uke grense?"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Oppd&ater sporer"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minste oppdateringsintervall – 60 sekunder"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Legg til spore&r"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Fjern sporer"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "E&ndre sporer"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Bruk standardverdier"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Vis personvisningsfane i hovedvinduet"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Vis fane for bitnedlastingsvisning i hovedvinduet"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Vis sporerfane i hvoedvinduet"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Vis liste over personer"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Vis liste over &biter som lastes ned nå"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Vis liste over sporere"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Innstillinger for IP-blokkering"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Velg filterfil for Personbeskytteren "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Bruke Personbeskytter-filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP-filterfil:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Lastet &ned/Konverter"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2875,25 +2875,25 @@ msgstr ""
- "MERK: ZIP-fil fra bluetack.co.uk er støttet."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL til Nivå1-filter"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Bruke Nivå1-filter?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konverterer . . ."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2905,61 +2905,61 @@ msgstr ""
- "bruke KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Oppdateringsintervall for grensesnittet"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Høyeste antall frø:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Høyeste antall frø:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2968,847 +2968,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "Personer"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Personens IP:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "Forbindelser:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Vis fartslinje i systemkurven"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Opplastinger"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "Forbindelser:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Personer"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Last ned strøm"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "Flagg for forbindelsesmeldinger"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Import av eksisterende nedlasting"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Strøm:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Oppgi strømmen og dataene som allerede er lastet ned for den strømmen."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importer"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "standard"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-strømmer"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Strømmer"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "S&lett"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Ny"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artikler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Autooppdate&ring"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "&Overse TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Oppdater"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Tittel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Behold artikler (dager)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiv"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtre"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Godta filtre"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Avlså filtre"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Regulære uttrykk"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Behandle som en &Serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Behandle"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Seriekriterier"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, fuzzy, no-c-format
- msgid "Match Without Episode"
- msgstr "Last ned treff uten episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Høyeste episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Høyeste sesong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Minste sesong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Minste episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "&Testtekst"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtertreff"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Båndbreddeplanlegger"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Venstreklikk på kategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategor&i 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Slå av"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategori &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategori &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Høyreklikk på kategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategori &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategori 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorier"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "Last ned:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "Last opp:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s "
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* null betyr ubegrenset"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Lagre til fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Last inn fra fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Tilbakestill timeplan"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Innstillinger for planleggertilleggsmodulen"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "&Bruke båndbreddeplanlegger?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Båndbreddeplanlegger"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Bruke farger i stedet for bildekar&t?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Anbefalt for treige maskiner)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "R&ediger timeplan"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Slå på båndbreddeplanlegger?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Bruke farger i stedet for bildekart?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Bruk rik loggtekst"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Flagg for generelle infomeldinger"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Flagg for forbindelsesmeldinger"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Flagg for DHT-meldinger"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Flagg for meldinger om sporerinfo"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Flagg for meldinginger om lesing/skriving"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Flagg for meldinger fra IP-filtermodulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Flagg for meldinger fra søkemodulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Flagg for meldinger fra filimport-modulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Flagg for meldinger fra infomodulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Flagg for meldinger fra UPnP-modulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Flagg for meldinger fra katalogundersøkingsmodulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Flagg for meldinger fra planleggingsmodulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Innstilling for meldinger fra RSS-modulen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Innstilling for meldinger fra nettgrensesnitt-modulen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Innstillinger for loggviseren"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Tilleggsmoduler"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Alle"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Feilsøking"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Notis"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Viktig"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ingen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Søk:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Mappeundersøker:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planlegger:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Filimportmodul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Infomodul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-modul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Intermettgrensesnitt-modul"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "System"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Generelt"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Forbindelser:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk I/U:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Bruk &rik tekst for logg"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Ekstern nettleser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, fuzzy, no-c-format
- msgid "Open searches in external browser"
- msgstr "&Åpne søkeresultater i ekstern nettleser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Bruk standard nettleser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Sti til selvvalgt nettleser:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Søkemotorer"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Navn på søkemotor:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Legg til"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motorer"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Fj&ern alle"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Legg til standard"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Oppdater fra Internett"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Søk"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Søkemotor:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Gjeldende søkemotor"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Bruk egendefinert nettleser"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Sti til programfilen for den egendefinerte nettleseren"
-@@ -4097,19 +4097,19 @@ msgstr "Kontrollerer data"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr "Du vil miste all data du har lastet ned. Er du sikker?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4117,16 +4117,16 @@ msgstr ""
- "Strømmen «%1» har nådd sitt høyeste delingsforhold. Ignorere grensen og starte "
- "deling uansett?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Nådde grense for høyeste delingsforhold."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Klarte ikke stoppe strømmen «%1»: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Klarte ikke starte strømmen «%1»: %2"
- 
-diff --git a/translations/nds/messages/ktorrent.po b/translations/nds/messages/ktorrent.po
-index 58c347e..df5887a 100644
---- a/translations/nds/messages/ktorrent.po
-+++ b/translations/nds/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-12-07 22:58+0100\n"
- "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
- "Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n"
-@@ -20,7 +20,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Keen ankamen Verbinnen (vun Nettdiek blockeert?)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -188,7 +188,7 @@ msgstr "Leeg Adress."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Daalladen"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Dokment, dat opmaakt warrn schall"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -576,7 +576,7 @@ msgstr "Borns för Torrent-Partners:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "VPT"
-@@ -618,7 +618,7 @@ msgid "Add to Group"
- msgstr "Na Koppel tofögen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Gauheit-Grenzen"
-@@ -638,7 +638,7 @@ msgid "Malformed IP address."
- msgstr "Leeg IP-Adress."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Instellen"
-@@ -674,7 +674,7 @@ msgid "Advanced"
- msgstr "Verwiedert"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Verwiedert Optschonen"
-@@ -685,7 +685,7 @@ msgstr "Sichtbor Striepen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -707,7 +707,7 @@ msgstr "Hoochlaadt"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Daallaadgauheit"
-@@ -830,7 +830,7 @@ msgid "User"
- msgstr "Bruker"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Reegpleger"
-@@ -1057,8 +1057,8 @@ msgid "Start torrent"
- msgstr "Torrent starten"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Daalladen"
-@@ -1112,13 +1112,13 @@ msgid "Encryption"
- msgstr "Verslöteln"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Protokollverslöteln bruken"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1128,13 +1128,13 @@ msgstr ""
- "Bittorrentverbinnen langsamer maakt."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Nich verslötelt Verbinnen tolaten"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1143,7 +1143,7 @@ msgstr ""
- "ünnerstütt."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1154,169 +1154,169 @@ msgstr ""
- "in't Handbook finnen."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "Över VPT mehr Partners in de &Künn kriegen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-Port för de VPT-Kommunikatschoon:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Egen IP-Adress"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Den Tracker en egen IP-Adress oder Reeknernaam to&stüern"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Egen IP-Adress oder Reeknernaam:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Systeemafsnitt-Lüttbild"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "&Systeemafsnitt-Lüttbild wiesen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "&Gauheit binnen Systeemafsnitt wiesen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Systeemafsnitt gifft Bescheed"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Hoochlaad-Bandbred (as kB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Daallaad-Bandbreed (as kB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Ornern"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Orner för't Sekern vun Temporeerdateien:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Afslaten Daalladen verschuven na:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Daalladen &automaatsch sekern na:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Torrent-Dateien koperen na:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Daallaad-Warktüüchbalken"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Gauheit-Grenzen för Torrent fastleggen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Hööchst Hoochlaadgauheit:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Hööchst Daallaadgauheit:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "kB/s (0 = ahn Grenz)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "In Fraag kamen Partner tofögen"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Partner-IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Giff bitte de IP-Adress un de Port vun den Partner in."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent-Leeglist"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1326,187 +1326,187 @@ msgstr ""
- "Indrääg sekern un laden, oder dat IPFilter-Moduul (\"PeerGuardian\") bruken."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Utslaten Partners"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Partner-IP"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Partner tofögen:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Föögt en Partner na de Leeglist to."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Maakt den utsöchten Partner ut de Leeglist weg."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Leddig maken"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Maakt de List leddig"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Sekern &as..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Disse Leeglist för dat IPFilter-Moduul vun KTorrent sekern"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Hööchsttall Daalladen:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Hööchsttall Verdelen:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Daalladen bi wenig Platz op de Fastplaat starten:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minn Platz op de Fastplaat:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Nich starten"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Jümmers nafragen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Start verdwingen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = keen Grenz)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Hööchst Daallaadgauheit:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Globaal Verbinnengrenz:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Hööchst Verdeeltiet:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Hööchsttall vun Verbinnen per Torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Tall vun Hoochlaad-Plätz:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP-Trackerport:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Hööchst Deel-Proportschoon:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Hööchst Hoochlaadgauheit:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "kB/s (0 = ahn Grenz)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Stünnen (0 = keen Grenz)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Wieder hoochladen, wenn en Daalladen beendt is"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Wohrscho"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1516,283 +1516,283 @@ msgstr ""
- "sittst. Dat UPnP-Moduul kann dat för Di doon."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Töövreeg-Dialoog vun KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "VPT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Deel-Proportschoon:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Övrige Bytes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Stüert dör"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Hoochladen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Hoochlaadt:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Na &baven verschuven"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Na &nerrn verschuven"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Na baven verschuven"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Na &nerrn verschuven"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&RP-stüert"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Brukerstüert"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Adress infögen"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "Adress:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&OK"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Afbreken"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent opstellen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "De Datei oder Orner, för de(n) Du en Torrent opstellen wullt:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Du muttst tominnst een Tracker oder Knütt tofögen."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Datei-Optschonen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Grött vun elk Stück:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "kB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Torrent-&Verdelen starten"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Ver&deelt (bloots VPT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privaat Torrent (VPT nich tolaten)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentaren:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Opstellen"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Afbreken"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackers"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "VPT-Knütten"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Knütt:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP-Adress oder Reeknernaam"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1802,19 +1802,19 @@ msgstr ""
- "egen IP-Adress un Port to, wenn Du dissen Torrent verdelen wullt."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Verwiedert Instellen"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1840,344 +1840,344 @@ msgstr ""
- "<b>Glieden Dörsnitt:</b> Glieden Dörsnitt-Gauheit, utreekt ut x Proven"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Aktuell Gauheit"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Globaal Dörsnitt-Gauheit"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "X Stickproven"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Glieden Dörsnitt"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(warrt na en Niegstart övernahmen)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "&Plaatplatz nich vörweg toornen"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Platz op de Fastplaat &vörweg heel toornen (verhöödt Deeldateien)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Eenfach (langsam)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Na Dateisysteem"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Leisten"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Spiekerbruuk:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Siet"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Middel"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Hooch"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Böversiet-Opfrischtiet:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Gau CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Langsam CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Datenprööv"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Bi't Hoochladen &keen Stücken nieg pröven, de grötter sünd as"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Daten&integriteet pröven na"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "schaadhaftig Stücken"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Nettwark"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Hööchsttall för nieg Verbinnen:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP för IP-Paketen:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "KDE-Pro&xyinstellen nich för HTTP-Trackerverbinnen bruken"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Proxy för HTTP-Tracker:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Daten warrt dörkeken"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Torrent-Daten warrt dörkeken:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Tall vun funnen Stücken:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Tall vun fehlslaan / nich daallaadt Stücken:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Utproberen"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "Textbeteker 2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "Textbeteker 3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Hööchsttall vun Daalladen (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Hööchsttall vun Verdelen (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Daalladen starten, wenn dat to wenig free Platz op de Fastplaat gifft?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Hööchsttall vun Verbinnen per Torrent (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Hööchsttall vun Verbinnen för all Torrents (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Hööchst Hoochlaadgauheit in kB/s (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Hööchst Daallaadgauheit in kB/s (0 = ahn Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Hööchst Deel-Proportschoon (0 = keen Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Hööchst Verdeeltiet (0 = keen Grenz)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Systeemafsnitt-Lüttbild wiesen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Gauheit binnen Systeemafsnitt wiesen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Daallaad-Bandbreed (as kBit/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Hoochlaaden-Bandbreed (as kBit/s)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Opduker wiesen, wenn en Torrent beendt is."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Wieder hoochladen, wenn en Torrent beendt is"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Orner för't Sekern vun Temporeerdateien"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Gifft an, wat Daalladen automaatsch na den Spiekerorner sekert warrn schöölt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Orner för't Sekern vun daallaadt Dateien"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2185,86 +2185,86 @@ msgstr ""
- "warrt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Orner, na den afslaten Daalladen verschaven warrt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Gifft an, wat .torrent-Dateien automaatsch na den Spiekerorner sekert warrt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Orner för't Sekern vun .torrent-Dateien"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Gifft an, wat en egen IP-Adress na den Tracker övergeven warrn schall"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Orner, na den tolest sekert wöör"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP-Adress, de na den Tracker övergeven warrt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Spiekerbruuk"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Böversiet-Opfrischtiet"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Ünnerstütten för VPT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "VPT-Port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Tall vun Hoochlaad-Plätz"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Striepen binnen KTorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Tiet-Estemeeralgoritmus"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2274,458 +2274,458 @@ msgstr ""
- "op de Fastplaat lütter is as minDiskSpace, warrt de Torrent anhollen."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Moduulpleger"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Laden"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Afladen"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "&All laden"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "All a&fladen"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Standard-UPnP-Reedschap"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Opdeckt Reedschappen:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Reedschap"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Wiederleddt Porten"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-Verbinnen"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Porten wieder&ledden"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Port-Wiederledden torüchnehmen"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Nieg dörkieken"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Orner 1 dörkieken?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Orner 2 dörkieken?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Orner 3 dörkieken?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Padd na Orner1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Padd na Orner 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Padd na Orner 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr ""
- "Gifft an, wat en Torrent ahn Torüchmellen opmaakt warrn schall oder nich."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Wegdoon-Akschoon pröövt."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Verschuven-Akschoon pröövt."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Instellen för't Dörkieken vun Ornern"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Orner &1 dörkieken"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Orner &2 dörkieken"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Orner &3 dörkieken"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "&Na't Laden na Orner \"Laadt\" verschuven"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Torrent na't Laden na den Orner \"Laadt\" verschuven"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Torrents a&hn Torüchmellen opmaken"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Dialoog \"Dateien för't Daalladen utsöken\" nich wiesen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Na't &Laden wegdoon"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Deit den Torrent na't Laden weg"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Ornern för't Dörkieken"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Orner 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Orner 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Orner 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Söök-Vörinstellen"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Nettserver"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Port wiederledden"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Törn-TTL (in s):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Koppelsteed utsöken:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Brukernaam:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Passwoort ännern..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Padd na dat PHP-Programm:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Port wiederledden"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Törn-Leevtiet"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Koppelsteed-Skin"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Padd na dat PHP-Programm"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "Brukernaam"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "Passwoort"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Stücken"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Tosamen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Opstunns an't Daalladen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Daallaadt:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Utslaten:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Över:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Grött:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Stück"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Vörankamen"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Partner"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Towiest Partners"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Verdelers:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Sugers:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Dörsnittlich Daallaadgauheit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Dörsnittlich Hoochlaadgauheit:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Tokamen Opfrischen in:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Tracker-Status:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Al daallaadt Delen vun den Torrent:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Verföögbor Delen vun den Torrent:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Verdelen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2734,146 +2734,146 @@ msgstr ""
- "hoochlaadt. De Weert \"Null\" bedüüdt \"ahn Grenz\"."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "Wenn Dien Verdeeltiet bi dissen Weert anlangt is, warrt nix mehr hoochlaadt."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Stünnen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Proportschoongrenz:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Ingrenzen funkscheneeert bloots in Verdeel-Bedrief"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Tiet&grenz:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Tracker &opfrischen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Sietst Opfrischtiet - 60 Sekunnen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "&Tracker tofögen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Tracker wegmaken"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Tracker ä&nnern"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Standardweerten wedderherstellen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Partner-Ansicht in't Hööftfinster wiesen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Stück-Daallaadansicht in't Hööftfinster wiesen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Tracker-Ansicht in't Hööftfinster wiesen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Partner-List wiesen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "List mit &opstunns daallaadt Stücken wiesen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Tracker-List wiesen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP-Filterinstellen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "PeerGuardian-Filterdatei utsöken"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardian-Filter bruken?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP-Filterdatei:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "&Daalladen/Ümwanneln"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2884,25 +2884,25 @@ msgstr ""
- "Henwies: Zip-Dateien vun bluetack.co.uk warrt ünnerstütt."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "\"Stoop 1\"-Filteradress"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "\"Stoop 1\"-Filter bruken?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "An't Ümwanneln..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2914,61 +2914,61 @@ msgstr ""
- "disse Tiet lett sik KTorrent nich bruken."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Opfrischen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Diagrammen jümmers opfrischen na"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Böversiet-Opfrischen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Daten jümmers tohoopstellen na"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "Millisekunnen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Hööchstweert"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Gröttst Weert op y-Ass:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Akraat"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Bruuk de \"Wat is dat\"-Hülp, wenn Du mehr weten wullt"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2980,31 +2980,31 @@ msgstr ""
- " - Akraat: Gröttst in't Diagramm sichtbor Gauheit"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Partner-Gauheit"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Partner-Gauheit:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "opfrischen jümmers na"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "Diagrammdaten opfrischen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3012,13 +3012,13 @@ msgstr ""
- "kösten."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Partner-Verbinnen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
-@@ -3026,805 +3026,805 @@ msgstr ""
- "leesbor."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Verdelers in Swärm wiesen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Sugers in Swärm wiesen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Tall vun Meten"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Hoochladen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Verbinnen"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Partners"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Partner-Gauheitdiagrammen an-/utmaken"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Tiet twischen twee Tohoopstellen vun Daten över de Partner-Gauheit"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Dat Wiesen vun Sugers in Swärm an-/utmaken"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Dat Wiesen vun Verdelers in Swärm an-/utmaken"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Tall vun Daallaad-Meten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Tall vun Partnergauheit-Meten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Tall vun Hoochlaad-Meten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Tall vun Verbinnentall-Meten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Tall vun \"DHT\"-Meten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Hööchstweert y-Ass"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Al vörhannen Daalladen importeren"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Daten:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Bitte den Torrent un de för em al daallaadten Daten angeven."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importeren"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "Standard"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-Strööm"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Strööm"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Wegdoon"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nieg"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&Adress"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artikeln"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Auto&maatsch opfrischen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "TTL över&gahn"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Opfrischen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Artikeln wohren (Daag)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiv"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtern"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Annehm-Filtern"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Afwies-Filtern"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Reguleer Utdrück"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "As &Reeg hanteren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Verarbeiden"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Reeg-Markmalen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Resultaten passt ahn Episood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Hööchst Episood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Hööchst Saisong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Sietst Saisong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Sietst Episood"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Te&xt utproberen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "&Utproberen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filter-Resultaten"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Bandbreedplaner"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Linksklick-Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "&Kategorie 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Utmaken"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normaal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategorie &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategorie &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Rechtsklick-Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategorie &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategorie 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorien"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "Daalladen:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "Hoochladen:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "kB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Kategorie</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 bedüüdt \"ahn Grenz\""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "As Datei sekern"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "Ut Datei &laden"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Planer torüchsetten"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&OK"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Instellsiet för't Planer-Moduul"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "&Bandbreedplaner bruken?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Bandbreedplaner"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Klören ansteed &Pixelbiller bruken?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(För langsamer Reekners anraadt)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "&Plaan bewerken"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Bandbreedplaner anmaken?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Klören ansteed Pixelbiller bruken?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Logbooktext formateren"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Narichten-Mark för allgemeen Informatschonen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Narichten-Mark för Verbinnen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Narichten-Mark för VPT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Narichten-Mark för Tracker-Informatschonen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Narichten-Mark för Fastplaat-In-/Utgaavinformatschonen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Narichten-Mark för't IP-Filter-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Narichten-Mark för't Söök-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Narichten-Mark för't Moduul \"Deeldatei-Import\""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Narichten-Mark för't Infofinster-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Narichten-Mark för't UPnP-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Narichten-Mark för't Moduul \"Orner dörkieken\""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Narichten-Mark för't Planer-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Narichten-Mark för't RSS-Moduul"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Narichten-Mark för't Nettkoppelsteed-Moduul"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Logbookkieker-Optschonen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Modulen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "All"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Fehlersöök"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Henwies"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Wichtig"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Keen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-Filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Söken:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Orner dörkieken:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planer:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Deeldatei-Import:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Infofinster:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-Moduul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Nettkoppelsteed-Moduul:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Systeem"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Allgemeen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Verbinnen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Fastplaat-In-/Utgaav:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Logbooktext &formateren"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Extern Nettkieker"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Söken in extern Nettkieker opmaken"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Standard-Nettkieker bruken"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Padd na dat Nettkiek-Programm:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Söökmaschinen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Naam vun de Söökmaschien:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Tofögen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Söökmaschinen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "Adress"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "All &wegmaken"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Standard tofögen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Ut Internet opfrischen"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Söken"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Söökmaschien:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Söökmaschien opstunns"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Egen Nettkieker bruken"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Padd na dat Nettkiek-Programm"
-@@ -4113,7 +4113,7 @@ msgstr "Daten warrt pröövt"
- msgid "Stopped. No space left on device."
- msgstr "Anhollen. Keen Platz mehr op Reedschap na."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4121,12 +4121,12 @@ msgstr ""
- "Du hest för't Daalladen vun dissen Torrent nich mehr noog Platz op Dien "
- "Fastplaat free . Wullt Du redig wiedermaken?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Nich noog Platz op Fastplaat för \"%1\""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4134,16 +4134,16 @@ msgstr ""
- "Torrent \"%1\" is bi sien Hööchst-Deelproportschoon anlangt. Grenz övergahn, un "
- "liekers wiederverdelen?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Bi de Hööchst-Deelproportschoon anlangt."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Torrent \"%1\" lett sik nich anhollen: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Torrent \"%1\" lett sik nich starten: %2"
- 
-diff --git a/translations/nl/messages/ktorrent.po b/translations/nl/messages/ktorrent.po
-index 4f53930..ddf150e 100644
---- a/translations/nl/messages/ktorrent.po
-+++ b/translations/nl/messages/ktorrent.po
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-03-10 13:43+0100\n"
- "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
- "Language-Team: Nederlands <tde-i18n-nl@kde.org>\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Geen binnenkomende verbindingen (mogelijk geblokkeerd door firewall)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informatie"
-@@ -190,7 +190,7 @@ msgstr "Ongeldig URL-adres."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Downloads"
-@@ -313,7 +313,7 @@ msgid "Document to open"
- msgstr "Te openen document"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -579,7 +579,7 @@ msgstr "Torrent-peerbronnen:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -621,7 +621,7 @@ msgid "Add to Group"
- msgstr "Aan groep toevoegen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Snelheidslimieten"
-@@ -641,7 +641,7 @@ msgid "Malformed IP address."
- msgstr "Ongeldig IP-adres."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Instellingen"
-@@ -679,7 +679,7 @@ msgid "Advanced"
- msgstr "Geavanceerd"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Geavanceerde instellingen"
-@@ -690,7 +690,7 @@ msgstr "Zichtbare kolommen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -712,7 +712,7 @@ msgstr "Geüpload"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Downloadsnelheid"
-@@ -839,7 +839,7 @@ msgid "User"
- msgstr "Gebruiker"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Wachtrijmanager"
-@@ -1068,8 +1068,8 @@ msgid "Start torrent"
- msgstr "Uploaden van torrent &starten"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Downloaden"
-@@ -1123,13 +1123,13 @@ msgid "Encryption"
- msgstr "Encryptie"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Protocolversleuteling gebruiken"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1139,13 +1139,13 @@ msgstr ""
- "internetproviders BitTorrent-verbindingen vertragen."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Onversleutelde verbindingen toestaan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1154,7 +1154,7 @@ msgstr ""
- "die encryptie ondersteunen."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1165,169 +1165,169 @@ msgstr ""
- "informatie."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "DHT gebr&uiken om extra peerbronnen te verkrijgen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-poort voor DHT-communicatie:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Aangepast IP-adres"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Aa&ngepast IP-adres of hostnaam naar de tracker zenden"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Aangepast IP-adres of hostnaam:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Systeemvakpictogram"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Pictogram in s&ysteemvak plaatsen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "&Snelheidsindicatie op systeemvakpictogram tonen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Notificatieberichten boven systeemvak tonen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Uploadbandbreedte (KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Downloadbandbreedte (KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Mappen"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Tijdelijke gegevensmap:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Verplaats afgeronde downloads naar:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Downloads &automatisch opslaan in:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopieer .torrent-bestanden naar:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Downloadwerkbalk"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Snelheidslimieten voor torrent instellen"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximum uploadsnelheid:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maximum downloadsnelheid:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/sec (0 is geen limiet)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Potentiële peer toevoegen"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Peer IP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Poort:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Voer het IP-adres en de poort van de peer in."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent's zwarte lijst"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1338,55 +1338,55 @@ msgstr ""
- "van de IP-filter plugin (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Verbannen peers"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Peer IP-adres"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Peer toevoegen:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Voegt een peer aan de zwarte lijst toe"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Verwijdert een geselecteerde peer van de zwarte lijst"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Leegmaken"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Maakt deze lijst leeg"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Op&slaan als..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
-@@ -1394,133 +1394,133 @@ msgstr ""
- "blijven gebruiken"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximum downloads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximum uploads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Download starten bij weinig vrije schijfruimte:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimum schijfruimte:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Niet starten"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Altijd vragen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Start afdwingen"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 is geen limiet)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximum downloadsnelheid:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Maximum aantal verbindingen totaal:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Max. tijd om te seeden:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximum aantal verbindingen per torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Aantal upload slots:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Poort UDP-tracker:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maximum deelverhouding:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximum uploadsnelheid:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sec (0 is geen limiet)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Uren (0 is geen limiet)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Doorgaan met uploaden nadat een download is voltooid"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Attentie"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1531,283 +1531,283 @@ msgstr ""
- "doen."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT wachtrij-dialoogvenster"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Deelverhouding:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Bytes over:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Aangestuurd door"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Upload&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Geüpload:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "&Omhoog verplaatsen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Omlaag verplaatse&n"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Naar bovenkant verplaatsen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Naar onder&kant verplaatsen"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Aansturen door &wachtrij"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Aansturen door gebr&uiker"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "URL plakken"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL-adres:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&OK"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Annuleren"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent aanmaken"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Het bestand of de map waarvan u een torrent wilt aanmaken:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Voeg tenminste één tracker of node toe."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Bestandsopties"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Grootte van elke chunk:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Uploaden van torrent &starten"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Gedecentraliseerd (enkel DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privé-torrent (DHT niet toegestaan)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Commentaar:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "Aan&maken"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Annuleren"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackers"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT nodes"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Node:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP of hostnaam"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Poort"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1818,19 +1818,19 @@ msgstr ""
- "plan bent deze torrent te gaan uploaden."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Geavanceerde instellingen"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "Algoritme voor schatten van resterende tijd:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1860,346 +1860,346 @@ msgstr ""
- "gemiddelde van X metingen."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Huidige snelheid"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Globale gemiddelde snelheid"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Windows of X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Moving avarage"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(treedt in werking na herstarten)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Toewijzen van schijfrui&mte uitschakelen"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- "Volledig toewijzen van schijfr&uimte (langzaam, maar voorkomt fragmentatie)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Normaal (traag)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Naar bestandssysteem"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Prestatie"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Geheugengebruik:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Laag"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Gemiddeld"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Hoog"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Interface bijwerken in:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Snelle CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Langzame CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Dataverificatie tijdens uploadmodus"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Hercontroleer gee&n chunks groter dan"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Doe een integriteitscontrole op bestandsgegevens na"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "beschadigde chunks"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Netwerken"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximum aantal halfopen verbindingen:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP voor IP-pakketten:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- "Maak geen gebruik van KDE's eigen pro&xy voor de HTTP-trackerverbindingen."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP-tracker proxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Controleren van gegevens"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Data van torrent worden gescand op chunks:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Aantal goede chunks:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Aantal onjuiste chunks / niet gedownload:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Testen"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximum aantal actieve downloads (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximum aantal actieve uploads (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Downloads starten bij weinig schijfruimte?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximum aantal verbindingen per torrent (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maximum aantal verbindingen totaal (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximum uploadsnelheid in KB/sec (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximum downloadsnelheid in KB/sec (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximum deelverhouding (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maximum tijd om te seeden in uren (0 = geen limiet)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Pictogram in systeemvak plaatsen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Snelheidsindicatie op systeemvakpictogram tonen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Downloadsnelheid (KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Uploadsnelheid (KB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Popup-berichten tonen wanneer een torrent is voltooid."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Doorgaan met uploaden nadat een download is voltooid"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Map om tijdelijke bestanden op te slaan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Indien u een download automatisch op wilt slaan in een standaard opslaglocatie"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Map om gedownloade bestanden op te slaan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2207,13 +2207,13 @@ msgstr ""
- "opslaglocatie."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Map om afgeronde downloads naar te verplaatsen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
-@@ -2221,73 +2221,73 @@ msgstr ""
- "opslaglocatie"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Map om torrent-bestanden naar toe te kopieren."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Indien u een aangepast IP-adres aan de tracker wilt meegeven"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Map die het laatst was gebruikt als de opslaglocatie"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP om aan de tracker mee te geven"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Geheugengebruik"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Interface bijwerken in"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Ondersteuning voor DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT-poort"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Aantal uploadsloten"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Weergegeven kolommen in de basisweergave van Ktorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ETA algoritme"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2297,458 +2297,458 @@ msgstr ""
- "torrent af te ronden en wanneer de schijfruimte minder is dan minDiskSpace."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Pluginmanager"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Laden"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "O&ntladen"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Alles &laden"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Alles on&tladen"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Standaard te gebruiken UPnP-apparaat"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Gedetecteerde apparaten:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Apparaat"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Doorgestuurde poorten"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN-verbinding"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Poorten &doorsturen"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Poortdoorsturing ongedaan maken"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Opnieuw zoeken"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Torrent-detectie van map 1 activeren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Torrent-detectie van map 2 activeren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Torrent-detectie van map 3 activeren?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Pad map 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Pad map 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Pad map 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Voor het wel of niet stil openen van een torrent."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Verwijderhandeling geselecteerd."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Verplaatshandeling geselecteerd."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Instellingen mapdetectie"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Map &1 detecteren"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Map &2 detecteren"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Map &3 detecteren"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Verplaats het torrent-bestand naar de &map \"loaded\" na het laden"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Verplaatst het torrent-bestand naar de map \"loaded\" na het te laden"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Torrent-bestanden s&til openen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- "Dialoogvenster 'Selecteer de bestanden die u wilt downloaden' niet weergeven."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Torrent-bestanden ver&wijderen na het laden"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Verwijdert het torrent-bestand na het laden"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Te detecteren mappen"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Map 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Map 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Map 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Zoekinstellingen"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Webserver"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Poort doorsturen"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Sessie TTL (in sec):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Selecteer interface:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Gebruikersnaam:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Wachtwoord aanpassen..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Uitvoerbaar pad naar php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Poortnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Poort doorsturen"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Levensduur inactieve sessie"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Model interface"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Uitvoerbaar pad naar php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "gebruikersnaam"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "wachtwoord"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Chunks"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Totaal:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Nu aan het downloaden:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Gedownload:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Uitgesloten:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Te doen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Grootte:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Chunk"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Voortgang"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Toegewezen peers"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Seeders:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Leechers:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Gemiddelde downloadsnelheid:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Gemiddelde uploadsnelheid:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Volgende update:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Trackerstatus:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Delen van de torrent die zijn gedownload:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Delen van de torrent die beschikbaar zijn:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Delen"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2757,145 +2757,145 @@ msgstr ""
- "Nul betekent geen limiet."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Het uploaden zal stoppen wanneer er geüpload is voor dit aantal uren."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Uren"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Ratio limiet"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Limiet werkt alleen in de uploadmodus"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Tijds&limiet:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Tracker &updaten"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimale interval tussen updates - 60 seconden"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Trac&ker toevoegen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Tracker verwijderen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Tracker aa&npassen"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Standaard instellingen herstellen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Tabblad met peers in het hoofdvenster tonen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Tabblad met chunks in het hoofdvenster tonen"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Tabblad met trackers in het hoofdvenster tonen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Tabblad met peers tonen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Tabblad met informatie over chun&ks tonen"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Tabblad met trackers tonen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP filterinstellingen"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Selecteer PeerGuardian filterbestand "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "PeerGuardian filter gebruiken?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP filterbestand:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Dow&nloaden/Converteren"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2905,25 +2905,25 @@ msgstr ""
- "Opmerking: Zip-bestand van bluetack.co.uk wordt nu ondersteund."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Level1 filter URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Level1 filter gebruiken?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Bezig met converteren..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2935,61 +2935,61 @@ msgstr ""
- "snellere computers. Tijdens dit proces kunt u KTorrent niet gebruiken."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Updaten"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Update grafieken elke"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Interface-updates"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Verzamel gegevens elke"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "miliseconden"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maximum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maximum snelheidsschaal modus"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exact"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Zie 'Wat is dit' voor meer hulp."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -3001,848 +3001,848 @@ msgstr ""
- "- Exact:Maximum behaalde snelheid zichtbaar op de grafiek"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Snelheid peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Snelheid peers:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "updaten elke"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "grafiekbijwerkingen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "Het verzamelen van gegevens over verbonden peers kan CPU-intensief zijn."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Peer-verbindingen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Grote waardes kunnen de grafieken vervagen."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Seeders in zwermen tonen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Leechers in zwermen tonen"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Telling van meting"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Upload"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Verbindingen"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Snelheidsgrafieken van peers aan/uit"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Interval tussen het verkrijgen van snelheidgegevens van peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Weergave van leechers in zwermen aan/uit zetten"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Weergave van seeders in zwermen aan/uit"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Telling van downloadmeting"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Telling van snelheidsmeting van peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Telling van uploadmeting"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Telling van het aantal verbindingen"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Telling van DHT-meting"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "OY-as maximum wijze"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Bestaande download importeren"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Gegevens:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Geef het torrent-bestand en de reeds gedownloade gegevens op."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importeren"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "standaard"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS feeds"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Feeds"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Verwijderen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nieuw"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artikelen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Feed bijwe&rken elke"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "TTL ne&geren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Vernieuwen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Archiefgrootte (dagen)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Actief"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filters"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Accepterende filters"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Verwerpende filters"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Reguliere expressies"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Behandelen als &serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Filteren"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Criteria voor series"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Overeenkomsten zonder episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maximaal episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maximaal seizoen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Minimaal seizoen"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Minimaal episode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Te&kst uittesten"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&sten"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Gefilterde overeenkomsten"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Bandbreedteplanner"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Profiel linkermuisknop"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "&Profiel 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Uitgeschakeld"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normaal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Profiel &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Profiel &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Profiel rechtermuisknop"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Profiel &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "Pro&fiel 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Profielen"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>Profiel 1</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>Profiel 3</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "download:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "upload:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>Profiel 2</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* nul betekent geen limiet"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Opslaan als"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Openen"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Opnieuw instellen"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Instellingenpagina bandbreedteplannerplugin"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "&Bandbreedteplanner gebruiken?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Bandbreedteplanner"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Kleuren in plaats van pi&xmaps gebruiken?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Aanbevolen voor tragere systemen)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "P&lanner aanpassen"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Bandbreedteplanner activeren?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Kleuren in plaats van pixmaps gebruiken?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Gebruik opgemaakte tekst in logvenster"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Berichtenvlag voor algemene informatie"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Berichtenvlag voor verbindingen"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Berichtenvlag voor DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Berichtenvlag voor trackerinformatie"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Berichtenvlag voor I/O-informatie harde schijf"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Berichtenvlag voor IP-filter plugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Berichtenvlag voor zoekplugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Berichtenvlag voor importplugin gedeeltelijke bestanden"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Berichtenvlag voor Infowidgetplugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Berichtenvlag voor UPnP-plugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Berichtenvlag voor mapdetectieplugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Berichtenvlag voor plannerplugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Berichtenvlag voor RSS-plugin"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Berichtenvlag voor webinterfaceplugin"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Instellingen logweergave"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugins"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Alles"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Afluistermeldingen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Opmerkingen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Belangrijk"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Geen"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Zoeken:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Mapdetectie:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planner:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Download importeren:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Infowidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-plugin:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Webinterface:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Systeem"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Algemeen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Verbindingen:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Schijf I/O:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Opgemaakte te&kst in logvenster tonen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Externe webbrowser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Open zoekresultaten in e&xterne webbrowser"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Standaard browser gebruiken"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Pad naar aangepaste browser:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Zoekmachines"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Naam zoekmachine:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Toevoegen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Machines"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL-adres"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "All&es verwijderen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Standaard &toevoegen"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Bijwerken vanaf internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Zoeken"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Zoekmachine:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Huidige zoekmachine"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Niet-standaard browser gebruiken"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Uitvoerbaar pad naar aangepaste browser"
-@@ -4132,7 +4132,7 @@ msgstr "Gegevens controleren"
- msgid "Stopped. No space left on device."
- msgstr "Gestopt. Geen schijfruimte over op apparaat."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4140,12 +4140,12 @@ msgstr ""
- "Er is onvoldoende schijfruimte aanwezig om deze torrent te downloaden. Weet u "
- "zeker dat u wilt doorgaan?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Onvoldoende schijfruimte voor %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4153,16 +4153,16 @@ msgstr ""
- "Torrent \"%1\" heeft zijn ingestelde deelverhouding al bereikt. Wilt u de "
- "limiet negeren en verdergaan met uploaden?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Maximum ingestelde deelverhouding is bereikt."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Fout bij het stoppen van torrent %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Fout bij het starten van torrent %1: %2"
- 
-diff --git a/translations/pa/messages/ktorrent.po b/translations/pa/messages/ktorrent.po
-index 2ff8d52..92ce203 100644
---- a/translations/pa/messages/ktorrent.po
-+++ b/translations/pa/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2005-10-30 12:32+0530\n"
- "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
- "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, fuzzy, no-c-format
- msgid "Info"
- msgstr "ਨਹੀਂ"
-@@ -193,7 +193,7 @@ msgstr ""
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "ਡਾਊਨਲੋਡ"
-@@ -313,7 +313,7 @@ msgid "Document to open"
- msgstr "ਖੋਲਣ ਲਈ ਦਸਤਾਵੇਜ਼"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "ਕੇ-ਟੋਰੈਂਟ"
-@@ -600,7 +600,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -643,7 +643,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -661,7 +661,7 @@ msgid "Malformed IP address."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
-@@ -695,7 +695,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "ਫਾਇਲ ਚੋਣ"
-@@ -706,7 +706,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "ਸਥਿਤੀ"
-@@ -729,7 +729,7 @@ msgstr "ਅੱਪਲੋਡ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "ਡਾਊਨ ਗਤੀ"
-@@ -851,7 +851,7 @@ msgid "User"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr ""
-@@ -1046,8 +1046,8 @@ msgid "Start torrent"
- msgstr "ਇੱਕ ਟੋਰੈਂਟ ਬਣਾਓ"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, fuzzy, no-c-format
- msgid "Download"
- msgstr "ਡਾਊਨਲੋਡ"
-@@ -1101,13 +1101,13 @@ msgid "Encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1115,20 +1115,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1136,169 +1136,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, fuzzy, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "ਡਾਊਨਲੋਡ ਸਵੈ-ਚਾਲਤ ਹੀ ਏਥੇ ਸੰਭਾਲੋ(&A)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "ਟੋਰੈਂਟ ਫਾਇਲਾਂ (*.torrent)"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "ਡਾਊਨਲੋਡ ਸੰਦ-ਪੱਟੀ"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਅੱਪਲੋਡ ਦਰ:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਅੱਪਲੋਡ ਦਰ"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "ਕਿਬਾ/ਸਕਿੰਟ (ਬਿਨਾਂ ਸੀਮਾ ਲਈ 0)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "ਪੋਰਟ:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "ਟੋਰੈਂਟ ਫਾਇਲਾਂ (*.torrent)"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1306,187 +1306,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "ਜਾਰੀ ਪੀਅਰ"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, fuzzy, no-c-format
- msgid "Maximum seeds:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(ਬਿਨਾਂ ਸੀਮਾ ਲਈ 0 )"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, fuzzy, no-c-format
- msgid "Maximum download rate:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਅੱਪਲੋਡ ਦਰ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, fuzzy, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "ਪ੍ਰਤੀ ਡਾਊਨਲੋਡ ਵੱਧ ਤੋਂ ਵੱਧ ਕੁਨੈਕਸ਼ਨ:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, fuzzy, no-c-format
- msgid "UDP tracker port:"
- msgstr "ਟਰੈਕਰ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਅੱਪਲੋਡ ਦਰ:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "ਕਿਬਾ/ਸਕਿੰਟ (ਬਿਨਾਂ ਸੀਮਾ ਲਈ 0)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(ਬਿਨਾਂ ਸੀਮਾ ਲਈ 0 )"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1494,283 +1494,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, fuzzy, no-c-format
- msgid "Status:"
- msgstr "ਸਥਿਤੀ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, fuzzy, no-c-format
- msgid "Torrent"
- msgstr "ਕੇ-ਟੋਰੈਂਟ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "ਅੱਪਲੋਡ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "ਅੱਪਲੋਡ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, fuzzy, no-c-format
- msgid "C&ancel"
- msgstr "ਰੱਦ ਕਰੋ(&n)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, fuzzy, no-c-format
- msgid "Create Torrent"
- msgstr "ਇੱਕ ਟੋਰੈਂਟ ਬਣਾਓ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, fuzzy, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "ਇੱਕ ਟੋਰੈਂਟ ਬਣਾਉਣ ਲਈ ਬਣਾਈ ਜਾਣ ਵਾਲੀ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਦਾ ਨਾਂ:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਟਰੈਕਰ ਜੋੜਨਾ ਚਾਹੀਦਾ ਹੈ।"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, fuzzy, no-c-format
- msgid "File Options"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, fuzzy, no-c-format
- msgid "Size of each chunk:"
- msgstr "ਹਰ ਚਕ ਦਾ ਅਕਾਰ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "ਕਿਬਾ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, fuzzy, no-c-format
- msgid "Comments:"
- msgstr "ਟਿੱਪਣੀਆਂ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "ਬਣਾਓ(&a)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "ਰੱਦ ਕਰੋ(&n)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, fuzzy, no-c-format
- msgid "Trackers"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "ਨਾਂ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "ਪੋਰਟ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1778,19 +1778,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1806,427 +1806,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "ਟੋਰੈਂਟ ਖੋਜ ਇੰਜਣ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "ਪ੍ਰਤੀ ਡਾਊਨਲੋਡ ਵੱਧੋ-ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ (0= ਬੇਅੰਤ)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "ਟਰੈਕਰ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr ""
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, fuzzy, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, fuzzy, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "ਪ੍ਰਤੀ ਡਾਊਨਲੋਡ ਵੱਧੋ-ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ (0= ਬੇਅੰਤ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, fuzzy, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "ਪ੍ਰਤੀ ਡਾਊਨਲੋਡ ਵੱਧੋ-ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਦੀ ਗਿਣਤੀ (0= ਬੇਅੰਤ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "ਕਿਬ/ਸਕਿੰਟ 'ਚ ਡਾਊਨਲੋਡ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਤੀ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, fuzzy, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ ਗਤੀ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ (0 = ਕੋਈ ਸੀਮਾ ਨਹੀਂ)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files"
- msgstr "ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "ਡਾਊਨਲੋਡ ਸਵੈ-ਚਾਲਤ ਹੀ ਏਥੇ ਸੰਭਾਲੋ(&A)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, fuzzy, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "ਡਾਊਨਲੋਡ ਫਾਇਲਾਂ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "ਡਾਊਨਲੋਡ ਸਵੈ-ਚਾਲਤ ਹੀ ਏਥੇ ਸੰਭਾਲੋ(&A)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "ਡਾਊਨਲੋਡ ਫਾਇਲਾਂ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "ਡਾਊਨਲੋਡ ਸਵੈ-ਚਾਲਤ ਹੀ ਏਥੇ ਸੰਭਾਲੋ(&A)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2234,602 +2234,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, fuzzy, no-c-format
- msgid "Ports Forwarded"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "ਫਾਇਲ %1 ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: %2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, fuzzy, no-c-format
- msgid "Alt+1"
- msgstr "Alt+Y"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, fuzzy, no-c-format
- msgid "Alt+2"
- msgstr "Alt+Y"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, fuzzy, no-c-format
- msgid "Alt+3"
- msgstr "Alt+Y"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "ਟੋਰੈਂਟ ਫਾਇਲਾਂ (*.torrent)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, fuzzy, no-c-format
- msgid "Chunks"
- msgstr "ਚਕ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, fuzzy, no-c-format
- msgid "Downloaded:"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, fuzzy, no-c-format
- msgid "Excluded:"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "ਚਕ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "ਤਰੱਕੀ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "ਜਾਰੀ ਪੀਅਰ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, fuzzy, no-c-format
- msgid "Seeders:"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "ਡਾਊਨ ਗਤੀ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "ਉੱਪਰ ਗਤੀ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "ਟਰੈਕਰ"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, fuzzy, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "ਟੋਰੈਂਟ ਫਾਇਲਾਂ (*.torrent)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "ਟੋਰੈਂਟ ਫਾਇਲਾਂ (*.torrent)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "ਡਾਊਨਲੋਡ ਸੰਦ-ਪੱਟੀ"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2837,25 +2837,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, fuzzy, no-c-format
- msgid "Converting..."
- msgstr "%1 ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2864,61 +2864,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਡਾਊਨਲੋਡ:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2927,847 +2927,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ(&y)"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "ਅੱਪਲੋਡ"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "ਡਾਊਨਲੋਡ ਸੰਦ-ਪੱਟੀ"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "ਕੇ-ਟੋਰੈਂਟ"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "ਤਰੱਕੀ"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "ਡਾਊਨਲੋਡ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "ਅੱਪਲੋਡ"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "(ਬਿਨਾਂ ਸੀਮਾ ਲਈ 0 )"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, fuzzy, no-c-format
- msgid "Debug"
- msgstr "ਡੀਬੱਗ ਢੰਗ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "ਮੇਰੀ ਪਸੰਦ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "ਖੋਜ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "ਪੀਅਰ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "ਫਾਇਲ ਚੋਣ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "ਟੋਰੈਂਟ ਖੋਜ ਇੰਜਣ"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "ਟੋਰੈਂਟ ਖੋਜ ਇੰਜਣ"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "ਖੋਜ"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, fuzzy, no-c-format
- msgid "Search engine:"
- msgstr "ਟੋਰੈਂਟ ਖੋਜ ਇੰਜਣ"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, fuzzy, no-c-format
- msgid "Current search engine"
- msgstr "ਟੋਰੈਂਟ ਖੋਜ ਇੰਜਣ"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4063,34 +4063,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "ਫਾਇਲ %1 ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "ਫਾਇਲ %1 ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ: %2"
-diff --git a/translations/pl/messages/ktorrent.po b/translations/pl/messages/ktorrent.po
-index 00eb11e..384cade 100644
---- a/translations/pl/messages/ktorrent.po
-+++ b/translations/pl/messages/ktorrent.po
-@@ -1,13 +1,13 @@
--# translation of ktorrent-svn-707193.po to Polish
-+# translation of ktorrent.po to Polish
- #
- # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005, 2006, 2007.
- # Marcin Zasada <emzeta76@gazeta.pl>, 2005, 2006.
--# Jerzy Trzeciak <artusek@wp.pl>, 2007.
-+# Jerzy Trzeciak <artusek@wp.pl>, 2007, 2008.
- msgid ""
- msgstr ""
--"Project-Id-Version: ktorrent-svn-707193\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2007-09-03 13:54+0200\n"
-+"Project-Id-Version: ktorrent\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-08-13 21:51+0200\n"
- "Last-Translator: Jerzy Trzeciak <artusek@wp.pl>\n"
- "Language-Team: Polish <pl@li.org>\n"
- "MIME-Version: 1.0\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Brak połączeń przychodzących (przypuszczalnie za zaporą sieciową)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informacja"
-@@ -130,11 +130,11 @@ msgstr "Wszystkie torrenty"
- 
- #: apps/ktorrent/filterbar.cpp:52
- msgid "Find:"
--msgstr ""
-+msgstr "Znajdź:"
- 
- #: apps/ktorrent/filterbar.cpp:65
- msgid "Case sensitive"
--msgstr ""
-+msgstr "Rozróżnianie wielkości liter"
- 
- #: apps/ktorrent/newui/ddockwindow.cpp:88
- msgid "Move to left dock"
-@@ -190,7 +190,7 @@ msgstr "Nieprawidłowy URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Pobierane"
-@@ -260,9 +260,8 @@ msgstr ""
- "Brakuje pliku z danymi dla torrenta \"%1\". Czy chcesz go utworzyć ponownie?"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1069
--#, fuzzy
- msgid "Do Not Recreate"
--msgstr "Utwórz ponownie"
-+msgstr "Nie twórz ponownie"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1078
- #, c-format
-@@ -306,14 +305,14 @@ msgstr "Tryb debugowania"
- 
- #: apps/ktorrent/main.cpp:109
- msgid "Silently save torrent given on URL"
--msgstr ""
-+msgstr "Zapisz bez potwierdzenia torrent z adresu URL"
- 
- #: apps/ktorrent/main.cpp:110
- msgid "Document to open"
- msgstr "Dokument do otwarcia"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -416,21 +415,19 @@ msgstr "Szereg poprawek"
- 
- #: apps/ktorrent/main.cpp:160
- msgid "Patch to hide the menubar"
--msgstr ""
-+msgstr "Poprawka do ukrywania paska menu"
- 
- #: apps/ktorrent/main.cpp:161
- msgid "Patch to modify file priorities in the webgui"
--msgstr ""
-+msgstr "Poprawka do modyfikacji priorytetu pliku w interfejsie WWW"
- 
- #: apps/ktorrent/main.cpp:162
--#, fuzzy
- msgid "Several webgui patches"
--msgstr "Szereg poprawek"
-+msgstr "Szereg poprawek interfejsu WWW"
- 
- #: apps/ktorrent/main.cpp:163
--#, fuzzy
- msgid "Filterbar patch"
--msgstr "Dopasowania filtra"
-+msgstr "Poprawka paska filtrów"
- 
- #: apps/ktorrent/main.cpp:164
- msgid "Non threaded fileview update patch"
-@@ -442,12 +439,11 @@ msgstr ""
- 
- #: apps/ktorrent/main.cpp:166
- msgid "Patch to fix free diskspace calculation on FreeBSD"
--msgstr ""
-+msgstr "Poprawka do obliczania wolnej powierzchni dysku w FreeBSD"
- 
- #: apps/ktorrent/main.cpp:167
--#, fuzzy
- msgid "Patch to load torrents silently from the command line"
--msgstr "Poprawka dla wczytywania bez potwierdzenia z lokalizacją zapisu"
-+msgstr "Poprawka do wczytywania torrentów bez potwierdzania z linii poleceń"
- 
- #: apps/ktorrent/torrentcreatordlg.cpp:64
- msgid "You must select a file or a folder."
-@@ -579,7 +575,7 @@ msgstr "Źródła partnerów:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -621,7 +617,7 @@ msgid "Add to Group"
- msgstr "Dodaj do grupy"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Ustawienia szybkości"
-@@ -639,7 +635,7 @@ msgid "Malformed IP address."
- msgstr "Nieprawidłowy format adresu URL."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Ustawienia"
-@@ -675,7 +671,7 @@ msgid "Advanced"
- msgstr "Zaawansowane"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Ustawienia zaawansowane"
-@@ -686,7 +682,7 @@ msgstr "Widoczne kolumny"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stan"
-@@ -708,7 +704,7 @@ msgstr "Wysłano"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Szybk. pobierania"
-@@ -835,7 +831,7 @@ msgid "User"
- msgstr "Użytkownik"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Menedżer kolejki"
-@@ -1065,8 +1061,8 @@ msgid "Start torrent"
- msgstr "Uruchom torrenta"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Pobieranie"
-@@ -1120,13 +1116,13 @@ msgid "Encryption"
- msgstr "Szyfrowanie"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Zastosuj szyfrowanie protokołu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1136,13 +1132,13 @@ msgstr ""
- "torrentowych  przez ISP (dostawców usług internetowych)."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Zezwól na połączenia nieszyfrowane"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1151,7 +1147,7 @@ msgstr ""
- "stosującymi szyfrowanie."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1162,170 +1158,170 @@ msgstr ""
- "podręczniku."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "Użyj &DHT, żeby znaleźć dodatkowych partnerów"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Port UDP dla DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Numer IP użytkownika"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- "Wysyłaj ustawiony n&umer IP użytkownika lub nazwę komputera do trackera"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Numer IP użytkownika lub nazwa komputera:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikona w tacce systemowej"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Pokaż ikonę w tacce s&ystemowej"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Pokazuj pasek &szybkości w tacce systemowej"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Pokazuj wyskakujące okienka komunikatów"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Wysyłanie (KB/sek):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Pobieranie (KB/sek):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Katalogi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Katalog do przechowywania plików tymczasowych:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Przenieś zakończone pobrania do:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Automatycznie zapisz pobrania do:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopiuj pliki .torrent do:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Pasek narzędziowy pobierania"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Ustaw szybkość dla torrenta"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maksymalna szybkość wysyłania:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maksymalna szybkość pobierania:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/sek (0 oznacza bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Dodaj potencjalnego partnera"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP partnera:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port TCP:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Podaj IP i port partnera."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Czarna lista KTorrenta"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1335,187 +1331,187 @@ msgstr ""
- "żeby zachować swoje wpisy, lub zastosuj wtyczkę IPFilter (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Zablokowani partnerzy"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Adres IP partnera"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Dodaj partnera do listy:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Dodaje partnera do czarnej listy"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Usuwa wybranych partnerów z czarnej listy"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Wy&czyść"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Czyści listę"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Z&apisz jako..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Zapisz czarną listę do wykorzystania przez wtyczkę Filtr IP"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maksymalna liczba pobierań:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maksymalna liczba wysyłań:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Uruchamianie z małą ilością miejsca na dysku:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimalna wielkość wolnego miejsca na dysku:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "NIe uruchamiaj"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Zawsze pytaj"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Wymuś uruchomienie"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 oznacza bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maksymalna szybkość pobierania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Całkowity limit połączeń:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maksymalny czas wysyłania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maksymalna liczba połączeń na torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Liczba slotów wysyłania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Port UDP trackera:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maksymalny współczynnik udziału:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maksymalna szybkość wysyłania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sek (0 oznacza bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Godzin(y) (0 oznacza bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Kontynuuj wysyłanie po zakończonym pobieraniu"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Uwaga"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1525,283 +1521,283 @@ msgstr ""
- "może zrobić to za ciebie."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Okno menedżera kolejki KTorrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stan:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Współczynnik udziału:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Pozostało bajtów:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontrolowane przez"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Wy&syłanie"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Wysłano:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Przesuń w &górę"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Przesuń w &dół"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Przesuń na początek"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Przesuń na &koniec"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Sterowanie przez &menedżera kolejki"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Sterowanie przez &użytkownika"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Wklej URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Anuluj"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Utwórz torrenta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Plik lub katalog, z którego chcesz utworzyć torrenta:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Musisz dodać przynajmniej jeden adres trackera lub węzeł (adres)."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opcje pliku"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Wielkość każdej części:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Rozpocznij wysyłanie torrenta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "&Rozproszony (tylko DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrent prywatny (DHT niedozwolony)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Komentarze:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "Utwórz"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "A&nuluj"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackery"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Węzły DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Węzeł:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "Numer IP lub nazwa komputera"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1811,19 +1807,19 @@ msgstr ""
- "wysyłać ten torrent, to możesz dodać również swój IP i port."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Zaawansowane ustawienia"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
--msgstr ""
-+msgstr "Algorytm obliczania czasu zakończenia:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1853,428 +1849,428 @@ msgstr ""
- "podstawie X próbek szybkości"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Aktualna szybkość"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Całkowita średnia szybkość"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Okno o rozmiarze X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Średnia ruchoma"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(wymagane ponowne uruchomienie)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "&Wyłącz przydzielanie miejsca na dysku"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Od razu przydzielaj miejsce na dysk&u (zapobiega fragmentacji)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Podstawowy (wolny)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "W zależności od systemu plików"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Wydajność"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Wykorzystanie pamięci: "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Niskie"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Średnie"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Wysokie"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Odświeżanie GUI co:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 sek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Szybki procesor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Wolny procesor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Sprawdzanie danych"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "W trybie wysyła&nia nie sprawdzaj części większych niż"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Sprawdź &poprawność danych po wykryciu"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "uszkodzonych części"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Sieć"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
--#, fuzzy, no-c-format
-+#: rc.cpp:623
-+#, no-c-format
- msgid "Maximum number of connection setups:"
--msgstr "Maksymalna liczba połączeń na torrent (0 = bez limitu)"
-+msgstr "Maksymalna liczba ustawień połączeń:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
--msgstr ""
-+msgstr "DSCP dla pakietów IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- "Nie używaj serwera pośredniczącego (pro&xy) KDE dla połączeń HTTP trackera"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Serwer pośredniczący (proxy) HTTP trackera:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Skanowanie danych"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Skanowanie danych torrenta:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Liczba znalezionych części:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Liczba części błędnych/niepobranych:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maksymalna liczba pobrań (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maksymalna liczba wysyłań (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Pobierać z małą ilością miejsca na dysku?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maksymalna liczba połączeń na torrent (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maksymalna liczba połączeń wszystkich torrentów (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maksymalna szybkość wysyłania w KB/sek (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maksymalna szybkość pobierania w KB/sek (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maksymalny współczynnik udziału (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maksymalny czas wysyłania w godzinach (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Pokaż ikonę w tacce systemowej"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Pokazuj pasek szybkości w tacce systemowej"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Pobieranie (kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Wysyłanie (kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Pokazuj komunikat o zakończeniu pobierania."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Kontynuuj wysyłanie po zakończonym pobieraniu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Katalog do przechowywania plików tymczasowych"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Czy zapisywać automatycznie do domyślnego katalogu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Katalog do przechowywania pobranych plików"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Czy automatycznie przenosić zakończone pobrania do domyślnego katalogu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Katalog do przenoszenia zakończonych pobrań"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Czy automatycznie kopiować pliki .torrent do domyślnego katalogu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Katalog do kopiowania plików .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Czy przesyłać własny numer IP do trackera"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Katalog ostatnio używany do zapisywania"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "Numer IP do przekazania do trackera"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Wykorzystanie pamięci"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Odświeżanie GUI co"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Wsparcie dla DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Port DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Liczba slotów wysyłania"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Widoczne kolumny"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algorytm szacowania czasu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2284,457 +2280,457 @@ msgstr ""
- "jeśli ilość wolnego miejsca jest mniejsza niż wymagana."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Menadżer wtyczek"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Włącz"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Wy&łącz"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Włącz wszystkie"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Wyłącz wszystkie"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Domyślne urządzenie UPnP do użycia"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Wykryte urządzenia:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Urządzenie"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Porty przekierowane"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Połączenie WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Prze&kieruj porty"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Cofnij przekierowanie"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Skanuj ponownie"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Skanować katalog 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Skanować katalog 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Skanować katalog 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Ścieżka do katalogu 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Ścieżka do katalogu 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Ścieżka do katalogu 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Czy otwierać torrent bez potwierdzania."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Zaznaczono czynność usunięcia."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Zaznaczono czynność przeniesienia."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Ustawienia przeszukiwania katalogów"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Przeszukaj katalog &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Przeszukaj katalog &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Przeszukaj katalog &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Przenieś do katalogu \"wczytanych\" po wczytaniu"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Przenieś torrent do katalogu \"wczytanych\" po wczytaniu"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Otwieraj torrent&y bez potwierdzania"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Nie pokazuj okna 'Wybierz pliki do pobrania'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Usuń po wczytaniu"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Usuwa torrenta po wczytaniu"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Katalogi do przeszukania"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Katalog 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Katalog 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Katalog 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Ustawienia wyszukiwania"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Serwer WWW"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Przekieruj port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Czas życia sesji (w sek):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Wybierz motyw graficzny interfejsu:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Nazwa użytkownika:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Zmień hasło ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Ścieżka do programu wykonywalnego PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Numer portu"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Przekieruj port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Czas życia sesji"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Motyw graficzny interfejsu"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Ścieżka do pliku wykonywalnego PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "nazwa użytkownika"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "hasło"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Części"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Ogółem:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Aktualnie pobierane:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Pobrano:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Odrzucono:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Pozostało:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Rozmiar:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Część"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Postęp"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Partner"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Przyporządkowani partnerzy"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Rozsiewający:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Pijawki:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Średnia szybkość pobierania:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Średnia szybkość wysyłania:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Następne uaktualnienie za:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Stan trackera:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Pobrane części torrenta:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Dostępne części torrenta:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Współdzielenie"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2743,145 +2739,145 @@ msgstr ""
- "limitu."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Wysyłanie zostanie zatrzymane po podanej liczbie godzin."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Godzin(y)"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Limit współczynnika:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Limit działa tylko w trybie wysyłania"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Limit czasu:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Uaktualnij tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimalny przedział aktualizacji - 60 sek."
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Dodaj trac&ker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Usuń tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Zmień tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Przywróć domyślne"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Pokaż zakładkę partnerów w głównym oknie"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Pokaż zakładkę pobierania części w głównym oknie"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Pokaż zakładkę trackerów w głównym oknie"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Pokaż listę partnerów"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Pokaż listę aktualnie pobieran&ych części"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Pokaż listę trackerów"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Ustawienia blokowania adresów IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Wybierz plik filtra PeerGuardian"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Użyć filtru PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Plik filtru numerów IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Pobierz/Ko&nwertuj"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2891,25 +2887,25 @@ msgstr ""
- "UWAGA: Plik ZIP z bluetack.co.uk jest obsługiwany."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL filtru level1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Użyć filtru level1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konwertowanie..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2921,61 +2917,61 @@ msgstr ""
- "można korzystać z KTorrenta."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Uaktualnienia"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Uaktualniaj wykresy co"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "odświeżanie GUI"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Pobieraj dane co"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisekund"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maksimum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Tryb skali maksymalnej szybkości:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Dokładny"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Zobacz 'Co to jest?' aby uzyskać więcej informacji"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2987,31 +2983,31 @@ msgstr ""
- "- Dokładna: Maksymalna osiągnięta szybkość widoczna na wykresie"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Szybkość partnerów"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Szybkość partnerów:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "uaktualniaj co"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "uaktualnienia wykresów danych"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3019,817 +3015,817 @@ msgstr ""
- "procesora."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Połączenia partnerów"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Duże wartości mogą zniekształcić wykresy przyłączonych partnerów"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Pokazuj zbiorczo rozsiewających"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Pokazuj zbiorczo pijawki"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Liczba pomiarów"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Wysyłanie"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Połączenia"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Partnerzy"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Przełącz wykresy szybkości partnerów"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Przedział czasowy pobierania danych o szybkości partnerów"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Przełącz zbiorcze rysowanie pijawek"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Przełącz zbiorcze rysowanie rozsiewających"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Liczba pomiarów pobierania"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Liczba pomiarów partnerów"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Liczba pomiarów wysyłania"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Liczba pomiarów połączeń"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Liczba pomiarów DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Tryb maksimum osi OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importuj istniejące pobieranie"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dane:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Proszę wskazać torrenta i dane już pobrane dla tego torrenta."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "Impo&rtuj"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "domyślny"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Kanały RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Kanały"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Usuń"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nowy"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artykuły"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Automatyczne o&dświeżanie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnoruj czas życia sesji"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Odśwież"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Tytuł"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Przechowuj artykuły (dni)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktywny"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtry"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filtry akceptowanych"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filtry odrzucanych"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Wyrażenia regularne"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Traktuj jako &serię"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Uruchom"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Kryteria serii"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Dopasowuj bez numeru odcinka"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maksymalny numer odcinka"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maksymalny numer sezonu"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Minimalny numer sezonu"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Minimalny numer odcinka"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Test te&kstu"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Dopasowania filtra"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Planowanie transferu"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Kategoria - lewy przycisk myszy"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategoria 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "W&yłącz"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normalny"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Kategoria - prawy przycisk myszy"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "Kategoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>Kategoria 1.</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>Kategoria 3.</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "pobieranie:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "wysyłanie:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>Kategoria 2.</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* zero oznacza bez limitu"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Zapisz do pliku"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "Wczytaj z p&liku"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Wyczyść planowanie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Strona ustawień planowania transferu"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Włączyć planowanie transferu?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Planowanie transferu"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Zastosuj kolory zamiast mapy bitowej"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Zalecane dla wolniejszych komputerów)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "&Zmień planowanie"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Włączyć planowanie transferu?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Zastosuj kolory zamiast mapy bitowej"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Zastosuj tekst formatowany w dzienniku"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Znacznik informacji ogólnych"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Znacznik komunikatów o połączeniach"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Znacznik komunikatów o DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Znacznik informacji trackera "
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Znacznik komunikatów o operacjach dyskowych"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki Filtr IP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki wyszukiwania"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki częściowych pobrań"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki Okno informacyjne"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Znacznik komunikatów  wtyczki UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki przeszukiwania katalogów"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki planowania transferu"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki kanały RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Znacznik komunikatów wtyczki interfejs WWW"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Ustawienia dziennika zdarzeń"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Wtyczki"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Wszystko"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Debugowanie"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Informacje"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Ważne"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Brak"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtr IP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Wyszukiwanie:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Przeszukanie katalogów:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Planowanie transferu:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Import częściowo pobranych:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Okno informacyjne:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Kanały RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Interfejs WWW:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "System"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Ogólne:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Połączenia:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Operacje dyskowe:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Zastosuj tekst formatowany w dzienniku"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Zewnętrzna przeglądarka"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Wyszukuj w zewnętrznej przeglądarce"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Używaj domyślnej przeglądarki"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Ścieżka do przeglądarki użytkownika:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Wyszukiwarki"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nazwa wyszukiwarki:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "Dod&aj"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Wyszukiwarki"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Usuń wszystko"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Dodaj domyś&lny"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Uaktualnij z Internetu"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Znajdź"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Wyszukiwarka:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Aktualna wyszukiwarka"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Użyj własnej przeglądarki"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Ścieżka do przeglądarki użytkownika"
-@@ -4118,7 +4114,7 @@ msgstr "Sprawdzanie danych"
- msgid "Stopped. No space left on device."
- msgstr "Zatrzymano. Brak wolnego miejsca w urządzeniu."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4126,12 +4122,12 @@ msgstr ""
- "Nie ma wystarczającej ilości miejsca na dysku dla pobierania torrenta. Czy na "
- "pewno chcesz kontynuować?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Na dysku jest za mało miejsca dla %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4139,16 +4135,16 @@ msgstr ""
- "Torrent \"%1\" osiągnął maksymalny współczynnik udziału. Zignorować ten limit i "
- "kontynuować wysyłanie?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Osiągnięto maksymalny współczynnik udziału."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Błąd przy zatrzymywaniu torrenta %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Błąd przy starcie torrenta %1 : %2"
- 
-@@ -4190,14 +4186,12 @@ msgid "Cannot open %1 for writing : readonly filesystem"
- msgstr "Nie można otworzyć %1 do zapisu : system plików tylko do odczytu"
- 
- #: libktorrent/torrent/cachefile.cpp:240
--#, fuzzy
- msgid "Cannot expand file %1 : %2"
--msgstr "Nie można powiększyć pliku %1"
-+msgstr "Nie można powiększyć pliku %1 : %2"
- 
- #: libktorrent/torrent/cachefile.cpp:242
--#, fuzzy
- msgid "Cannot expand file %1 : incomplete write"
--msgstr "Nie można powiększyć pliku %1"
-+msgstr "Nie można powiększyć pliku %1 : zapis jest niekompletny"
- 
- #: libktorrent/torrent/cachefile.cpp:255
- #, c-format
-@@ -4280,9 +4274,8 @@ msgid "Automatically scans directories for torrent files and loads them."
- msgstr "Automatycznie poszukuje plików torrenta w katalogach i wczytuje je."
- 
- #: plugins/scanfolder/scanfolderplugin.cpp:52
--#, fuzzy
- msgid "Scan Folder"
--msgstr "Przeszukiwanie katalogów"
-+msgstr "Przeszukaj katalog"
- 
- #: plugins/scanfolder/scanfolderprefpage.cpp:34
- msgid "ScanFolder"
-@@ -4344,7 +4337,6 @@ msgid "%1 is not php executable path"
- msgstr "%1 nie jest ścieżką do pliku wykonywalnego PHP"
- 
- #: plugins/webinterface/webinterfaceplugin.cpp:44
--#, fuzzy
- msgid "Web Interface"
- msgstr "Interfejs WWW"
- 
-@@ -4519,7 +4511,6 @@ msgid "Filters out unwanted peers based on their IP address"
- msgstr "Filtruje niepożądanych partnerów na podstawie ich adresów IP"
- 
- #: plugins/ipfilter/ipfilterplugin.cpp:46
--#, fuzzy
- msgid "IP Filter"
- msgstr "Filtr IP"
- 
-@@ -4707,7 +4698,7 @@ msgstr "Kanały RSS"
- #: plugins/rssfeed/rsslinkdownloader.cpp:183
- #, c-format
- msgid "Failed to find and download a valid torrent for %1"
--msgstr ""
-+msgstr "Znalezienie i wczytanie torrenta dla %1 nie powiodło się"
- 
- #: plugins/rssfeed/rssfeedmanager.cpp:78
- msgid "Title"
-@@ -4903,27 +4894,10 @@ msgstr "Pobierz"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid "Zeroconf"
--msgstr ""
-+msgstr "Zeroconf"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid ""
- "Finds peers running ktorrent on the local network to share torrents with"
- msgstr ""
- "Znajduje partnerów Ktorrent-a w lokalnej sieci i współdzieli z nimi dane"
--
--#~ msgid "ETA algorithm:"
--#~ msgstr "Algorytm szacowanego zakończenia:"
--
--#~ msgid "Cannot load chunk %1"
--#~ msgstr "Nie można pobrać części: %1"
--
--#, fuzzy
--#~ msgid "Alt+X"
--#~ msgstr "Alt+1"
--
--#, fuzzy
--#~ msgid "TrackerViewBase"
--#~ msgstr "Trackery"
--
--#~ msgid "Type of service field of IP packets"
--#~ msgstr "Typ pola adresów IP"
-diff --git a/translations/pt/messages/ktorrent.po b/translations/pt/messages/ktorrent.po
-index 7ab4997..d016241 100644
---- a/translations/pt/messages/ktorrent.po
-+++ b/translations/pt/messages/ktorrent.po
-@@ -1,7 +1,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-12-14 18:05+0000\n"
- "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
- "Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
-@@ -41,7 +41,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nenhumas ligações recebidas (talvez atrás de 'firewall')"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informação"
-@@ -209,7 +209,7 @@ msgstr "URL Inválido."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Recepções"
-@@ -332,7 +332,7 @@ msgid "Document to open"
- msgstr "O documento a abrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -599,7 +599,7 @@ msgstr "Fontes de Pontos da Torrente:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -641,7 +641,7 @@ msgid "Add to Group"
- msgstr "Adicionar ao Grupo"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Limites de Velocidade"
-@@ -661,7 +661,7 @@ msgid "Malformed IP address."
- msgstr "O endereço IP é inválido."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferências"
-@@ -698,7 +698,7 @@ msgid "Advanced"
- msgstr "Avançado"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Opções Avançadas"
-@@ -709,7 +709,7 @@ msgstr "Colunas visíveis"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Estado"
-@@ -731,7 +731,7 @@ msgstr "Enviado"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Veloc. Recepção"
-@@ -856,7 +856,7 @@ msgid "User"
- msgstr "Utilizador"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Gestor de Fila"
-@@ -1085,8 +1085,8 @@ msgid "Start torrent"
- msgstr "Iniciar a torrente"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Recepção"
-@@ -1140,13 +1140,13 @@ msgid "Encryption"
- msgstr "Encriptação"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usar a encriptação do protocolo"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1156,13 +1156,13 @@ msgstr ""
- "as ligações do BitTorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permitir ligações não-encriptadas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1171,7 +1171,7 @@ msgstr ""
- "encriptação."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1183,169 +1183,169 @@ msgstr ""
- "para mais informações."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usar o DHT para obter as máquinas adicionais"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Porto de UDP para a comunicação do DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP Personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "E&nviar ao localizador um IP ou nome de máquina personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP ou nome de máquina personalizado:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ícone da Bandeja do Sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostrar o ícone na bande&ja do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Mostrar a &barra de velocidade na bandeja do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mostrar as mensagens na bandeja do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Largura de banda do envio (em KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Largura de banda da recepção (em KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Pastas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Pasta onde guardar ficheiros temporários:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Mover as transferências completas para:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Gravar &automaticamente os ficheiros obtidos em:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Copiar os ficheiros .torrent para:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra de Transferências"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Definir os limites de velocidade da torrente"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Taxa máxima de envio:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Taxa máxima de recepção:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Adicionar um ponto potencial"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP do ponto:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porto:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Indique o IP e o porto do ponto."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Lista Negra do KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1355,187 +1355,187 @@ msgstr ""
- "gravar os seus itens ou use o 'plugin' do Filtro IP (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Pontos Banidos"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Endereço do IP do ponto"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Adicionar um ponto:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Adiciona um ponto à lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Remove o ponto seleccionado da lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Limpar"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Limpa esta lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Gr&avar Como..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Grava esta lista negra para a usar no filtro de IPs do KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Máximo de transferências:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Máximo de fontes:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Iniciar a transferência com pouco espaço :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Espaço mínimo em disco:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Não iniciar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Perguntar sempre"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Obrigar a iniciar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 significa ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Taxa máxima de obtenção:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Limite global de ligações:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Tempo máximo como semeado:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Máximo de ligações por torrente:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Número de blocos de envio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Porto UDP do localizador:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Proporção máxima de partilha:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Taxa máxima de envio:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 é ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Horas (0 significa ilimitado)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Continuar o envio após a recepção ter terminado"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Atenção"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1545,283 +1545,283 @@ msgstr ""
- "'plugin' de UPnP poderá fazer isso por si."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Janela da Fila do KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Estado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Localizador:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Proporção de partilha:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "'Bytes' restantes:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrente"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlada por"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Envio&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Enviado:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "S&ubir"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "&Descer"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Para o topo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Para o &fundo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controlado pelo &GF"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controlado pelo &Utilizador"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Colar o URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Criar Torrente"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "O ficheiro ou pasta do qual deseja criar uma torrente:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Deve adicionar pelo menos um localizador ou nó."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opções do Ficheiro"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Tamanho de cada pedaço:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Começar a espal&har sementes da torrente"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Descentrali&zado (apenas DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrente privada (não é permitido o DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comentários:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Criar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Localizadores"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Nós DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Nó:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP ou nome de máquina"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porto"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1832,19 +1832,19 @@ msgstr ""
- "torrente."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferências Avançadas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1872,344 +1872,344 @@ msgstr ""
- "calculada a partir de X amostras"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Velocidade actual"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Velocidade média"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Janela de X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Média em movimento"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(fará efeito após reiniciar)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Desactivar a reserva &prévia do disco"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Pré-alocar por completo o espaço em dis&co (evita a fragmentação)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Básico (lento)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Específico do sistema de ficheiros"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Performance"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Utilização da memória:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Baixa"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Média"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Intervalo de actualização da interface:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "CPU Rápido"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "CPU Lento"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Verificação dos Dados"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Durante o envio, &não verificar de novo os blocos maiores que"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Verificar a &integridade dos dados após"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "blocos corrompidos"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Rede"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Número máximo de configurações das ligações:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP para os pacotes IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Não usar o 'pro&xy' do KDE para as ligações do localizador HTTP"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "'Proxy' de HTTP do localizador:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "A analisar os dados"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "A analisar os dados da torrente :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Número de blocos encontrados :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Número de blocos falhados / não obtidos :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Testar"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Número máximo de transferências (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Número máximo de fontes (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Iniciar as transferências com pouco espaço em disco?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Número máximo de ligações por torrente (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Número máximo de ligações para todas as torrentes (0 = sem limite) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de envio em KB/s (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de recepção em KB/s (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Taxa máxima de partilhas (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Tempo máximo como semeado em horas (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostrar um ícone na bandeja do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostrar a barra de velocidade na bandeja do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Largura de banda da recepção (em kB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Largura de banda do envio (em kB/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostra mensagens quando as torrentes terminam."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Continuar o envio após a recepção ter terminado"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Pasta onde guardar ficheiros temporários"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
- "Se deve gravar automaticamente os ficheiros obtidos na pasta de gravação"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Pasta onde guardar ficheiros obtidos"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2217,86 +2217,86 @@ msgstr ""
- "completas"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "A pasta para onde gravar os ficheiros transferidos por completo"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Se deve copiar automaticamente os ficheiros .torrent para a torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Pasta para onde copiar os ficheiros .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Se deve usar um IP personalizado a passar ao localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "A pasta que foi usada como última pasta de gravação"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP a passar ao localizador"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Utilização da memória"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Intervalo de actualização da interface"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Suporte para o DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Porto do DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Número de blocos de envio"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Colunas visíveis no KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritmo de TE"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2306,457 +2306,457 @@ msgstr ""
- "for menor que o 'minDiskSpace', a torrente será interrompida."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Gestor de 'Plugins'"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Carregar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Fe&char"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Carreg&ar Tudo"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Fechar &Tudo"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositivo UPnP a usar"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositivos detectados:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositivo"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Portos Encaminhados"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Ligação WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Enc&aminhar os Portos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Cancelar o Encaminhamento de Portos"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Pesquisar de Novo"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Activar a pesquisa da pasta1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Activar a pesquisa da pasta2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Activar a pesquisa da pasta3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Local da pasta 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Local da pasta 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Local da pasta 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Se deseja aceder à torrente de forma silenciosa ou não."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Foi assinalada a acção de remoção."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Foi assinalada a acção de movimentação."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferências da Pesquisa de Pastas"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Pesquisar a pasta &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Pesquisar a pasta &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Pesquisar a pasta &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Mover para a pasta \"loaded\" &após o carregamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Move a torrente para a pasta \"loaded\" após o carregamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Abrir silenc&iosamente as torrentes"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Não mostrar a janela 'Seleccionar os ficheiros a obter'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Remover após o carre&gamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Remove a torrente após o carregamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Pastas a pesquisar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Pasta 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Pasta 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Pasta 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferências de Procura"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Servidor Web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Porto de encaminhamento"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL da Sessão (em s):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Seleccionar a interface:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Utilizador:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Mudar a senha..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Local do executável 'php':"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Número do porto"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Porto de encaminhamento"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Tempo de vida da sessão"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "visual da interface"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Local do executável 'php'"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "utilizador"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "senha"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Blocos"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Actualmente a receber:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Obtido:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Excluído:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Falta:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Tamanho:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Bloco"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Evolução"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Ponto"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Pontos Atribuídos"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Origens:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Receptores:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocidade Média de Recepção:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocidade Média de Envio:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Próxima actualização em:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Estado do Localizador:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Partes da torrente que já foram transferidas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Partes da torrente que já estão disponíveis:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Partilha"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2765,146 +2765,146 @@ msgstr ""
- "significa sem limites."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "O seu envio irá parar quando tiver enviado durante este número de horas."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Horas"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Limite de proporções:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "O limite só funciona no modo de fonte"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Limite de tempo:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Act&ualizar o Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Intervalo mínimo de actualização - 60 segundos"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Adiciona&r um Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Remover o Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Mudar o Localizador"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Repor as Predefinições"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostrar página de parceiros na janela principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Mostrar página de pedaços obtidos na janela principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Mostrar a página de localizadores na janela principal"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostrar lista de parceiros"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostrar a l&ista de pedaços actualmente a transferir"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostrar lista de localizadores"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferências do Bloqueio de IPs"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Seleccione o Ficheiro do Filtro do PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Usar o filtro do PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Ficheiro de filtro de IPs:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Obter/Co&nverter"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2914,25 +2914,25 @@ msgstr ""
- "NOTA: é suportado o ficheiro ZIP do bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL do filtro de Nível 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Usar o filtro de nível 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "A converter..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2944,61 +2944,61 @@ msgstr ""
- "durante esse tempo não poderá usar o KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Actualizar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Actualizar os gráficos a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Actualizações da interface"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Recolher dados a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisegundos"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Máximo"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Modo de escala da velocidade máxima:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exacta"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Ver a ajuda 'O Que é Isto?' para saber mais"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -3010,164 +3010,164 @@ msgstr ""
- "- Exacta: A velocidade máxima obtida no gráfico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Velocidade dos pontos"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Velocidade dos pontos:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "actualizar a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "actualizações de dados do gráfico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "A recolha de dados dos pontos ligados poderá consumir algum CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Ligações dos pontos:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- "Os valores altos poderão tornar obscuros os gráficos dos pontos ligados"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostrar as sementes em enxames"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Mostrar os receptores em enxames"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Contagem de medidas"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Envio"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Ligações"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Pontos"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Comutar os gráficos de velocidade dos pontos"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervalo de obtenção dos dados de velocidade dos pontos"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Comutar o desenho dos receptores em enxames"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Comutar o desenho das sementes em enxames"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Contagem de medidas de recepção"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Número de medidas de velocidades dos pontos"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Contagem de medidas de envio"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Contagem de medidas das ligações"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Contagem de medidas de DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Modo dos máximos no eixo OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importa uma transferência existente"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrente:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dados:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3175,684 +3175,684 @@ msgstr ""
- "Indique por favor a torrente e os dados já transferidos para essa torrente."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importar"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "por omissão"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Fontes de RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Fontes"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Apa&gar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nova"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artigos"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Actualiza&r automaticamente"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnorar o TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Actualizar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Título"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Manter os Artigos (dias)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Activo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Aceitar os Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Rejeitar os Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Expressões Regulares"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tratar como &Série"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Processo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Critério da Série"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Ocorrência sem Episódio"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Episódio Máx"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Série Máx"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Série Mín"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Episódio Mín"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testa o te&xto"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&star"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Ocorrências do Filtro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Calendarização da largura de banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoria do botão esquerdo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Categor&ia 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "&Desligar"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoria do botão direito"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categorias"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "recepção:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "envio:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* o zero significa ilimitado"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Gravar num ficheiro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Ler de um ficheiro"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Reiniciar o calendário"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&K"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Página de Preferências do 'Plugin' de Escalonamento"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Usar a calendarização da largura de &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Calendarização da Largura de Banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Usar cores em ve&z de imagens?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Recomendado para os sistemas mais lentos)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Editar o &calendário"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Activar a calendarização da largura de banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Usar cores em vez de imagens?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usar o texto formatado no registo"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Sinal de mensagens de informação geral"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Sinal de mensagens de ligações"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Sinal de mensagens DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Sinal de mensagens de informação do localizador"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Sinal de mensagens de informação da E/S do disco"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' do IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' de pesquisa"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' de UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' da Pesquisa de Pastas"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' de Escalonamento"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' de RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Sinal das mensagens do 'plugin' da Interface Web"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opções do Visualizador do Registo"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "'Plugins'"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Tudo"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Depuração"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Aviso"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Importante"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nada"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "Filtro de IPs:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Procurar:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Pesquisa de Pastas:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Calendarização:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "'Plugin' de RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "'Plugin' da Interface Web:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Geral:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Ligações:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "E/S Disco:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usar te&xto formatado no registo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Navegador Externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Abrir as pesquisas num navegador externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Usar o navegador predefinido"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Localização do navegador personalizado:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Motores de Busca"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nome do motor de busca:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Adicionar"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motores"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "R&emover Tudo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Adicionar Prede&finição"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Actualizar da Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Procurar"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motor de busca:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Motor de busca actual"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Usar um navegador personalizado"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Local do executável do navegador personalizado"
-@@ -4141,7 +4141,7 @@ msgstr "A verificar os dados"
- msgid "Stopped. No space left on device."
- msgstr "Interrompido. Não existe espaço livre em disco."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4149,12 +4149,12 @@ msgstr ""
- "Não tem espaço livre suficiente para transferir esta torrente. Tem a certeza "
- "que deseja continuar?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Espaço em disco insuficiente para o %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4162,16 +4162,16 @@ msgstr ""
- "A torrente \"%1\" atingiu a sua taxa de partilha máxima. Deseja ignorar o "
- "limite e começar a publicação da fonte à mesma?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "A taxa máxima de partilhas foi atingida."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Erro ao parar a torrente %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Erro ao gravar a torrente %1 : %2"
- 
-diff --git a/translations/pt_BR/messages/ktorrent.po b/translations/pt_BR/messages/ktorrent.po
-index e60c28c..a62043e 100644
---- a/translations/pt_BR/messages/ktorrent.po
-+++ b/translations/pt_BR/messages/ktorrent.po
-@@ -7,7 +7,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
- "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-08-10 20:52-0300\n"
- "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
- "Language-Team: Português do Brasil <tde-i18n-pt_br@kde.org>\n"
-@@ -24,7 +24,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nenhuma conexão de entrada (possivelmente sob firewall)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Informações"
-@@ -192,7 +192,7 @@ msgstr "URL mal formada."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Downloads"
-@@ -316,7 +316,7 @@ msgid "Document to open"
- msgstr "Documento para abrir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -583,7 +583,7 @@ msgstr "Fontes de Peers do Torrent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -625,7 +625,7 @@ msgid "Add to Group"
- msgstr "Adicionar ao Grupo"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Limites de Velocidade"
-@@ -644,7 +644,7 @@ msgid "Malformed IP address."
- msgstr "Endereço IP mal formado."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Preferências"
-@@ -680,7 +680,7 @@ msgid "Advanced"
- msgstr "Avançadas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Opções Avançadas"
-@@ -691,7 +691,7 @@ msgstr "Colunas visíveis"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -713,7 +713,7 @@ msgstr "Enviados"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Velocidade de Down"
-@@ -838,7 +838,7 @@ msgid "User"
- msgstr "Usuário"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Gerenciador de Fila"
-@@ -1062,8 +1062,8 @@ msgid "Start torrent"
- msgstr "Iniciar torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Baixar"
-@@ -1117,13 +1117,13 @@ msgid "Encryption"
- msgstr "Encriptação"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Usar encriptação de protocolo"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1133,13 +1133,13 @@ msgstr ""
- "das conexões bittorrent."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Permitir conexões não encriptadas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1148,7 +1148,7 @@ msgstr ""
- "que suportem encriptação."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1159,170 +1159,170 @@ msgstr ""
- "informações."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Usar DHT para obter peers adicionais"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Porta UDP para a comunicação do DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "IP Personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "E&nviar para o tracker um IP ou nome de máquina personalizado"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "IP ou nome de máquina personalizado:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ícone da Área de Notificação do Sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Mostrar ícone na área de notificação do s&istema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr ""
- "Mostrar &barra de velocidade no ícone da área de notiificação do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Mo&strar mensagens popup na área de notificação do sistema"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Largura da banda de upload (em KB/seg):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Largura da banda de download (em KB/seg):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Pastas"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Pasta para armazenar os arquivos temporários:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Mover downloads completados para:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Salvar downloads &automaticamente para:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Copiar arquivos .torrent para:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Barra de ferramentas de Download"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Definir os limites de velocidade para o torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Taxa máx. de upload:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Taxa máx. de download:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 é sem limite)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Adicionar peer potencial"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP do Peer:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Porta:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Digite o IP do peer e a porta."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Lista Negra do KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1332,187 +1332,187 @@ msgstr ""
- "salvar suas entradas ou use o plugin IPFilter (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Peers Banidos"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Endereço IP do peer"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Adicionar peer:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Adiciona um peer à lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Remove o peer selecionado da lista negra"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "&Limpar"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Limpa à lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Salvar &Como..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Salvar esta lista negra para usá-la com o plugin IPFilter do KTorrent"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Máximo de downloads:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Máximo de sementes:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Iniciar o download no disco com pouco espaço :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Espaço mínimo no disco:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Não iniciar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Sempre perguntar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Forçar início"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 é sem limite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Taxa máxima de download:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Limite global de conexões:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Tempo máx. para semear:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Conexões máximas por torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Número de espaços de upload:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Porta UDP do tracker:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Proporção de compartilhamento máx.:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Taxa máxima de upload:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/seg (0 corresponde à sem limite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Horas (0 é sem limite)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Permanecer semeando após o download terminar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Atenção"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1522,283 +1522,283 @@ msgstr ""
- "um router. O plugin UPnP pode fazer isso para você."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Diálogo de Fila do KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Proporção de compartilhamento:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Bytes restando:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Controlado pelo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Upload&s"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Enviados:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "M&over para cima"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Mover para &baixo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Mover para o topo"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Mover para &baixo "
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Controlado pelo &GF"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Controlado pelo &Usuário"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Colar URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "C&ancelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Criar Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "O arquivo ou diretório do qual você deseja criar um torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Você precisa adicionar pelo menos um tracker ou node."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opções de Arquivo"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Tamanho de cada bloco:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Começar a sem&ear o torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Descentrali&zado (somente DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Torrent privado (DHT não é permitido)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Comentários:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Criar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Ca&ncelar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackers"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Nodes DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Node:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP ou nome de máquina"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Porta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1809,19 +1809,19 @@ msgstr ""
- "esse torrent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Preferências Avançadas"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1849,428 +1849,428 @@ msgstr ""
- "de X amostras"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Velocidade atual"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Velocidade global média"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Janela de X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Movimento médio"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(só será aplicado após reiniciar)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "De&sabilitar pré-alocação de disco"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Pré-alocar &totalmente o espaço em disco (previne fragmentação)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Básico (lento)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Específico do sistema de arquivos"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Performance"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Uso da memória:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Baixo"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Médio"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Alto"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Intervalo de atualização da interface:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "CPU Rápida"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "CPU Lenta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Verificação dos Dados"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Durante o upload, &não rechecar blocos maiores que"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Executar uma checagem de &integridade dos dados depois"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "blocos corrompidos"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Networking"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Número máximo de conexões por torrent (0 = sem limite)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- "Não usar as configurações de pro&xy do KDE para conexões de tracker HTTP"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP tracker proxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Escaneando dados"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Escaneando dados do torrent :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Número de blocos encontrados:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Número de blocos com falhas / não baixados:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Testar"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "etiquetaTexto2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "etiquetaTexto3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Número máximo de downloads (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Número máximo de sementes (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Iniciar downloads com pouco espaço em disco?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Número máximo de conexões por torrent (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Número máximo de conexões para todos os torrents (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de upload em KB/seg (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Velocidade máxima de download em KB/seg (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Proporção de compartilhamento máxima (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Tempo máximo de semeamento em horas (0 = sem limite)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Mostrar um ícone na área de notificação do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Mostrar barra de velocidade no ícone da área de notificação do sistema"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Largura da banda de download (em kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Largura da banda de upload (em kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Mostrar mensagens popup quando o torrent for concluído."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Permanecer semeando após o download terminar"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Pasta para armazenar os arquivos temporários"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Salvar downloads automaticamente para o saveDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Pasta para armazenar os arquivos baixados"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Mover automaticamente downloads completados para o completeDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Pasta para mover os arquivos baixados completados"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Copiar automaticamente os arquivos .torrent para o torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Pasta para copiar os arquivos .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Usar um IP personalizado, que será enviado ao tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Diretório que foi usado como último local para salvar"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP para enviar ao tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Uso da memória"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Intervalo de atualização da interface"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Suporte ao DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Porta DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Número de espaços de upload"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Colunas mostradas no KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritmo TE"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2280,457 +2280,457 @@ msgstr ""
- "no disco for menor que minDiskSpace, o torrent será parado."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Gerenciador de Plugins"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Carregar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Descarregar"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Carregar &Todos"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Descarregar Todos"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Dispositivo UDP padrão para o uso"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Dispositivos detectados:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Dispositivo"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Portas Encaminhadas"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Conexão WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Encaminh&ar Portas"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Desfazer Encaminhamento de Portas"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Re-escanear"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Habilitar escaneamento da pasta1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Habilitar escaneamento da pasta2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Habilitar escaneamento da pasta3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Caminho da pasta1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Caminho da pasta2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Caminho da pasta3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Abrir o torrent silenciosamente ou não."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Ação de apagar verificada."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Ação de mover verificada."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Preferências de Escanear Pasta"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Escanear pasta &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Escanear pasta &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Escanear pasta &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Mover para o diretório de \"carregados\" &após o carregamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Mover torrent para o diretório de \"carregados\" após carregá-lo"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Abrir torrents silenc&iosamente"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Não mostrar o diálogo 'Selecionar arquivos para baixar'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Apagar após carre&gar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Apaga o torrent após o carregamento"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Pastas para escanear"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Pasta 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Pasta 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Pasta 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Preferências de Busca"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Servidor Web"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Encaminhar porta"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL da Sessão (em seg.):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Selecionar interface:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Nome de usuário:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Alterar senha..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Caminho do executável do php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Número da porta"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "encaminhar Porta"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Tempo para manter a sessão ativa"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Skin de interface"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Caminho do executável do php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "nomedousuário"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "senha"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Blocos"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Total:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Atualmente baixando:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Baixados:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Excluídos:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Restando:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Tamanho:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Bloco"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Progresso"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Peers Designados"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Semeadores:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Leechers:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Velocidade Média de Down:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Velocidade Média de Up:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Próxima atualização em:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Status do Tracker:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Partes do torrent que já foram baixadas:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Partes do torrent que estão disponíveis:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Compartilhando"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2739,146 +2739,146 @@ msgstr ""
- "Zero significa sem limite."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "Seu upload irá parar quando você tiver enviado por esse número de horas."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Horas"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Limite de taxa:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "O limite somente funciona ao semear"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Limite de tempo:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "At&ualizar Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Intervalo de atualização mínimo - 60 segundos"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Adicionar Trac&ker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Remover Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "&Alterar Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Restaurar Padrões"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Mostrar indicação de peer na janela principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Mostrar indicação de baixa de bloco na janela principal"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Mostrar aba de visualização de trackers na janela principal"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Mostrar lista de peers"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Mostrar lista dos blocos que estão &sendo baixados"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Mostrar lista dos trackers"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Preferências do IPBlocking"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Selecionar o Arquivo de Filtro PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Usar filtro PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Arquivo do filtro de IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Bai&xar/Converter"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2888,25 +2888,25 @@ msgstr ""
- "ATENÇÃO: arquivos ZIP de bluetack.co.uk são suportados."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Filtro de URL nível1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Usar filtro de URL nível1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Convertendo..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2918,61 +2918,61 @@ msgstr ""
- "tempo, você não será capaz de usar o KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Atualizar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Atualizar gráficos a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Atualizações da interface"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Coletar dados a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisegundos"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Máxima"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Modo de escala da velocidade máxima:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exato"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Veja 'O que é isso' para mais ajuda"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2984,164 +2984,164 @@ msgstr ""
- "-Exato: Velocidade máxima alcançada, visível no gráfico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Velocidade dos peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Velocidade dos peers:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "atualizar a cada"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "atualizações dos dados do gráfico"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "Coletar dados sobre muitos peers conectados pode consumir bastante CPU."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Conexões dos peers"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Valores altos podem ocultar os gráficos de peers conectados"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Mostrar semeadores em swarms"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Mostrar leechers em swarms"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Medidas de contagem"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Upload"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Conexões"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Mostrar gráficos de velocidade"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervalo entre a obtenção dos dados sobre a velocidade dos peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Mostrar leechers em swarms"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Mostrar semeadores em swarms"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Medidas de contagem de download"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Medidas de contagem da velocidade dos peers"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Medidas de contagem do upload"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Medidas de contagem de conexões"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Medidas de contagem do DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Modo máx. do eixo OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importar um download existente"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dados:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3150,684 +3150,684 @@ msgstr ""
- "torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importar"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "padrão"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Feeds Rss"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Feeds"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Apa&gar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Novo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artigos"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Atualização a&utomática"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnorar TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Atualizar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Título"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Manter Artigos (dias)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Ativo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Aceitar Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Rejeitar Filtros"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Expressões Comuns"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tratar como %Séries"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Processo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Critério das Séries"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Coincidir Sem Episódio"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Episódio Máx."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Temporada Máx."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Temporada Mín."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Episódio Mín."
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testar te&xto"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&star"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtrar Coincidências"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Agendador de largura de banda"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Categoria do clique esquerdo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Categor&ia 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Des&ligar"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Categoria &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Categoria &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Categoria do clique direito"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Categoria &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Categoria 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Categorias"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "baixar:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "enviar:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Categoria</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* zero corresponde à sem limite"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Salvar para arquivo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Carregar do arquivo"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Resetar agendamento"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Página de Preferências do Plugin de Agendamento"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Usar agendador de largura de &banda?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Agendador de Largura de Banda"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Usar cores ao invés de mapas de pí&xels?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Recomendado para sistemas mais lentos)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Editar &agendamento"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Habilitar agendador de largura de banda?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Usar cores ao invés de mapas de píxels?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Usar texto formatado para o log"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Sinal geral das mensagens com informações"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Sinal das mensagens de conexões"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Sinal das mensagens do DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Sinal das mensagens de informações do tracker"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Sinal das informações de IO de disco"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Sinal das mensagens do plugin IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Sinal das mensagens do plugin de busca"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Sinal das mensagens do plugin PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Sinal das mensagens do plugin InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Sinal das mensagens do plugin UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Sinal das mensagens do plugin Escanear Pasta"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Sinal das mensagens do plugin de Agendamento"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Sinal das mensagens do plugin RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Sinal das mensagens do plugin WebInterface"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opções do LogViewer"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Plugins"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Todas"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Depuração"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Notificações"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Importantes"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Nenhuma"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "FiltroIP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Busca:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "EscanearPasta:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Agendamento:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Plugin RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Plugin Webinterface: "
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistema"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Geral:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Conexões:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "I/O de Disco:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Usar te&xto formatado para o log"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Navegador Externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Abrir resultados da busca no navegador externo"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Usar navegador padrão"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Caminho do navegador personlizado:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Mecanismos de Busca:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Nome do mecanismo de busca:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Adicionar"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Mecanismos"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "R&emover Todos"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Adicionar Pad&rão"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Atualizar da Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Buscar"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Mecanismo de busca:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Mecanismo de busca atual"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Usar navegador personalizado"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Caminho do executável do navegador personalizado"
-@@ -4117,7 +4117,7 @@ msgstr "Verificando dados"
- msgid "Stopped. No space left on device."
- msgstr "Parado. Nenhum espaço restando no dispositivo."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4125,12 +4125,12 @@ msgstr ""
- "Você não possui espaço suficiente no disco para baixar este torrent. Tem "
- "certeza que deseja continuar?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Espaço em disco insuficiente para %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4138,16 +4138,16 @@ msgstr ""
- "O torrent \"%1\" atingiu sua proporção de compartilhamento máxima. Ignorar o "
- "limite e começar a semear assim mesmo?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Limite máximo da proporção de compartilhamento atingido."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Erro ao parar o torrent %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Erro ao iniciar o torrent %1 : %2"
- 
-diff --git a/translations/ru/messages/ktorrent.po b/translations/ru/messages/ktorrent.po
-index f983a25..5d4212e 100644
---- a/translations/ru/messages/ktorrent.po
-+++ b/translations/ru/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-07-25 02:25+0300\n"
- "Last-Translator: Nick Shaforostoff\n"
- "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Нет входящих соединений (возможно их блокирует брандмауэр)."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Сведения"
-@@ -191,7 +191,7 @@ msgstr "Неправильный URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Загрузки"
-@@ -313,7 +313,7 @@ msgid "Document to open"
- msgstr "Открыть файл"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -586,7 +586,7 @@ msgstr "Торрентов на источники:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -630,7 +630,7 @@ msgid "Add to Group"
- msgstr "Добавить в группу"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Ограничение скорости"
-@@ -648,7 +648,7 @@ msgid "Malformed IP address."
- msgstr "Неверный IP-адрес."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Параметры"
-@@ -684,7 +684,7 @@ msgid "Advanced"
- msgstr "Дополнительно"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Дополнительные настройки"
-@@ -695,7 +695,7 @@ msgstr "Видимые столбцы"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Статус"
-@@ -717,7 +717,7 @@ msgstr "Передано"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Скорость приёма"
-@@ -840,7 +840,7 @@ msgid "User"
- msgstr "Пользователь"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Управление очередью"
-@@ -1068,8 +1068,8 @@ msgid "Start torrent"
- msgstr "Запустить торрент"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Загрузка"
-@@ -1123,13 +1123,13 @@ msgid "Encryption"
- msgstr "Шифрование"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Использовать шифрование протокола"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1139,13 +1139,13 @@ msgstr ""
- "провайдерами."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Разрешить нешифрованные соединения."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1154,7 +1154,7 @@ msgstr ""
- "шифрование."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1165,169 +1165,169 @@ msgstr ""
- "руководство для подробностей"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Использовать DHT для получения дополнительных источников."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Порт UDP для DHT коммуникаций:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Указать IP вручную"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Посылать трекеру указанный вручную IP-адрес или имя хоста."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Особый IP или имя хоста:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Значок в системном лотке"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Значок в системном лотке"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Выводить &индикатор скорости в системном лотке"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Показвать всплывающие сообщения."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Скорость отдачи (в КБ/с):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Скорость загрузки (в КБ/с):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Папки"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Каталог для временных файлов:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Перемещать завершённые загрузки в:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Автоматически сохранять загрузки в:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Копировать файлы .torrent в:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Панель загрузок"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Ограничить скорость торрента"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Максимальная скорость передачи:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Максимальная скорость приема:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "КБ/с (0 - без ограничений)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Добавить потенциальный источник"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP источника:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Порт:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Введите IP адрес источника и порт."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Чёрный список Ktorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1337,187 +1337,187 @@ msgstr ""
- "Сохранить/Открыть для сохранения или используйте модуль IPFilter."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Забаненные клиенты"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP-адрес клиента"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Добавить источник:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Добавить источники в чёрный список:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Удалить выбранные источники из чёрного списка"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Очистить"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Очистить список"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Сохранить как..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Сохранить этот список для использования в модуле IPFilter"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Максимальное количество загрузок:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Максимум полных источников:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Начинать загрузку при нехватке места:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Минимальный объём дискового пространства:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Не начинать"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Спрашивать"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Всегда начинать"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "МБ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 - без ограничений)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Ограничение скорости приёма:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Общее ограничение на число соединений:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Максимальное время раздачи:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Максимум соединений на один торрент:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Количество слотов отдачи:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Порт трекера UDP:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Максимальный коэффициент отдачи:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Ограничение скорости отдачи:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "КБ/с (0 - без ограничений)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "ч (0 - без ограничений)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Продолжать раздачу после завершения загрузки"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Внимание"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1527,283 +1527,283 @@ msgstr ""
- "перенаправлены, .Это может выполнить автоматически модуль UPnP."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Диалог очереди KT"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Статус:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Трекер:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Коэффициент передачи:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Осталось байт:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Торрент"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Управляется"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "О&тдачи"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Отдано:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "&Вверх"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "В&низ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "В начало"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "В конец"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, fuzzy, no-c-format
- msgid "&QM Controlled"
- msgstr "&Управляется автоматически"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Управляется пользователем"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Вставить URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Отмена"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Создать торрент"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Файл или папка, для которой требуется создать торрент:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Добавьте хотя бы один трекер или узел."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Параметры файлов"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Размер части:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "КБ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Начать &сидирование"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Децентрализованно (только DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Частный торрент (DHT запрещён)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Комментарии:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "&Создать"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Отменить"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Трекеры"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Узлы DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Узел:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP или имя хоста:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Порт"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1813,19 +1813,19 @@ msgstr ""
- "ввести свой IP-адрес и порт, если вы хотите распространять этот торрент."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Дополнительные параметры"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, fuzzy, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1854,430 +1854,430 @@ msgstr ""
- "образцов."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "По текущей скорости"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "По общей средней скорости"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(вступает в силу при следующем запуске)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Отключить резервирование пространства"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Полностью резервировать пространство (для избежания фрагментирования)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Стандартное (медленно)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Конкретный для каждой файловой системы"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Производительность"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Использование памяти:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Низкое"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Среднее"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Высокое"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Интервал обновления графиков:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 мс"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Быстрый процессор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Медленный процессор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Проверка данных"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Во время раздачи не проверять части больше чем"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Выполнять проверку данных после"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "повреждённых частей"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Сеть"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr ""
- "Максимальное количество соединений на один торрент (0 - без ограничений)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- "Не использовать параметры прокси-сервера KDE для HTTP-соединений с трекером"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Прокси для HTTP трекера:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Сканирование данных"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Сканирование данных торрента:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Количество найденных частей:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Количество испорченных/незагруженных частей:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Проверка"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Максимальное количество загрузок (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Максимальное количество полных источников (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Начинать загрузку при нехватке пространства на диске?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr ""
- "Максимальное количество соединений на один торрент (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Максимальное общее количество соединений (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Максимальная скорость отдачи, КБ/с (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Максимальная скорость приёма, КБ/с (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Максимальное количество полных источников (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Максимальное количество полных источников (0 - без ограничений)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Значок в системном лотке"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Показывать индикатор скорости в системном лотке"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Пропускная способность канала (загрузка) в КБ/с"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Пропускная способность канала (отдача) в КБ/с"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Показывать всплывающие сообщения когда загрузка торрента завершена."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Продолжать передачу после получения всех частей"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Каталог для временных файлов"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Сохранять ли автоматически загрузки в указанный каталог"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Каталог для загруженных файлов"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Автоматически перемещать завершённые в соответствующий каталог."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Каталог для перемещения загруженных файлов"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Автоматически копировать файлы .torrent в специальный каталог."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Каталог для копирования файлов .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Использовать указанный IP для доступа к трекеру?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Каталог, использованный последним для сохранения"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP, передаваемый трекеру"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Использование памяти"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Частота обновления графика"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Поддержка DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Порт DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Число слотов для отдачи"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Столбцы в KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Метод вычисления оставшегося времени"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2286,457 +2286,457 @@ msgstr ""
- "Когда нет места на диске или места меньше минимума, торрент будет остановлен."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Управление модулями"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Включить"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "&Отключить"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Включить все"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Отключить все"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Устройство UPnP по умолчанию"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Обнаруженные устройства:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Устройство"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Перенаправленные порты"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN соединение"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Перенаправить порты"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Отменить перенаправление порта"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Пересканировать"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Сканировать folder1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Сканировать folder2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Сканировать folder3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Путь Folder1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Путь Folder2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Путь Folder3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Предлагать ли выборочную загрузку открываемых торрентов"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Выбрано удаление"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Предлагать перемещение по умолчанию"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Параметры сканирования папок"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Сканировать папку &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Сканировать папку &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Сканировать папку &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Переместить в папку \"загруженные\" после загрузки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Переместить торрент в папку \"загруженные\" после его загрузки."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "&Не предлагать выборочную загрузку открываемых торрентов"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Не показывать диалог выбора файлов в торренте для загрузки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Удалить после загрузки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Удалить торрент-файлы после загрузки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Сканируемые папки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Папка 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Папка 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Папка 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Параметры поиска"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Веб-сервер"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "Перенаправление портов"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "TTL на сеанс (в секундах):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Выберите интерфейс:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Имя пользователя:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Изменить пароль ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Путь к PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Номер порта:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "Перенаправление портов"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Время жизни сеанса"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Общие параметры"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "путь к PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "имя пользователя"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "пароль"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Части"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Общее:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Загружается:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Загружено:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Исключено:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Осталось:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Размер:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Часть"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Выполнение"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Клиент"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Подключенные клиенты"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Полные источники:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Загружающие:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Средняя скорость загрузки:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Средняя скорость отдачи:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Следующее обновление:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Взаимодействие с трекером"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Полученные части:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Доступные части:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Передача"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2745,146 +2745,146 @@ msgstr ""
- "передачи. 0 = не останавливать передачу."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- "Отдача будет остановлена после того как вы раздавали файлы достаточно долго."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "ч"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "Общее ограничение на число соединений"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Ограничение действует только в режиме сидирования"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Ограничение по времени:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "Связаться с трекером"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Минимальный интервал обновления - 60 секунд"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Добавить трекер"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Удалить трекер"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Изменить URL трекера"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Сбросить"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Показать панель просмотра участников в главном окне"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Показать панель загрузки частей в главном окне"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Показать панель трекеров в главном окне"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Показать список участников"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Показать загружа&емые части"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Показать список трекеров"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Параметры блокирования по IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Выберите файл PeerGuardian"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Использовать фильтр PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Файл фильтров IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "За&грузить/Преобразовать"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2894,25 +2894,25 @@ msgstr ""
- "ЗАМЕТКА: поддерживается ZIP-файл с bluetack.co.uk"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL фильтра первого уровня"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Использовать фильтр первого уровня?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Преобразование..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2924,61 +2924,61 @@ msgstr ""
- "это время вы не сможете пользоваться KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Обновить"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Обновлять таблицы каждые"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Частота обновления интерфейса"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Собирать данные каждые"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "мс"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Максимум"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Максимум шкалы скорости:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Точно"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "См. \"Что это?\""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2990,31 +2990,31 @@ msgstr ""
- "- Точно: Максимально достигнутая скорость за интервал отражаемый на графике"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Скорость у участников"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Скорость у участников:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "обновлять каждые"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "обновления графиков"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3022,133 +3022,133 @@ msgstr ""
- "производительности."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Соединения с участниками:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, fuzzy, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Большие значения могут заслонять колонки с соединенными клиентами"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Показывать сидов в списке"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, fuzzy, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Показывать скачивающих в списке"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Числовые значения"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Отдача"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Соединения"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Участники"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, fuzzy, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Переключение таблиц скоростей клиентов"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Интервал между получением данных о скорости у участников"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, fuzzy, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Переключение прорисовки скачивающих в списке"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, fuzzy, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Переключение прорисовки сидов в списке"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Расчет значения загрузки"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, fuzzy, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Расчет значения скорости клиентов"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, fuzzy, no-c-format
- msgid "Upload mesurments count"
- msgstr "Расчет значения отдачи"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "Расчет значения соединений"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, fuzzy, no-c-format
- msgid "DHT mesurments count"
- msgstr "Расчет значений DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Максимум оси OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Импорт существующей загрузки"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Торрент:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Данные:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
-@@ -3157,684 +3157,684 @@ msgstr ""
- "этого торрента."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Импортировать"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "по-умолчанию"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Ленты RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Ленты"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Удалить"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, fuzzy, no-c-format
- msgid "&New"
- msgstr "Добавить"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Статьи"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Автообновление"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Игнорировать TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Обновить"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "Заголовок"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Хранить статьи (дни)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "Активно"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Фильтры"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Принимать фильтры"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, fuzzy, no-c-format
- msgid "Reject Filters"
- msgstr "Отклонять фильтры"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Регулярные выражения"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Рассматривать как серию"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Выполнение"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Коэффициент передачи:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Путь Folder1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Планирование использования канала"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Категор&ия 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "В&ыключить"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Норма"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Категория &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Категория &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Категория &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Категория 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Категории"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "загрузка:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "отдача:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "КБ/с *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Категория</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 - без ограничений"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Сохранить в файл"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Загрузить из файла"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, fuzzy, no-c-format
- msgid "Reset schedule"
- msgstr "Сбросить задание"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, fuzzy, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Страница параметров модуля задач"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Включить &планирование использования канала"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Планирование использования канала"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Использовать цвета вместо изображений?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(рекомендуется для медленных компьютеров)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, fuzzy, no-c-format
- msgid "Edit s&chedule"
- msgstr "Изменить задание"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Включить планирование использования канала?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Использовать цвета вместо изображений?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Общие параметры"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Модули"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Все"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Отладка"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Уведомление"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Важное"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Нет"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-фильтр:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Поиск:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Сканировать каталог:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Планирование:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Загрузка неполных файлов:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Модуль RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Модуль Веб-интерфейса"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, fuzzy, no-c-format
- msgid "System"
- msgstr "Система"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Общие:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Соединения:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Работа с жёстким диском:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Использовать rtf для протокола"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Внешний браузер"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Открывать поисковые запросы во внешнем браузере"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Использовать стандартный браузер"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Указать путь к браузеру:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Поисковики"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Имя поисковика:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Добавить"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Поисковики"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Удалит&ь все"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Добавить основной"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Обновить из Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Поиск"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Поисковик:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Текущий поисковик"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Использовать указанный браузер"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Путь к браузеру"
-@@ -4121,18 +4121,18 @@ msgstr "Проверка данных"
- msgid "Stopped. No space left on device."
- msgstr "Остановлено. Нет места на диске."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr "Не достаточно места для загрузки торрента. Продолжить?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Недостаточно дискового пространства для %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- #, fuzzy
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
-@@ -4141,17 +4141,17 @@ msgstr ""
- "Торрент \"%1\" достиг своего максимума ратио. Игнорировать и продолжить "
- "сидирование?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- #, fuzzy
- msgid "Maximum share ratio limit reached."
- msgstr "Максимум ратио достигнут."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Ошибка при остановке торрента %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Ошибка при запуске торрента %1: %2"
- 
-diff --git a/translations/rw/messages/ktorrent.po b/translations/rw/messages/ktorrent.po
-index c976c6f..5fbb37e 100644
---- a/translations/rw/messages/ktorrent.po
-+++ b/translations/rw/messages/ktorrent.po
-@@ -15,7 +15,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent 3.4\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2005-05-25 18:43-0600\n"
- "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
- "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-@@ -28,7 +28,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Ibisobanuro"
-@@ -207,7 +207,7 @@ msgstr "URL Ikoze nabi"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Iyimura"
-@@ -330,7 +330,7 @@ msgid "Document to open"
- msgstr "Inyandiko igomba gufungurwa"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, fuzzy, no-c-format
- msgid "KTorrent"
- msgstr "Ikinyakoreya"
-@@ -618,7 +618,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr ""
-@@ -662,7 +662,7 @@ msgid "Add to Group"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr ""
-@@ -681,7 +681,7 @@ msgid "Malformed IP address."
- msgstr "URL Ikoze nabi"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Ibyahisemo"
-@@ -716,7 +716,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Idosiye "
-@@ -727,7 +727,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Imimerere"
-@@ -750,7 +750,7 @@ msgstr "Gushyiraho"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, fuzzy, no-c-format
- msgid "Down Speed"
- msgstr "Ntu kohereze"
-@@ -876,7 +876,7 @@ msgid "User"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr ""
-@@ -1077,8 +1077,8 @@ msgid "Start torrent"
- msgstr "Gutangira i "
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Iyimura"
-@@ -1132,13 +1132,13 @@ msgid "Encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1146,20 +1146,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1167,169 +1167,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, fuzzy, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, fuzzy, no-c-format
- msgid "Folders"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Kuri By'igihe gito Idosiye : "
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Iyimura"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, fuzzy, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Kubika Iyimura Kuri : "
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Amadosiye y'inyandiko"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, fuzzy, no-c-format
- msgid "Download Toolbar"
- msgstr "Iyimura y'ububiko"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Gutangira i "
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Gushyiraho Igipimo : "
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Iyimura Igipimo : "
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "/Sec. ( 0 %S ni Oya ) "
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Peru"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Impagikiro:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Amadosiye y'inyandiko"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1337,187 +1337,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "Kugena ibizakorwa"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, fuzzy, no-c-format
- msgid "Maximum downloads:"
- msgstr "Iyimura : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, fuzzy, no-c-format
- msgid "Maximum seeds:"
- msgstr "Iyimura : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "Itatangiye"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Itatangiye"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, fuzzy, no-c-format
- msgid "(0 is no limit)"
- msgstr "( 0 %S ni Oya ) "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, fuzzy, no-c-format
- msgid "Maximum download rate:"
- msgstr "Iyimura Igipimo : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Ikigero cy'Ingano:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, fuzzy, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Ukwihuza Iyimura : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, fuzzy, no-c-format
- msgid "UDP tracker port:"
- msgstr "Umuyoboro: : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Ikigero cy'Ingano:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, fuzzy, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Gushyiraho Igipimo : "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, fuzzy, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "/Sec. ( 0 %S ni Oya ) "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "( 0 %S ni Oya ) "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, fuzzy, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "Nyuma Iyimura ni Byarangiye "
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, fuzzy, no-c-format
- msgid "Attention"
- msgstr "icya/ibyahindutse"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1525,283 +1525,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Imimerere:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, fuzzy, no-c-format
- msgid "Tracker:"
- msgstr "Mucapurirakure"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, fuzzy, no-c-format
- msgid "Share ratio:"
- msgstr "Ikigero cy'Ingano:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, fuzzy, no-c-format
- msgid "Torrent"
- msgstr "Ikinyakoreya"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, fuzzy, no-c-format
- msgid "Upload&s"
- msgstr "Gushyiraho"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, fuzzy, no-c-format
- msgid "Uploaded:"
- msgstr "Gushyiraho"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, fuzzy, no-c-format
- msgid "O&K"
- msgstr "YEGO"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, fuzzy, no-c-format
- msgid "C&ancel"
- msgstr "Kureka"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, fuzzy, no-c-format
- msgid "Create Torrent"
- msgstr "Gukora inyandiko"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, fuzzy, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Idosiye Cyangwa Ububiko Bya Kuri Kurema A : "
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "&Ongera Ku Rimwe . "
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, fuzzy, no-c-format
- msgid "File Options"
- msgstr "Idosiye "
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, fuzzy, no-c-format
- msgid "Size of each chunk:"
- msgstr "Bya : "
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, fuzzy, no-c-format
- msgid "128"
- msgstr "1,28"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, fuzzy, no-c-format
- msgid "256"
- msgstr "25"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, fuzzy, no-c-format
- msgid "512"
- msgstr "12"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, fuzzy, no-c-format
- msgid "1024"
- msgstr "0,24"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, fuzzy, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Gutangira i "
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Ibisobanuro:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Kurema"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, fuzzy, no-c-format
- msgid "Ca&ncel"
- msgstr "Kureka"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, fuzzy, no-c-format
- msgid "Trackers"
- msgstr "Udusodeko"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Izina:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Umuyoboro"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1809,19 +1809,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Ibyahiswemo by'Umutekano"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1837,427 +1837,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Shakisha "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Ibyahisemo"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, fuzzy, no-c-format
- msgid "GUI update interval:"
- msgstr "Ihuzagihe in : "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Umubare Bya Ukwihuza Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Umuyoboro: : "
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr ""
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, fuzzy, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Umubare Bya Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, fuzzy, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Umubare Bya Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, fuzzy, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Umubare Bya Ukwihuza Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, fuzzy, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Umubare Bya Ukwihuza Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, fuzzy, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Gushyiraho Umuvuduko in /Sec. ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, fuzzy, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Umuvuduko in /Sec. ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Umubare Bya Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Umubare Bya Iyimura ( 0 %S = Oya ) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, fuzzy, no-c-format
- msgid "Show a system tray icon"
- msgstr "A Sisitemu Agasanduku Agashushondanga "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, fuzzy, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Nyuma Iyimura Byarangiye "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, fuzzy, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Kuri By'igihe gito Idosiye "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, fuzzy, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Kubika Iyimura Kuri : "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, fuzzy, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Kuri Yimuwe Idosiye "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Kubika Iyimura Kuri : "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Kuri Yimuwe Idosiye "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Kubika Iyimura Kuri : "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Kuri By'igihe gito Idosiye "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, fuzzy, no-c-format
- msgid "GUI update interval"
- msgstr "Ihuzagihe in : "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2265,602 +2265,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, fuzzy, no-c-format
- msgid "U&nload"
- msgstr "Iyimura"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Iyimura"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, fuzzy, no-c-format
- msgid "Device"
- msgstr "Igaragazambere"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, fuzzy, no-c-format
- msgid "Ports Forwarded"
- msgstr "Yimuwe"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr ""
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, fuzzy, no-c-format
- msgid "Folder1 path"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, fuzzy, no-c-format
- msgid "Folder2 path"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, fuzzy, no-c-format
- msgid "Folder3 path"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, fuzzy, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Gufungura Idosiye %1 : %2 "
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, fuzzy, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Ibyahiswemo by'Umutekano"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, fuzzy, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Amadosiye y'inyandiko"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, fuzzy, no-c-format
- msgid "Folders to scan"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, fuzzy, no-c-format
- msgid "Folder 1:"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, fuzzy, no-c-format
- msgid "Folder 2:"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, fuzzy, no-c-format
- msgid "Folder 3:"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, fuzzy, no-c-format
- msgid "Search Preferences"
- msgstr "Ibyahiswemo by'Umutekano"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Guhitamo Umanuka"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Amahitamo Rusange"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, fuzzy, no-c-format
- msgid "Chunks"
- msgstr "Inkingi"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, fuzzy, no-c-format
- msgid "Total:"
- msgstr "Igiteranyo:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, fuzzy, no-c-format
- msgid "Currently downloading:"
- msgstr "Iyimura : "
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, fuzzy, no-c-format
- msgid "Downloaded:"
- msgstr "Yimuwe"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, fuzzy, no-c-format
- msgid "Excluded:"
- msgstr "Gukuramo igice: "
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, fuzzy, no-c-format
- msgid "Size:"
- msgstr "Ingano"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, fuzzy, no-c-format
- msgid "Chunk"
- msgstr "Umwanda"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Aho bigeze"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, fuzzy, no-c-format
- msgid "Peer"
- msgstr "Peru"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, fuzzy, no-c-format
- msgid "Assigned Peers"
- msgstr "Kugena ibizakorwa"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, fuzzy, no-c-format
- msgid "Seeders:"
- msgstr "Uwohereza"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, fuzzy, no-c-format
- msgid "Leechers:"
- msgstr "Ibaruwa:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, fuzzy, no-c-format
- msgid "Average Down Speed:"
- msgstr "Umuvuduko "
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, fuzzy, no-c-format
- msgid "Average Up Speed:"
- msgstr "Umuvuduko "
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, fuzzy, no-c-format
- msgid "Next update in:"
- msgstr "Ihuzagihe in : "
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, fuzzy, no-c-format
- msgid "Tracker Status:"
- msgstr "Udusodeko"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Bya i Idosiye Yimuwe : "
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, fuzzy, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Bya i Idosiye Bihari : "
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Mucapurirakure"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Mucapurirakure"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Mucapurirakure"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Mucapurirakure"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr "Mburabuzi "
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, fuzzy, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Iyimura : "
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, fuzzy, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Ibyahisemo"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Amadosiye y'inyandiko"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Amadosiye y'inyandiko"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, fuzzy, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Iyimura Byinshi..."
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2868,25 +2868,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, fuzzy, no-c-format
- msgid "Converting..."
- msgstr "Kurema"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2895,61 +2895,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Ihuzagihe in : "
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Iyimura : "
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Iyimura : "
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2958,847 +2958,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "N'aho mukanya"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Peru"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Kwerekana agashushondanga k'igitwara sisitemu"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Gushyiraho"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, fuzzy, no-c-format
- msgid "Peers"
- msgstr "N'aho mukanya"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Iyimura Byinshi..."
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, fuzzy, no-c-format
- msgid "Torrent:"
- msgstr "Ikinyakoreya"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "Mburabuzi "
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Uwohereza"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "Ibyahisemo"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Aho bigeze"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Ikigero cy'Ingano:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, fuzzy, no-c-format
- msgid "download:"
- msgstr "Iyimura"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, fuzzy, no-c-format
- msgid "upload:"
- msgstr "Gushyiraho"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, fuzzy, no-c-format
- msgid "* zero means no limit"
- msgstr "( 0 %S ni Oya ) "
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, fuzzy, no-c-format
- msgid "O&k"
- msgstr "YEGO"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr ""
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, fuzzy, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, fuzzy, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, fuzzy, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, fuzzy, no-c-format
- msgid "LogViewer Options"
- msgstr "Idosiye "
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, fuzzy, no-c-format
- msgid "Debug"
- msgstr "Ubwoko "
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, fuzzy, no-c-format
- msgid "IPFilter:"
- msgstr "Ibyahisemo"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, fuzzy, no-c-format
- msgid "Search:"
- msgstr "Gushaka"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, fuzzy, no-c-format
- msgid "ScanFolder:"
- msgstr "amadosiye yose"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, fuzzy, no-c-format
- msgid "Scheduler:"
- msgstr "Uwohereza"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Amahitamo Rusange"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, fuzzy, no-c-format
- msgid "General:"
- msgstr "Rusange"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, fuzzy, no-c-format
- msgid "Search Engines"
- msgstr "Shakisha ama moteri"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, fuzzy, no-c-format
- msgid "Search engine name:"
- msgstr "Izina: : "
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Ongera"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, fuzzy, no-c-format
- msgid "Engines"
- msgstr "Ama moteri yose"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, fuzzy, no-c-format
- msgid "R&emove All"
- msgstr "Gukuraho Byose"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, fuzzy, no-c-format
- msgid "Add Defau&lt"
- msgstr "Mburabuzi "
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "Ihuzagihe in : "
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Gushaka"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, fuzzy, no-c-format
- msgid "Search engine:"
- msgstr "Shakisha Imoteri"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, fuzzy, no-c-format
- msgid "Current search engine"
- msgstr "Shakisha "
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4106,34 +4106,34 @@ msgstr ""
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- #, fuzzy
- msgid "Error stopping torrent %1 : %2"
- msgstr "Gufungura Idosiye %1 : %2 "
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- #, fuzzy
- msgid "Error starting torrent %1 : %2"
- msgstr "Gufungura Idosiye %1 : %2 "
-diff --git a/translations/sk/messages/ktorrent.po b/translations/sk/messages/ktorrent.po
-index 647dbfc..a257b1a 100644
---- a/translations/sk/messages/ktorrent.po
-+++ b/translations/sk/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-08-30 19:00+0200\n"
- "Last-Translator: Jozef Riha <jose1711@gmail.com>\n"
- "Language-Team: Slovak <sk@li.org>\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -195,7 +195,7 @@ msgstr "Nesprávna URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Downloady"
-@@ -321,7 +321,7 @@ msgid "Document to open"
- msgstr "Dokument na otvorenie"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -609,7 +609,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -653,7 +653,7 @@ msgid "Add to Group"
- msgstr "Vlastná IP"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, fuzzy, no-c-format
- msgid "Speed Limits"
- msgstr "Limit rýchlosti v kB/s"
-@@ -672,7 +672,7 @@ msgid "Malformed IP address."
- msgstr "Nesprávna URL."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Nastavenia"
-@@ -709,7 +709,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "Možnosti priečinku prehľadávania"
-@@ -720,7 +720,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stav"
-@@ -742,7 +742,7 @@ msgstr "Odoslané"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Sťahovanie"
-@@ -875,7 +875,7 @@ msgid "User"
- msgstr "Užívateľ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Manažér frontu"
-@@ -1083,8 +1083,8 @@ msgid "Start torrent"
- msgstr "Začni &vysielať torrent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Stiahnuť"
-@@ -1138,13 +1138,13 @@ msgid "Encryption"
- msgstr "Šifrovanie"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Použiť šifrovanie"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1152,13 +1152,13 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Povoliť nešifrované spojenia"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1167,7 +1167,7 @@ msgstr ""
- "šifrovanie."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1177,169 +1177,169 @@ msgstr ""
- "<br>Protokol komunikácie decentralizovaných peerov."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Použiť DHT pre získanie ďalších zdrojov"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP port pre komunikáciu s DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Vlastná IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Po&slať trackeru vlastnú IP alebo hostiteľa"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Vlastná IP alebo hostiteľ:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Priečinky"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Priečinok pre uloženie dočasných súborov:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Nestiahnuť"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Automaticky uložiť sťahované súbory sem:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "torrent súbory"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Panel sťahovania"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Začni &vysielať torrent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximálna rýchlosť odosielania:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "Maximálna rýchlosť sťahovania:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "kB/s (0 znamená bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "Peer"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, fuzzy, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Torrent súbory"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1347,187 +1347,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, fuzzy, no-c-format
- msgid "Banned Peers"
- msgstr "Pridelený peerovia"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximum sťahovaní:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximum zdrojov:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, fuzzy, no-c-format
- msgid "Minimum disk space:"
- msgstr "Alokujem diskový priestor"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "Nespustené"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "Nespustené"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 znamená bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximálna rýchlosť sťahovania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, fuzzy, no-c-format
- msgid "Global connection limit:"
- msgstr "Globálny limit spojení"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "Ratio sťahovania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximum spojení na jeden torrent:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Počet slotov pre odosielanie:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Port pre UDP tracker:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "Ratio sťahovania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximálna rýchlosť odosielania:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "kB/s (0 znamená bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "(0 znamená bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Pokračuj v odosielaní po ukončení sťahovania"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Upozornenie"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1537,283 +1537,283 @@ msgstr ""
- "môže urobiť za vás."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT dialóg frontu"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stav:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Ratio sťahovania:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Zostáva bytov:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontrolované"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Uploa&dy"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Odoslané:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Po&suň hore:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Pos&uň dole:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "Po&suň hore:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&QM Kontrolované"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Používateľom kontrolované"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Vložiť URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&K"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Ukončiť"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Vytvoriť Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Súbor alebo priečinok, z ktorého si prajete vytvoriť torrent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Musíte pridať aspoň jeden tracker."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Možnosti súboru"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Veľkosť dielu:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Začni &vysielať torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Súkromný torrent (DHT zákazané)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Komentáre:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "Vyt&voriť"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "Z&rušiť"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackery"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "Žiadne"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "Vlastná IP alebo hostiteľ:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1821,19 +1821,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "Možnosti vyhľadávania"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1849,331 +1849,331 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "Súčasný vyhľadávací stroj"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "Nastavenia"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Využitá pamäť:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Nízka"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Stredná"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Vysoká"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Interval obnovenia GUI:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, fuzzy, no-c-format
- msgid "Data Checking"
- msgstr "Kontrola dát"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximálny počet spojení pre jeden torrent (0 = bez limitu)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Port pre UDP tracker:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Prehľadávanie dát"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, fuzzy, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Prehľadávanie dát ohľadom dielov"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Nájdený počet dielov:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Počet dielom, ktoré sa nepodarilo stiahnuť:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximálny počet sťahovaní (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximálny počet zdrojov (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximálny počet spojení pre jeden torrent (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maximálny počet spojení pre všetky torrenty (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximálna rýchlosť odosielania v kB/s (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximálna rýchlosť sťahovania v kB/s (0 = bez limitu)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Dosiahnuté maximálne ratio zdieľania."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Dosiahnuté maximálne ratio zdieľania."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Zapnúť ikonu v tray paneli"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Ukázať bublinu pri dokončení sťahovania."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Umožniť ostatným sťahovať odo mňa po ukončení sťahovania"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Priečinok pre uloženie dočasných súborov"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr ""
-@@ -2181,13 +2181,13 @@ msgstr ""
- "bez vyzvy"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Priečinok pre uloženie stiahnutých súborov"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
-@@ -2195,13 +2195,13 @@ msgstr ""
- "bez vyzvy"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Priečinok pre uloženie stiahnutých súborov"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
-@@ -2209,73 +2209,73 @@ msgstr ""
- "bez vyzvy"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Priečinok pre uloženie dočasných súborov"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Určuje, či sa má poslať trackeru vlastná IP."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP adresa poslaná na tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Využitie pamäte"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Interval obnovenia GUI"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Podpora pre DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Počet slotov pre posielanie"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2283,457 +2283,457 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Manažér Modulov"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Spustiť"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Vy&pnúť"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "Spustiť všetky"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "Vypnúť všetky"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Hlavné zariadenie UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Nájdené zariadenia:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Zariadenie"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Nasmerované porty"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "Spojenia:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Nasmeruj porty"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Vrátiť späť Nasmerovanie Portov"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Preskenuj"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Povoliť prehľadávanie priečinku1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Povoliť prehľadávanie priečinku2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Povoliť prehľadávanie priečinku3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Cesta k priečinku1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Cesta k priečinku2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Cesta k priečinku3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Určuje, či sa má torrent otvoriť potichu."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Vybratá akcia vymazania."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Vybratá akcia presunutia."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Nastavenia Priečinku vyhľadávania"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Prehľadať priečinok %1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Prehľadať priečinok %1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Prehľadať priečinok %1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Presunúť do adresára \"načítané\" po &načítaní"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Presunúť torrent do adresára \"načítané\" po &načítaní"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Otvoriť torrenty poti&chu"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Nezobrazovať dialóg 'Vyberanie súborov na stiahnutie'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Zmazať po načí&taní"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Zmaže torrent po načítaní"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Priečinky na vyhľadávanie"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Priečinok 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Priečinok 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Priečinok 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Možnosti vyhľadávania"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "Nasmeruj porty"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "Nevyber &nič"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "Užívateľ"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "Nasmeruj porty"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "Všeobecné - nastavenia"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Diely"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Spolu:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Práve sa sťahuje:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Stiahnuté:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Vylúčené:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Veľkosť:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Kúsok"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Priebeh"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Pridelený peerovia"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Seederov:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Peerov:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Priem. rýchl. sťahovania:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Priem. rýchl. odosielania:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Ďalšia obnova o:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Stav trackera:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Časti torrentu, ktoré už sú stiahnuté:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Časti torrentu, ktoré sú dostupné:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Zdieľanie"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2742,7 +2742,7 @@ msgstr ""
- "znamená bez limitu."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, fuzzy, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2750,139 +2750,139 @@ msgstr ""
- "znamená bez limitu."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "Globálny limit spojení"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Limit je funkčný iba v móde seed"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "P&oužiť limit?"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "Ob&nov tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Najmenší interval obnovenia je 60 sekúnd"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "Pridať &tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, fuzzy, no-c-format
- msgid "Remove Tracker"
- msgstr "Odobrať tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Z&meniť tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, fuzzy, no-c-format
- msgid "Restore Defaults"
- msgstr "Obnoviť pôvodné"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Zobraziť kartu s peermi v hlavnom okne"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Zobraziť kartu s kúskami v hlavnom okne"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Zobraziť kartu s trackermi v hlavnom okne"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Ukázať zoznam peerov"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Ukázať zoznam práve sťahovaných &kúskov"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Ukázať zoznam trackerov"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Nastavenie blokovania IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Použiť filter KTorrent?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Použiť filter KTorrent?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Súbor s IP filtrom:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Stiahnuť/&Konvertovať"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2890,25 +2890,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL na filter stupňa 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Použiť filter stupňa 1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konvertujem..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2920,61 +2920,61 @@ msgstr ""
- "konverzie nie je možné používať KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "Interval obnovenia GUI"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "Maximum zdrojov:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maximum zdrojov:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2983,847 +2983,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "Užívatelia"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "Peer"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "Spojenia:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Ukázať i&konu v tray paneli"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "Uploady"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "Spojenia:"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Užívatelia"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "Stiahnuť torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "Príznak správ pripojení"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importovať existujúce sťahovanie"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Dáta:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Prosím zadajte torrent a už stiahnuté dáta pre tento torrent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importovať"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "Pridať pred&volený"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "Seederov:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "IPFilter:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "Všetky súbory"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "Priebeh"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "Max ratio:"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, fuzzy, no-c-format
- msgid "Te&st"
- msgstr "Test"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "Cesta k priečinku1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Plánovač rýchlosti"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Kategória ľavého kliknutia"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategó&ria 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "V&ypnúť"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normálna"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategória &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategória &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Kategória pravého kliknutia"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategória &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategória 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategórie"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "sťahovanie:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "odosielanie:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "kB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Kategória</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* nula znamená bez limitu"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Uložiť do súboru"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Načítať zo súboru"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Zrušiť plán"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Možnosti modulu Plánovač"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Použiť plánovač &priepustnosti linky?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Plánovač rýchlosti"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Použiť farby namiesto obrázkov?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(odporúčané pre pomalšie počítače)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Editovať časový &plán"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Povoliť plánovač rýchlosti?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Použiť farby namiesto obrázkov?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Použiť formátovaný text v zázname"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Príznak správ základných informácií"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Príznak správ pripojení"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Príznak správ DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Príznak správ informácií o trackeri"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Príznak správ V/V na disk"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Príznak správ modulu filtrovania IP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Príznak správ modulu vyhľadávania"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Príznak správ modulu PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Príznak správ modulu informácií"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Príznak správ modulu UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Príznak správ modulu Priečinok prehľadávania"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Príznak správ modulu plánovača"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Príznak správ modulu vyhľadávania"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Príznak správ modulu filtrovania IP"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Nastavenie Prehliadača záznamov"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Moduly"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Všetky"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Ladenie"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Poznámka"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Dôležité"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Žiadne"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IPFilter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Vyhľadávanie:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "PriečinokPrehľadávania:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Plánovač:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Všeobecné - nastavenia"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Systém"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Základné:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Spojenia:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk V/V:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Použiť formátovaný text pre protokol"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "Vlastná IP"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Vyhľadávacie stroje"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Meno vyhľadávacieho stroja:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Pridať"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Stroje"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "O&dobrať všetky"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Pridať pred&volený"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "Obnoviť z internetu"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Hľadať"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Vyhľadávací stroj:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Súčasný vyhľadávací stroj"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4113,7 +4113,7 @@ msgstr "Kontrola dát"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
-@@ -4122,12 +4122,12 @@ msgstr ""
- "Odznačili ste nasledujúce už existujúce súbory. Týmto stratíte všetky dáta v "
- "týchto súboroch, ste si istý, že to chcete urobiť?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Alokujem diskový priestor"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4135,16 +4135,16 @@ msgstr ""
- "Torrent \"%1\" dosiahol svoje maimálne ratio zdieľania. Ignorovať limit a "
- "napriek tomu začať odosielanie?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Dosiahnuté maximálne ratio zdieľania."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Chyba pri zastavení torrentu %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Chyba pri spúšťaní torrentu %1 : %2"
- 
-diff --git a/translations/sr/messages/ktorrent.po b/translations/sr/messages/ktorrent.po
-index 747f10a..639783c 100644
---- a/translations/sr/messages/ktorrent.po
-+++ b/translations/sr/messages/ktorrent.po
-@@ -6,7 +6,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-02-26 13:59+0100\n"
- "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
- "Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Нема долазних веза (вероватно сте иза заштитног зида)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Инфо"
-@@ -190,7 +190,7 @@ msgstr "Лоше формиран URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Преузимања"
-@@ -313,7 +313,7 @@ msgid "Document to open"
- msgstr "Документ за отварање"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "КТорент"
-@@ -577,7 +577,7 @@ msgstr "Извори вршњака за торент:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -619,7 +619,7 @@ msgid "Add to Group"
- msgstr "Додај у групу"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Ограничења брзине"
-@@ -637,7 +637,7 @@ msgid "Malformed IP address."
- msgstr "Лоше формирана адреса."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Подешавања"
-@@ -673,7 +673,7 @@ msgid "Advanced"
- msgstr "Напредно"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Напредне опције"
-@@ -684,7 +684,7 @@ msgstr "Видљиве колоне"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Стање"
-@@ -706,7 +706,7 @@ msgstr "Послато"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Преузимање"
-@@ -832,7 +832,7 @@ msgid "User"
- msgstr "Корисник"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Управник редоследа"
-@@ -1057,8 +1057,8 @@ msgid "Start torrent"
- msgstr "Покрени торент"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Преузимање"
-@@ -1112,13 +1112,13 @@ msgid "Encryption"
- msgstr "Шифровање"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Користи шифровање протокола"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1128,13 +1128,13 @@ msgstr ""
- "вашег интернет провајдера."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Дозволи не-шифроване везе"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1143,7 +1143,7 @@ msgstr ""
- "шифровање."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1154,169 +1154,169 @@ msgstr ""
- "детаља."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Користи DHT да добијеш више вршњака"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP порт за DHT комуникацију:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Посебан IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "&Пошаљи пратиоцу посебан ИП или име домаћина"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Посебан IP или име домаћина:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Икона системске касете"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Прикажи икону с&истемске касете"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Прикажи &брзиномер у икони"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Прикажи искачуће поруке системске касете"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Проток слања (у KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Проток преузимања (у KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Фасцикле"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Фасцикла за привремене фајлове:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Премести завршена преузимања у:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Аутоматски сними преузимања у:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Копирај .torrent фајлове у:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Трака преузимања"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Поставите ограничења брзине за торент"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Највећа брзина слања:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Највећа брзина преузимања:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 је без ограничења)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Додај могућег вршњака"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP вршњака:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Порт:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Унесите IP и порт вршњака."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "КТорентова црна листа"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1326,187 +1326,187 @@ msgstr ""
- "да би сте сачували уносе или користите IPFilter прикључак (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Блокирани вршњаци"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP адреса вршњака"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Додај вршњака:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Додаје вршњака на црну листу"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Уклања изабраног вршњака са црне листе"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Оч&исти"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Чисти ову листу"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Сачувај к&ао..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Снима ову црну листу да се може користити са прикључком ИП филтер"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Највише преузимања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Највише сејања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Преузимање при малом простору на диску :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Минимум простора на диску:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Не покрећи"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Увек питај"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Форсирај"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 је без ограничења)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Највећа брзина преузимања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Глобално ограничење веза:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Најдуже време сејања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Највише веза по торенту:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Број веза слања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP порт пратиоца:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Највећи однос дељења:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Највећа брзина слања:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 је без ограничења)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "часова (0 је без ограничења)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Настави сејање након завршеног преузимања"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Пажња"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1516,283 +1516,283 @@ msgstr ""
- "може то да учини за вас."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT прозор редоследа"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Стање:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Пратилац:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Однос:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Преостало:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Торент"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Контролише"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Слања"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Послато:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "П&омери горе"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Помери до&ле"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Помери на врх"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Помери на &дно"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&Контролише управник"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Контролише ко&рисник"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Пренеси URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "У &реду"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "Отк&ажи"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Направи торент"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Фајл или фасцикла за које хоћете да направите торент:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Морате додати бар једног пратиоца или чвор."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Опције фајла"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Величина сваког парчета:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Почни се&јање торента"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Децентрали&зовано (само DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Лични торент (DHT није дозвољен)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Коментари:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Направи"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "О&ткажи"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Пратиоци"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT чворишта"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Чвор:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP или име домаћина"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Порт"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1802,19 +1802,19 @@ msgstr ""
- "и вашу IP адресу и порт ако намеравате да сејете овај торент."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Напредна подешавања"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "Алгоритам процене преосталог времена:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1842,429 +1842,429 @@ msgstr ""
- "<b>Алгоритам просека померања:</b> Просек померања се рачуна из X (икс) узорака"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Тренутна брзина"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Општа просечна брзина"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Прозор Икса"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Просек померања"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(делује након поновног покретања)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Искључи &резервисање простора"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "У потпуности ре&зервиши простор (избегава фрагментацију)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Основно (споро)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Својствено за фајл-систем"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Могућности"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Заузетост меморије:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Ниска"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Средња"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Висока"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Освежавање приказа:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Брз процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Спор процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Провера података"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Приликом слања &не проверавај поново парчиће веће од"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Провери &исправност података након"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "оштећених парчића"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Мрежа"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Највећи број подешавања везе:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP за IP пакете:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Не користи KDE-ов про&кси за везе HTTP пратиоца"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Прокси HTTP пратиоца:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Проверавам податке"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Проверавам податке торента :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Број нађених парчића :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Број лоших / непреузетих :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Тест"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Највећи број преузимања (0 = без ограничења)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Највећи број сејања (0 = без ограничења)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Да покрећем преузимања када је мало простора на диску?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Највећи број веза по торенту (0 = без ограничења)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Највећи број веза за све торенте (0 = без ограничења) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Највећа брзина слања у KB/s (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Највећа брзина преузимања у KB/s (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Максимум односа дељења(0 = без ограничења)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Максимално време сејања у часовима (0 = без ограничења)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Прикажи икону системске касете"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Прикажи брзиномер у икони"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Проток преузимања (у kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Проток слања (у kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Прикажи искачућу поруку када се торент заврши."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Настави сејање након завршеног преузимања"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Фасцикла за смештање привремених фајлова"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Да ли да се преузимање аутоматски сними у директоријум"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Фасцикла за смештање преузетих фајлова"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Да ли да се завршено преузимање аутоматски пребаци у одређени директоријум"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Фасцикла где се премештају завршени преузети фајлови"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Да ли да се .torrent фајлови аутоматски пребаце у назначени директоријум"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Фасцикла где се копирају .torrent фајлови"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Да ли да се користи посебан IP за прослеђивање пратиоцу"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Директоријум који је последњи коришћен за снимање"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP који се прослеђује пратиоцу"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Заузетост меморије"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Освежавање приказа"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Подршка за DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT порт"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Број веза слања"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Колоне приказане у КТорент прегледу"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ET алгоритам"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2274,457 +2274,457 @@ msgstr ""
- "мањи од minDiskSpace, торент ће бити заустављен."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Управљач прикључцима"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Учитај"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "И&збаци"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Учитај &све"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Избаци све"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Подразумеван UPnP уређај"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Нађени уређаји:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Уређај"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Портови прослеђени"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN везе"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Пр&оследи портове"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Врати прослеђивање портова"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Потражи"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Укључити прегледање фасцикле1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Укључити прегледање фасцикле2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Укључити прегледање фасцикле3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Путања фасцикле1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Путања фасцикле2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Путања фасцикле3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Да ли да се торент отвори без узнемиравања или не."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Радња брисања означена."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Радња премештања означена."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Подешавања прегледа фасцикле"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Прегледај фасциклу &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Прегледај фасциклу &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Прегледај фасциклу &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Премести у директоријум „учитано“ н&акон учитавања"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Премешта торент у директоријум „учитано“ након што га учита"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Отвори торенте ти&хо"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Не приказуј прозор „Изаберите фајлове за преузимање“"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Обриши након учита&вања"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Брише торенте након учитавања"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Фасцикле за преглед"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Фасцикла 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Фасцикла 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Фасцикла 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Подешавања претраге"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Веб сервер"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Проследи порт"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Трајање сесије (у секундама):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Изаберите интерфејс:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Корисничко име:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Измени лозинку ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Путања до програма за PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Број порта"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "проследи порт"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Време трајања сесије"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "маска интерфејса"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Путања до програма за PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "корисничко име"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "лозинка"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Парчићи"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Укупно:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Тренутно се преузима:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Преузето:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Изузето:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Преостало:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Величина:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Парче"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Напредак"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Вршњак"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Додељени вршњаци"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Сејачи:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Пијавице:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Просечна брзина преузимања:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Просечна брзина слања:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Освежавам за:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Стање пратиоца:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Делови торента који су преузети:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Делови торента који су доступни:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Дељење"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2733,145 +2733,145 @@ msgstr ""
- "ограничења."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Ваше слање ће престати када протекне оволико часова у слању."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Часова"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Ограничење односа:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Ограничење ради само при сејању"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Временско &ограничење:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Освежи пратиоца"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Најмањи размак освежења - 60 секунди"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Додај п&ратиоца"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Уклони пратиоца"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Проме&ни пратиоца"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Врати подразумевано"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Прикажи језичак за приказ вршњака у главном прозору"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Прикажи језичак за приказ преузимања парчића у главном прозору"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Прикажи језичак за приказ пратилаца у главном прозору"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Прикажи листу вршњака"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Прикажи листу парчића који се трен&утно преузимају"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Прикажи листу пратилаца"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Подешавања IP блокирања"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Изаберите филтерски фајл PeerGuardian-а "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Користи PeerGuardian филтер?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Фајл IP филтера:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Преуз&ми/Претвори"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2881,25 +2881,25 @@ msgstr ""
- "Белешка: ZIP фајл са bluetack.co.uk је подржан."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL филтера Level1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Користи филтер level1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Претварам..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2911,61 +2911,61 @@ msgstr ""
- "КТорент."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Освежавање"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Освежи графикон сваких"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "освежавања приказа"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Прикупи податке сваких"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "милисекунди"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Максимум"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Режим размере највеће брзине:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Тачно"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Погледајте „Шта је ово“ за више помоћи"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2977,848 +2977,848 @@ msgstr ""
- "- Тачно: Највећа достигнута брзина се види на графикону"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Брзина вршњака"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Брзина вршњака:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "освежи сваких"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "освежавања графикона"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "Прикупљање података о много повезаних вршњака може оптеретити процесор."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Везе вршњака"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Велике вредности могу загушити графикон повезаних вршњака"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Прикажи сејаче у ројевима"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Прикажи пијавице у ројевима"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Број мерења"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Слање"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Везе"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Вршњаци"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Укљ/искљ. графикон брзине вршњака"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Размак између узимања података о брзини вршњака"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Укљ/искљ. исцртавање пијавица у ројевима"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Укљ/искљ. исцртавање сејача у ројевима"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Број мерења преузимања"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Број мерења брзине вршњака"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Број мерења слања"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Број мерења веза"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Број мерења DHT-а"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Макс. режим OY осе"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Увези постојеће преузимање"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Торент:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Подаци:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Наведите торент и већ преузете податке за тај торент."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Увези"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "подразумевано"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS доводи"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Доводи"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "О&бриши"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Нов"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Чланци"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Ауто&освежавање"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Зане&мари TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Освежи"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Наслов"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Чувај чланке (дана)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Активан"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Филтери"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Прихвати филтере"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Одбиј филтере"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Регуларни израз"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Третирај као &серије"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Процес"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Критеријум серије"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Поклапања без епизоде"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Макс. епизода"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Макс. сезона"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Мин. сезона"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Мин. епизода"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Тестирај те&кст"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Те&ст"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Филтрирај поклапања"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Распоређивач протока"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Категорија за леви клик"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Категор&ија 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "И&скључи"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Нормално"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Категорија &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Категорија &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Категорија за десни клик"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Категорија &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Категорија 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Категорије"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. категорија</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. категорија</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "преузимање:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "слање:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. категорија</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* нула је без ограничења"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Сними у фајл"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Учитај из фајла"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Ресетуј распоред"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "У &реду"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Страна за подешавање прикључка распоређивача"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Користи &распоређивач протока?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Распоређивач протока"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Користи боје уместо &сличица?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Препоручено за спорије системе)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Уреди р&аспоред"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Укључи распоређивач протока?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Користи боје уместо сличица?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Користи богати текст дневника"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Заставица општих информација"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Заставица порука о везама"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Заставица DHT порука"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Заставица информација о пратиоцу"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Заставица информација о диску"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Заставица за поруке IPFilter прикључка"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Заставица за поруке прикључка претраживања"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Заставица порука прикључка Увоз делимичних фајлова"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Заставица за поруке прикључка Додатне информације"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Заставица за поруке прикључка UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Заставица за поруке прикључка Преглед фасцикле"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Заставица за поруке прикључка распоређивача"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Заставица за поруке RSS прикључка"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Заставица за поруке прикључка веб интерфејса"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Опције прегледача дневника"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Прикључци"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Све"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Исправљање грешака"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Обавештења"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Важно"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ништа"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP филтер:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Тражење:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Преглед фасцикле:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Распоређивач:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Увоз делимичних фајлова:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Инфо прозор:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS прикључак:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Прикључак веб интерфејса:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Систем"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Опште:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Везе:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Ул/Изл диска:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Користи обогаћени те&кст за дневник"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Спољни прегледач"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Отвори резултате претраге у спољном прегледачу"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Користи подразумевани"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Путања до прегледача:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Мотори претраге"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Име мотора тражења:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "Дод&ај"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Мотори"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Уклони св&е"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Додај под&разумевано"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Освежи са интернета"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Тражи"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Мотор тражења:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Тренутни мотор претраге"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Користи посебан прегледач"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Путања до програма посебног прегледача"
-@@ -3849,9 +3849,9 @@ msgid ""
- "_n: 1 day \n"
- "%n days "
- msgstr ""
--"%n дан\n"
--"%n дана\n"
--"%n дана"
-+"%n дан \n"
-+"%n дана \n"
-+"%n дана "
- 
- #: libktorrent/interfaces/filetreeitem.cpp:77
- #: plugins/infowidget/iwfiletreediritem.cpp:148
-@@ -4106,7 +4106,7 @@ msgstr "Проверавам податке"
- msgid "Stopped. No space left on device."
- msgstr "Заустављен. Нема слободног простора."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4114,12 +4114,12 @@ msgstr ""
- "Немате довољно простора да би сте преузели овај торент. Желите ли заиста да "
- "наставите?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Недовољно простора за %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4127,16 +4127,16 @@ msgstr ""
- "Торент „%1“ је достигао максимум односа дељења. Да занемарим ограничење и "
- "започнем сејање?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Максимум ограничења односа дељења је достигнут."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Грешка при заустављању торента %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Грешка при покретању торента %1 : %2"
- 
-diff --git a/translations/sr@Latn/messages/ktorrent.po b/translations/sr@Latn/messages/ktorrent.po
-index d39cdc4..36e9b94 100644
---- a/translations/sr@Latn/messages/ktorrent.po
-+++ b/translations/sr@Latn/messages/ktorrent.po
-@@ -1,13 +1,13 @@
- # translation of ktorrent.po to Serbian
- # translation of ktorrent.po to
- #
--# Slobodan Simic <simicsl@verat.net>, 2005, 2007.
-+# Slobodan Simic <simicsl@verat.net>, 2005, 2007, 2008.
- # Slobodan Simic <slsimic@gmail.com>, 2006, 2007.
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
--"PO-Revision-Date: 2007-07-24 15:03+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
-+"PO-Revision-Date: 2008-02-26 13:59+0100\n"
- "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
- "Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
- "MIME-Version: 1.0\n"
-@@ -22,7 +22,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Nema dolaznih veza (verovatno ste iza zaštitnog zida)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Info"
-@@ -81,7 +81,7 @@ msgstr "Stavi/Ukloni iz reda"
- 
- #: apps/ktorrent/ktorrent.cpp:553
- msgid "IPFilter"
--msgstr "Filter IP-a"
-+msgstr "IP filter"
- 
- #: apps/ktorrent/ktorrent.cpp:558 apps/ktorrent/ktorrentviewmenu.cpp:96
- msgid "Check Data Integrity"
-@@ -130,11 +130,11 @@ msgstr "Svi torenti"
- 
- #: apps/ktorrent/filterbar.cpp:52
- msgid "Find:"
--msgstr ""
-+msgstr "Nađi:"
- 
- #: apps/ktorrent/filterbar.cpp:65
- msgid "Case sensitive"
--msgstr ""
-+msgstr "Razlikuj mala i velika slova"
- 
- #: apps/ktorrent/newui/ddockwindow.cpp:88
- msgid "Move to left dock"
-@@ -190,7 +190,7 @@ msgstr "Loše formiran URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Preuzimanja"
-@@ -205,7 +205,7 @@ msgid ""
- "Specified port (%1) is unavailable or in use by another application. KTorrent "
- "is now using port %2."
- msgstr ""
--"Navedeni port (%1) je nedostupan ili ga koristi drugi program. KTorrent sada "
-+"Navedeni port (%1) je nedostupan ili ga koristi drugi program. KTorent sada "
- "koristi port %2."
- 
- #: apps/ktorrent/ktorrentcore.cpp:124
-@@ -213,7 +213,7 @@ msgid ""
- "KTorrent is unable to accept connections because the ports %1 to %2 are already "
- "in use by another program."
- msgstr ""
--"KTorrent ne može da prihvata veze jer su portovi %1 do %2 već upotrebljeniod "
-+"KTorent ne može da prihvata veze jer su portovi %1 do %2 već upotrebljeni od "
- "strane drugog programa."
- 
- #: apps/ktorrent/ktorrentcore.cpp:767
-@@ -261,9 +261,8 @@ msgstr ""
- "napravite?"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1069
--#, fuzzy
- msgid "Do Not Recreate"
--msgstr "Napravi"
-+msgstr "Ne pravi ponovo"
- 
- #: apps/ktorrent/ktorrentcore.cpp:1078
- #, c-format
-@@ -307,17 +306,17 @@ msgstr "Režim ispravljanja grešaka"
- 
- #: apps/ktorrent/main.cpp:109
- msgid "Silently save torrent given on URL"
--msgstr ""
-+msgstr "Tiho snimi torent dat u URL-u"
- 
- #: apps/ktorrent/main.cpp:110
- msgid "Document to open"
- msgstr "Dokument za otvaranje"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
--msgstr "KTorrent"
-+msgstr "KTorent"
- 
- #: apps/ktorrent/main.cpp:125
- msgid "RSS Plugin"
-@@ -377,7 +376,7 @@ msgstr "Zeroconf poboljšanja"
- 
- #: apps/ktorrent/main.cpp:150
- msgid "Coldmilk webgui"
--msgstr "Coldmilk veb interejs"
-+msgstr "Coldmilk veb interfejs"
- 
- #: apps/ktorrent/main.cpp:151
- msgid "IDEAl code from KDevelop"
-@@ -405,7 +404,7 @@ msgstr "Rezervisanje prostora na XFS disku"
- 
- #: apps/ktorrent/main.cpp:157
- msgid "Patch to not show very low speeds"
--msgstr "Zakrpa za neprikazivanje veoma malih brzina"
-+msgstr "Zakrpa za ne-prikazivanje veoma malih brzina"
- 
- #: apps/ktorrent/main.cpp:158
- msgid "Patch to show potentially firewalled status"
-@@ -417,38 +416,35 @@ msgstr "Nekoliko zakrpa"
- 
- #: apps/ktorrent/main.cpp:160
- msgid "Patch to hide the menubar"
--msgstr ""
-+msgstr "Zakrpa za skrivanje trake menija"
- 
- #: apps/ktorrent/main.cpp:161
- msgid "Patch to modify file priorities in the webgui"
--msgstr ""
-+msgstr "Zakrpa za izmenu svojstva fajla kroz veb interfejs"
- 
- #: apps/ktorrent/main.cpp:162
--#, fuzzy
- msgid "Several webgui patches"
--msgstr "Nekoliko zakrpa"
-+msgstr "Nekoliko zakrpa veb interfejsa"
- 
- #: apps/ktorrent/main.cpp:163
--#, fuzzy
- msgid "Filterbar patch"
--msgstr "Filtriraj poklapanja"
-+msgstr "Zakrpa za traku filtera"
- 
- #: apps/ktorrent/main.cpp:164
- msgid "Non threaded fileview update patch"
--msgstr ""
-+msgstr "Zakrpa za ne razgranato ažuriranje prikaza fajla"
- 
- #: apps/ktorrent/main.cpp:165
- msgid "Optimization to SHA1 hash generation"
--msgstr ""
-+msgstr "Optimizacija za generisanje SHA1 heša"
- 
- #: apps/ktorrent/main.cpp:166
- msgid "Patch to fix free diskspace calculation on FreeBSD"
--msgstr ""
-+msgstr "Zakrpa za sređivanje proračuna slobodnog prostora u FreeBSD-u"
- 
- #: apps/ktorrent/main.cpp:167
--#, fuzzy
- msgid "Patch to load torrents silently from the command line"
--msgstr "Zakrpa za tiho učitavanje sa sačuvane lokacije"
-+msgstr "Zakrpa za tiho učitavanje torenata iz komandne linije"
- 
- #: apps/ktorrent/torrentcreatordlg.cpp:64
- msgid "You must select a file or a folder."
-@@ -568,22 +564,20 @@ msgid "Remove Torrent and Data"
- msgstr "Ukloni torent i podatke"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:59
--#, fuzzy
- msgid "Add Peers"
--msgstr "Dodaj vršnjake..."
-+msgstr "Dodaj vršnjake"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:63
- msgid "Additional Peer Sources"
- msgstr "Dodatni izvori vršnjaka"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:64
--#, fuzzy
- msgid "Torrent Peer Sources:"
--msgstr "Izvori vršnjaka torenta:"
-+msgstr "Izvori vršnjaka za torent:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -601,9 +595,8 @@ msgid "Preview"
- msgstr "Pregled"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:81
--#, fuzzy
- msgid "Open Directory"
--msgstr "Otvori direktorijum..."
-+msgstr "Otvori direktorijum"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:82
- msgid "Data Directory"
-@@ -614,9 +607,8 @@ msgid "Temporary Directory"
- msgstr "Privremeni direktorijum"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:87
--#, fuzzy
- msgid "Set Download Location"
--msgstr "Odredite mesto za preuzimanje..."
-+msgstr "Odredite mesto za preuzimanje"
- 
- #: apps/ktorrent/ktorrentviewmenu.cpp:90
- msgid "Remove From Group"
-@@ -627,14 +619,14 @@ msgid "Add to Group"
- msgstr "Dodaj u grupu"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Ograničenja brzine"
- 
- #: apps/ktorrent/addpeerwidget.cpp:67
- msgid "Torrent does not exist. Report this bug to KTorrent developers."
--msgstr "Torent ne postoji. Prijavite ovu greški programerima KTorrent-a."
-+msgstr "Torent ne postoji. Prijavite ovu grešku programerima KTorenta."
- 
- #: apps/ktorrent/addpeerwidget.cpp:102
- msgid "Potential peer added."
-@@ -645,7 +637,7 @@ msgid "Malformed IP address."
- msgstr "Loše formirana adresa."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Podešavanja"
-@@ -673,7 +665,7 @@ msgid ""
- "Cannot lookup %1: %2\n"
- "Please provide a valid IP address or hostname."
- msgstr ""
--"Ne mogu da naćem %1: %2\n"
-+"Ne mogu da nađem %1: %2\n"
- "Navedite ispravnu IP adresu ili ime domaćina."
- 
- #: apps/ktorrent/pref.cpp:411
-@@ -681,7 +673,7 @@ msgid "Advanced"
- msgstr "Napredno"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Napredne opcije"
-@@ -692,7 +684,7 @@ msgstr "Vidljive kolone"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Stanje"
-@@ -714,7 +706,7 @@ msgstr "Poslato"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Preuzimanje"
-@@ -779,7 +771,7 @@ msgstr ""
- #: apps/ktorrent/ktorrentview.cpp:286 apps/ktorrent/trayicon.cpp:258
- msgid "Go to Settings -> Configure KTorrent, if you want to change the limits."
- msgstr ""
--"Idite u Podešavanja -> Podesi KTorrent, ako želite da promenite ograničenje."
-+"Idite u Podešavanja -> Podesi KTorent, ako želite da promenite ograničenje."
- 
- #: apps/ktorrent/ktorrentview.cpp:375
- msgid ""
-@@ -833,14 +825,14 @@ msgstr "Ne, zadrži fajlove"
- 
- #: apps/ktorrent/fileselectdlg.cpp:220
- msgid " short!"
--msgstr " kratko!"
-+msgstr " nedostaje!"
- 
- #: apps/ktorrent/queuedialog.cpp:73
- msgid "User"
- msgstr "Korisnik"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Upravnik redosleda"
-@@ -1044,7 +1036,7 @@ msgstr "Izaberite koje fajlove želite da preuzmete"
- #: rc.cpp:6
- #, no-c-format
- msgid "Download to:"
--msgstr "Preuzimi u:"
-+msgstr "Preuzmi u:"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 74
- #: rc.cpp:9
-@@ -1065,8 +1057,8 @@ msgid "Start torrent"
- msgstr "Pokreni torent"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Preuzimanje"
-@@ -1120,13 +1112,13 @@ msgid "Encryption"
- msgstr "Šifrovanje"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Koristi šifrovanje protokola"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1136,13 +1128,13 @@ msgstr ""
- "vašeg internet provajdera."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
--msgstr "Dozvoli nešifrovane veze"
-+msgstr "Dozvoli ne-šifrovane veze"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1151,7 +1143,7 @@ msgstr ""
- "šifrovanje."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1162,360 +1154,360 @@ msgstr ""
- "detalja."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Koristi DHT da dobiješ više vršnjaka"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP port za DHT komunikaciju:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Poseban IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "&Pošalji pratiocu poseban IP ili ime domaćina"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Poseban IP ili ime domaćina:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikona sistemske kasete"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Prikaži ikonu s&istemske kasete"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Prikaži &brzinomer u ikoni"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Prikaži iskačuće poruke sistemske kasete"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Protok slanja (u KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Protok preuzimanja (u KB/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Fascikle"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Fascikla za privremene fajlove:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Premesti završena preuzimanja u:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Automatski snimi preuzimanja u:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopiraj .torrent fajlove u:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Traka preuzimanja"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Postavite ograničenja brzine za torent"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Najveća brzina slanja:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Najveća brzina preuzimanja:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/s (0 je bez ograničenja)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Dodaj mogućeg vršnjaka"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP vršnjaka:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Unesite IP i port vršnjaka."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
--msgstr "KTorrent-ova crna lista"
-+msgstr "KTorentova crna lista"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
- "entries or use IPFilter plugin (PeerGuardian)."
- msgstr ""
- "Pažnja: Crna lista se primenjuje samo na tekuću sesiju. Koristite "
--"sačuvaj/otvori da bi stesačuvali unose ili koristite IPFilter priključak "
-+"sačuvaj/otvori da bi ste sačuvali unose ili koristite IPFilter priključak "
- "(PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Blokirani vršnjaci"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "IP adresa vršnjaka"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Dodaj vršnjaka:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Dodaje vršnjaka na crnu listu"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Uklanja izabranog vršnjaka sa crne liste"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Oč&isti"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Čisti ovu listu"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Sačuvaj k&ao..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Snima ovu crnu listu da se može koristiti sa priključkom IP filter"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Najviše preuzimanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Najviše sejanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Preuzimanje pri malom prostoru na disku :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimum prostora na disku:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Ne pokreći"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Uvek pitaj"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Forsiraj"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 je bez ograničenja)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Najveća brzina preuzimanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Globalno ograničenje veza:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Najduže vreme sejanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Najviše veza po torentu:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Broj veza slanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP port pratioca:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Najveći odnos deljenja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Najveća brzina slanja:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/s (0 je bez ograničenja)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "časova (0 je bez ograničenja)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Nastavi sejanje nakon završenog preuzimanja"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Pažnja"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1525,283 +1517,283 @@ msgstr ""
- "priključak može to da učini za vas."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT prozor redosleda"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Stanje:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Pratilac:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Odnos:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Preostalo:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontroliše"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Slanja"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Poslato:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "P&omeri gore"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Pomeri do&le"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Pomeri na vrh"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Pomeri na &dno"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&Kontroliše upravnik"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Kontroliše ko&risnik"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Prenesi URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "U &redu"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "Otk&aži"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Napravi torent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Fajl ili fascikla za koje hoćete da napravite torent:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Morate dodati bar jednog pratioca ili čvor."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Opcije fajla"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Veličina svakog parčeta:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Počni se&janje torenta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Decentrali&zovano (samo DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Lični torent (DHT nije dozvoljen)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Komentari:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Napravi"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "O&tkaži"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Pratioci"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT čvorišta"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Čvor:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP ili ime domaćina"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1811,19 +1803,19 @@ msgstr ""
- "i vašu IP adresu i port ako nameravate da sejete ovaj torent."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Napredna podešavanja"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
--msgstr ""
-+msgstr "Algoritam procene preostalog vremena:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1837,7 +1829,7 @@ msgid ""
- "<br>\n"
- "<b>Moving average algorithm:</b> Moving average speed calculated from X samples"
- msgstr ""
--"<b>KTorrent algoritam:</b> Podrazumevani algoritam koji koristi kombinaciju "
-+"<b>KTorent algoritam:</b> Podrazumevani algoritam koji koristi kombinaciju "
- "drugih algoritama, na osnovu naših testova."
- "<br>\n"
- "<b>Algoritam trenutne brzine:</b> Najjednostavniji algoritam - "
-@@ -1852,429 +1844,429 @@ msgstr ""
- "uzoraka"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Trenutna brzina"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Opšta prosečna brzina"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Prozor Iksa"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Prosek pomeranja"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(deluje nakon ponovnog pokretanja)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Isključi &rezervisanje prostora"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "U potpunosti re&zerviši prostor (izbegava fragmentaciju)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Osnovno (sporo)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Svojstveno za fajl-sistem"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Mogućnosti"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Zauzetost memorije:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Niska"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Srednja"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Visoka"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Osvežavanje prikaza:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Brz procesor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Spor procesor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Provera podataka"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Prilikom slanja &ne proveravaj ponovo parčiće veće od"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Proveri &ispravnost podataka nakon"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "oštećenih parčića"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Mreža"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
--#, fuzzy, no-c-format
-+#: rc.cpp:623
-+#, no-c-format
- msgid "Maximum number of connection setups:"
--msgstr "Najveći broj veza po torentu (0 = bez ograničenja)"
-+msgstr "Najveći broj podešavanja veze:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
--msgstr ""
-+msgstr "DSCP za IP pakete:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Ne koristi KDE-ov pro&ksi za veze HTTP pratioca"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Proksi HTTP pratioca:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Proveravam podatke"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Proveravam podatke torenta :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Broj nađenih parčića :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Broj loših / nepreuzetih :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Najveći broj preuzimanja (0 = bez ograničenja)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Najveći broj sejanja (0 = bez ograničenja)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Da pokrećem preuzimanja kada je malo prostora na disku?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Najveći broj veza po torentu (0 = bez ograničenja)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Najveći broj veza za sve torente (0 = bez ograničenja) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Najveća brzina slanja u KB/s (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Najveća brzina preuzimanja u KB/s (0 = no limit)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maksimum odnosa deljenja(0 = bez ograničenja)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maksimalno vreme sejanja u časovima (0 = bez ograničenja)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Prikaži ikonu sistemske kasete"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Prikaži brzinomer u ikoni"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Protok preuzimanja (u kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Protok slanja (u kb/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Prikaži iskačuću poruku kada se torent završi."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Nastavi sejanje nakon završenog preuzimanja"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Fascikla za smeštanje privremenih fajlova"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Da li da se preuzimanje automatski snimi u direktorijum"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Fascikla za smeštanje preuzetih fajlova"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr ""
- "Da li da se završeno preuzimanje automatski prebaci u određeni direktorijum"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Fascikla gde se premeštaju završeni preuzeti fajlovi"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
- "Da li da se .torrent fajlovi automatski prebace u naznačeni direktorijum"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Fascikla gde se kopiraju .torrent fajlovi"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Da li da se koristi poseban IP za prosleđivanje pratiocu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Direktorijum koji je poslednji korišćen za snimanje"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP koji se prosleđuje pratiocu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Zauzetost memorije"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Osvežavanje prikaza"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Podrška za DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Broj veza slanja"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
--msgstr "Kolone prikazane u KTorrent pregledu"
-+msgstr "Kolone prikazane u KTorent pregledu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ET algoritam"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2284,457 +2276,457 @@ msgstr ""
- "manji od minDiskSpace, torent će biti zaustavljen."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Upravljač priključcima"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Učitaj"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "I&zbaci"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Učitaj &sve"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Izbaci sve"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Podrazumevan UPnP uređaj"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Nađeni uređaji:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Uređaj"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Portovi prosleđeni"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN veze"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Pr&osledi portove"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Vrati prosleđivanje portova"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Potraži"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Uključiti pregledanje fascikle1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Uključiti pregledanje fascikle2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Uključiti pregledanje fascikle3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Putanja fascikle1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Putanja fascikle2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Putanja fascikle3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Da li da se torent otvori bez uznemiravanja ili ne."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Radnja brisanja označena."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Radnja premeštanja označena."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Podešavanja pregleda fascikle"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Pregledaj fasciklu &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Pregledaj fasciklu &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Pregledaj fasciklu &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Premesti u direktorijum „učitano“ n&akon učitavanja"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Premešta torent u direktorijum „učitano“ nakon što ga učita"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Otvori torente ti&ho"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
--#, fuzzy, no-c-format
-+#: rc.cpp:881
-+#, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Ne prikazuj prozor „Izaberite fajlove za preuzimanje“"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Obriši nakon učita&vanja"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Briše torente nakon učitavanja"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Fascikle za pregled"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Fascikla 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Fascikla 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Fascikla 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Podešavanja pretrage"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Veb server"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Prosledi port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Trajanje sesije (u sekundama):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Izaberite interfejs:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Korisničko ime:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Izmeni lozinku ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Putanja do programa za PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Broj porta"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "prosledi port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Vreme trajanja sesije"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "maska interfejsa"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Putanja do programa za PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "korisničko ime"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "lozinka"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Parčići"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Ukupno:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Trenutno se preuzima:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Preuzeto:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Izuzeto:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Preostalo:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Veličina:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Parče"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Napredak"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Vršnjak"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Dodeljeni vršnjaci"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Sejači:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Pijavice:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Prosečna brzina preuzimanja:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Prosečna brzina slanja:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Osvežavam za:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Stanje pratioca:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Delovi torenta koji su preuzeti:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Delovi torenta koji su dostupni:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Deljenje"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2743,145 +2735,145 @@ msgstr ""
- "ograničenja."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Vaše slanje će prestati kada protekne ovoliko časova u slanju."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Časova"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Ograničenje odnosa:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Ograničenje radi samo pri sejanju"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Vremensko &ograničenje:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Osveži pratioca"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Najmanji razmak osveženja - 60 sekundi"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Dodaj p&ratioca"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Ukloni pratioca"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Prome&ni pratioca"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Vrati podrazumevano"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Prikaži jezičak za prikaz vršnjaka u glavnom prozoru"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Prikaži jezičak za prikaz preuzimanja parčića u glavnom prozoru"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Prikaži jezičak za prikaz pratilaca u glavnom prozoru"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Prikaži listu vršnjaka"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Prikaži listu parčića koji se tren&utno preuzimaju"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Prikaži listu pratilaca"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Podešavanja IP blokiranja"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Izaberite filterski fajl PeerGuardian-a "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Koristi PeerGuardian filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Fajl IP filtera:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Preuz&mi/Pretvori"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2891,26 +2883,26 @@ msgstr ""
- "Beleška: ZIP fajl sa bluetack.co.uk je podržan."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "URL filtera Level1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Koristi filter level1?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Pretvaram..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
--#, fuzzy, no-c-format
-+#: rc.cpp:1122
-+#, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
- "process could take a while even on fast machines and during that time you will "
-@@ -2918,64 +2910,64 @@ msgid ""
- msgstr ""
- "Kliknite na dugme „Pretvori“ da započnete pretvaranje antip2p fajla. Pažnja: "
- "Ovo i na brzim mašinama zna da potraje i tokom tog vremena nećete moći da "
--"koristite KTorrent."
-+"koristite KTorent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Osvežavanje"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Osveži grafikon svakih"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "osvežavanja prikaza"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Prikupi podatke svakih"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisekundi"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maksimum"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Režim razmere najveće brzine:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Tačno"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Pogledajte „Šta je ovo“ za više pomoći"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2987,848 +2979,848 @@ msgstr ""
- "- Tačno: Najveća dostignuta brzina se vidi na grafikonu"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Brzina vršnjaka"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Brzina vršnjaka:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "osveži svakih"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "osvežavanja grafikona"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- "Prikupljanje podataka o mnogo povezanih vršnjaka može opteretiti procesor."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Veze vršnjaka"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Velike vrednosti mogu zagušiti grafikon povezanih vršnjaka"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Prikaži sejače u rojevima"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Prikaži pijavice u rojevima"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Broj merenja"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Slanje"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Veze"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Vršnjaci"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Uklj/isklj. grafikon brzine vršnjaka"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Razmak između uzimanja podataka o brzini vršnjaka"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Uklj/isklj. iscrtavanje pijavica u rojevima"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Uklj/isklj. iscrtavanje sejača u rojevima"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Broj merenja preuzimanja"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Broj merenja brzine vršnjaka"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Broj merenja slanja"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Broj merenja veza"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Broj merenja DHT-a"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Maks. režim OY ose"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Uvezi postojeće preuzimanje"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Podaci:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Navedite torent i već preuzete podatke za taj torent."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Uvezi"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "podrazumevano"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS dovodi"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Dovodi"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "O&briši"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Nov"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Članci"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Auto&osvežavanje"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "Zane&mari TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Osveži"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Naslov"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Čuvaj članke (dana)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktivan"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filteri"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Prihvati filtere"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Odbij filtere"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Regularni izraz"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Tretiraj kao &serije"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Proces"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Kriterijum serije"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Poklapanja bez epizode"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Maks. epizoda"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Maks. sezona"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Min. sezona"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Min. epizoda"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testiraj te&kst"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtriraj poklapanja"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Raspoređivač protoka"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Kategorija za levi klik"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategor&ija 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "I&sključi"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normalno"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategorija &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategorija &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Kategorija za desni klik"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategorija &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategorija 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorije"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. kategorija</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. kategorija</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "preuzimanje:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "slanje:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. kategorija</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* nula je bez ograničenja"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Snimi u fajl"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Učitaj iz fajla"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Resetuj raspored"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "U &redu"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Strana za podešavanje priključka raspoređivača"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Koristi &raspoređivač protoka?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Raspoređivač protoka"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Koristi boje umesto &sličica?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Preporučeno za sporije sisteme)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Uredi r&aspored"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Uključi raspoređivač protoka?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Koristi boje umesto sličica?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Koristi bogati tekst dnevnika"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Zastavica opštih informacija"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Zastavica poruka o vezama"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Zastavica DHT poruka"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Zastavica informacija o pratiocu"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Zastavica informacija o disku"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Zastavica za poruke IPFilter priključka"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Zastavica za poruke priključka pretraživanja"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Zastavica poruka priključka Uvoz delimičnih fajlova"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Zastavica za poruke priključka Dodatne informacije"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Zastavica za poruke priključka UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Zastavica za poruke priključka Pregled fascikle"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Zastavica za poruke priključka raspoređivača"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Zastavica za poruke RSS priključka"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Zastavica za poruke priključka veb interfejsa"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Opcije pregledača dnevnika"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Priključci"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Sve"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Ispravljanje grešaka"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Obaveštenja"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Važno"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Ništa"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Traženje:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Pregled fascikle:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Raspoređivač:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Uvoz delimičnih fajlova:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Info prozor:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS priključak:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Priključak veb interfejsa:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistem"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Opšte:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Veze:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Ul/Izl diska:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Koristi obogaćeni te&kst za dnevnik"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Spoljni pregledač"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Otvori rezultate pretrage u spoljnom pregledaču"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Koristi podrazumevani"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Putanja do pregledača:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Motori pretrage"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Ime motora traženja:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "Dod&aj"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Motori"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Ukloni sv&e"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Dodaj pod&razumevano"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Osveži sa interneta"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Traži"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Motor traženja:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Trenutni motor pretrage"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Koristi poseban pregledač"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Putanja do programa posebnog pregledača"
-@@ -3859,9 +3851,9 @@ msgid ""
- "_n: 1 day \n"
- "%n days "
- msgstr ""
--"%n dan\n"
--"%n dana\n"
--"%n dana"
-+"%n dan \n"
-+"%n dana \n"
-+"%n dana "
- 
- #: libktorrent/interfaces/filetreeitem.cpp:77
- #: plugins/infowidget/iwfiletreediritem.cpp:148
-@@ -4066,10 +4058,10 @@ msgid ""
- "torrent. You will be asked for a location to save the torrent to. If you press "
- "cancel, we will select your home directory."
- msgstr ""
--"Torent %1 je pokrenut sa prethodnom verzijom KTorrent-a. Da bi bili sigurnida "
--"će raditi i sa ovom verzijom KTorrent-a, moraćemo da ga preselimo. Bićete "
--"upitani za lokaciju snimanja torenta. Ako pritisnete Otkaži izabraće se vaš "
--"početni direktorijum."
-+"Torent %1 je pokrenut sa prethodnom verzijom KTorenta. Da bi bili sigurni da će "
-+"raditi i sa ovom verzijom KTorenta, moraćemo da ga preselimo. Bićete upitani za "
-+"lokaciju snimanja torenta. Ako pritisnete Otkaži izabraće se vaš početni "
-+"direktorijum."
- 
- #: libktorrent/torrent/torrentcontrol.cpp:1278
- msgid "Select Folder to Save To"
-@@ -4116,7 +4108,7 @@ msgstr "Proveravam podatke"
- msgid "Stopped. No space left on device."
- msgstr "Zaustavljen. Nema slobodnog prostora."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4124,12 +4116,12 @@ msgstr ""
- "Nemate dovoljno prostora da bi ste preuzeli ovaj torent. Želite li zaista da "
- "nastavite?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Nedovoljno prostora za %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4137,16 +4129,16 @@ msgstr ""
- "Torent „%1“ je dostigao maksimum odnosa deljenja. Da zanemarim ograničenje i "
- "započnem sejanje?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Maksimum ograničenja odnosa deljenja je dostignut."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Greška pri zaustavljanju torenta %1 : %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Greška pri pokretanju torenta %1 : %2"
- 
-@@ -4188,14 +4180,12 @@ msgid "Cannot open %1 for writing : readonly filesystem"
- msgstr "Ne mogu da otvorim %1 radi upisa : fajl-sistem samo za čitanje"
- 
- #: libktorrent/torrent/cachefile.cpp:240
--#, fuzzy
- msgid "Cannot expand file %1 : %2"
--msgstr "Ne mogu da raširim fajl : %1"
-+msgstr "Ne mogu da raširim fajl %1 : %2"
- 
- #: libktorrent/torrent/cachefile.cpp:242
--#, fuzzy
- msgid "Cannot expand file %1 : incomplete write"
--msgstr "Ne mogu da raširim fajl %1"
-+msgstr "Ne mogu da raširim fajl %1 : nekompletan upis"
- 
- #: libktorrent/torrent/cachefile.cpp:255
- #, c-format
-@@ -4278,7 +4268,6 @@ msgid "Automatically scans directories for torrent files and loads them."
- msgstr "Automatski traži torente u direktorijumima i učitava ih."
- 
- #: plugins/scanfolder/scanfolderplugin.cpp:52
--#, fuzzy
- msgid "Scan Folder"
- msgstr "Pregledaj fasciklu"
- 
-@@ -4312,7 +4301,6 @@ msgid "WebInterface Options"
- msgstr "Opcije veb interfejsa"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:70
--#, fuzzy
- msgid "Php executable is not in default path, please enter the path manually"
- msgstr "Program za PHP nije na podrazumevanoj putanji, unesite putanju ručno"
- 
-@@ -4325,12 +4313,10 @@ msgid "%1 exists and it is executable"
- msgstr "%1 postoji i izvršan je"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:120
--#, fuzzy
- msgid "%1 does not exist"
- msgstr "%1 ne postoji"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:124
--#, fuzzy
- msgid "%1 is not executable"
- msgstr "%1 nije izvršan"
- 
-@@ -4339,18 +4325,16 @@ msgid "%1 is a directory"
- msgstr "%1 je direktorijum"
- 
- #: plugins/webinterface/webinterfaceprefwidget.cpp:132
--#, fuzzy
- msgid "%1 is not php executable path"
- msgstr "%1 nije putanja do programa za php"
- 
- #: plugins/webinterface/webinterfaceplugin.cpp:44
--#, fuzzy
- msgid "Web Interface"
- msgstr "Veb interfejs"
- 
- #: plugins/webinterface/webinterfaceplugin.cpp:44
- msgid "Allow to control ktorrent through browser"
--msgstr "Omogućava da kontrolišete ktorrent kroz veb pregledač"
-+msgstr "Omogućava da kontrolišete KTorent kroz veb pregledač"
- 
- #: plugins/infowidget/fileview.cpp:57
- msgid "Download First"
-@@ -4519,9 +4503,8 @@ msgid "Filters out unwanted peers based on their IP address"
- msgstr "Filtrira neželjene vršnjake na osnovu njihove IP adrese"
- 
- #: plugins/ipfilter/ipfilterplugin.cpp:46
--#, fuzzy
- msgid "IP Filter"
--msgstr "Filter IP-a"
-+msgstr "IP filter"
- 
- #: plugins/ipfilter/ipblockingprefpage.cpp:70
- #: plugins/ipfilter/ipblockingprefpage.cpp:94
-@@ -4707,7 +4690,7 @@ msgstr "RSS dovodi"
- #: plugins/rssfeed/rsslinkdownloader.cpp:183
- #, c-format
- msgid "Failed to find and download a valid torrent for %1"
--msgstr ""
-+msgstr "Nisam uspeo da nađem i učitam ispravan torent za %1"
- 
- #: plugins/rssfeed/rssfeedmanager.cpp:78
- msgid "Title"
-@@ -4811,7 +4794,6 @@ msgid "Displays ktorrent logging output"
- msgstr "Prikazuje izlaz dnevnika KTorenta"
- 
- #: plugins/search/searchprefpage.cpp:52
--#, fuzzy
- msgid ""
- "Use your web browser to search for the string %1 (capital letters) on the "
- "search engine you want to add. "
-@@ -4827,7 +4809,7 @@ msgstr ""
- "<br>Onda kopirajte URL iz trake adrese nakon što se pretraga završi i prenesite "
- "ga ovde."
- "<br>"
--"<br>Na primer, traženje %2 na Google-u će vratiti "
-+"<br>Na primer, traženje %1 na Google-u će vratiti "
- "http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. Ako dodate taj URL "
- "ovde, KTorent će moći da pretražuje uz pomoć Google-a."
- 
-@@ -4902,34 +4884,11 @@ msgstr "Preuzmi"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid "Zeroconf"
--msgstr ""
-+msgstr "Zeroconf"
- 
- #: plugins/zeroconf/zeroconfplugin.cpp:41
- msgid ""
- "Finds peers running ktorrent on the local network to share torrents with"
- msgstr ""
--"Nalazi vršnjake koji koriste ktorrent na lokalnoj mreži sa kojima može da deli "
-+"Nalazi vršnjake koji koriste KTorent na lokalnoj mreži sa kojima može da deli "
- "torente"
--
--#~ msgid "ETA algorithm:"
--#~ msgstr "ETA algoritam:"
--
--#~ msgid "Cannot load chunk %1"
--#~ msgstr "Ne mogu da učitam parče %1"
--
--#, fuzzy
--#~ msgid "Alt+X"
--#~ msgstr "Alt+1"
--
--#, fuzzy
--#~ msgid "TrackerViewBase"
--#~ msgstr "Pratioci"
--
--#~ msgid "Type of service field of IP packets"
--#~ msgstr "Vrsta servisnog polja IP paketa"
--
--#~ msgid "Alt+N"
--#~ msgstr "Alt+P"
--
--#~ msgid "Alt+S"
--#~ msgstr "Alt+S"
-diff --git a/translations/sv/messages/ktorrent.po b/translations/sv/messages/ktorrent.po
-index 7860808..e067da2 100644
---- a/translations/sv/messages/ktorrent.po
-+++ b/translations/sv/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-02-25 22:20+0100\n"
- "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
- "Language-Team: Swedish <sv@li.org>\n"
-@@ -19,7 +19,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Inga inkommande anslutningar (möjligen stoppade av brandvägg)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Information"
-@@ -187,7 +187,7 @@ msgstr "Felaktig webbadress."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Nerladdningar"
-@@ -309,7 +309,7 @@ msgid "Document to open"
- msgstr "Dokument att öppna"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "Ktorrent"
-@@ -577,7 +577,7 @@ msgstr "Deltagarkällor för datafllöde:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -619,7 +619,7 @@ msgid "Add to Group"
- msgstr "Lägg till i grupp"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Hastighetsgränser"
-@@ -637,7 +637,7 @@ msgid "Malformed IP address."
- msgstr "Felaktig IP-adress."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Inställningar"
-@@ -673,7 +673,7 @@ msgid "Advanced"
- msgstr "Avancerat"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Avancerade alternativ"
-@@ -684,7 +684,7 @@ msgstr "Synliga kolumner"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Status"
-@@ -706,7 +706,7 @@ msgstr "Uppladdade"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Nerladdningshastighet"
-@@ -830,7 +830,7 @@ msgid "User"
- msgstr "Användare"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Köhantering"
-@@ -1054,8 +1054,8 @@ msgid "Start torrent"
- msgstr "Starta dataflöde"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Ladda ner"
-@@ -1109,13 +1109,13 @@ msgid "Encryption"
- msgstr "Kryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Använd protokollkryptering"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1125,13 +1125,13 @@ msgstr ""
- "dataflödesanslutningar långsammare."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Tillåt okrypterade anslutningar"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1139,7 +1139,7 @@ msgstr ""
- "Om avmarkerad, kan du bara ansluta till klienter som stöder kryptering."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1150,169 +1150,169 @@ msgstr ""
- "ytterligare information."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "An&vänd DHT för att hämta ytterligare deltagare"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "UDP-port för DHT-kommunikation:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Egen IP-adress"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Skicka spåraren en egen IP-adress eller ett eget värddator&namn"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Egen IP-adress eller eget värddatornamn:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Ikon i systembrickan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Visa ikon i s&ystembrickan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Visa &hastighetsrad i systembrickan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Visa meddelanden i systembrickan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Uppladdningsbandbredd (i Kibyte/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Nerladdningsbandbredd (i Kibyte/s):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Kataloger"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Katalog för att lagra tillfälliga filer:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Flytta klara nerladdningar till:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "Spara &automatiskt nerladdningar i:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Kopiera .torrent-filer till:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Nerladdningsverktygsrad"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Ställ in dataflödets hastighetsgränser"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Maximal uppladdningshastighet:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Maximal nerladdningshastighet:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KiB/s (0 betyder obegränsad)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Lägg till möjlig deltagare"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Deltagarens IP-adress:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Ange deltagarens IP-adress och port."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Ktorrents svartlistning"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1323,188 +1323,188 @@ msgstr ""
- "(PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Förbjudna deltagare"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Deltagarens IP-adress"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Lägg till deltagare:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Lägger till en svartlistad deltagare"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Tar bort deltagare från svartlistning"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Re&nsa"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Rensar listan"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Spara s&om..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- "Sparar svartlistan för att använda den med Ktorrents IP-filterinsticksprogram"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Maximalt antal nerladdningar:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Maximalt antal erbjudna flöden:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Starta nerladdningar vid dåligt diskutrymme:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Minimalt diskutrymme:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Starta inte"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Fråga alltid"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Tvinga att starta"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MiB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 betyder obegränsat)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Maximal nerladdningshastighet:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Global anslutningsbegränsning:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Maximal erbjudningstid:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Maximalt antal anslutningar per nerladdning:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Antal uppladdningsnischer:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP-spårningsport:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Maximalt delningsförhållande:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Maximal uppladdningshastighet:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KiB/sek (0 betyder obegränsad)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Timmar (0 betyder obegränsat)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Fortsätt erbjuda flödet efter nerladdning är klar"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Observera"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1514,283 +1514,283 @@ msgstr ""
- "UPnP-insticksprogrammet kan göra det åt dig."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT-ködialogruta"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Status:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Spårare:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Delningsförhållande:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Byte kvar:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Dataflöde"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Styrd av"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "Uppladdnin&gar"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Uppladdat:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Flytta &upp"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Flytta &ner"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Flytta längst upp"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Flytta &längst ner"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Styrd av &köhantering"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Styr av an&vändare"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Klistra in webbadress"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "Webbadress:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "O&k"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Avbryt"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Skapa dataflöde"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Filen eller katalogen du vill skapa ett dataflöde för:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Du måste lägga till minst en spårare eller nod."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Filalternativ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Storlek på varje del:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KiB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "&Börja erbjuda dataflödet"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "De&centraliserat (bara DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Privat dataflöde (DHT tillåts inte)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Kommentarer:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "S&kapa"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "&Avbryt"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Spårare"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT-noder"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Nod:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP-adress eller värddatornamn"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1800,19 +1800,19 @@ msgstr ""
- "också infoga din egen IP-adress och port om du planerar att erbjuda dataflödet."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Avancerade inställningar"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr "Algoritm för uppskattning av återstående tid:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1841,355 +1841,355 @@ msgstr ""
- "beräknat från X samplingar"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Nuvarande hastighet"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Total medelhastighet"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Fönster av storleken X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Rörligt medelvärde"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(får effekt efter omstart)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Ina&ktivera reservation av diskutrymme"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "Reservera allt dis&kutrymme i förväg (undviker fragmentering)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Grundläggande (långsam)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Specifik för filsystem"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Prestanda"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Minnesanvändning:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Låg"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Medium"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Hög"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Uppdateringsintervall för grafiskt gränssnitt:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Snabb processor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Långsam processor"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Datakontroll"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Vid uppladdning, ko&ntrollera inte om delar större än"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Gör en kontroll av data&integritet efter"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "skadade delar"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Nätverk"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Maximalt antal anslutningar:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP för IP-paket:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Använd inte KDE:s pro&xyinställningar för HTTP-spårningsanslutningar"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP-spårningsproxy:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Genomsöker data"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Genomsöker data från dataflödet:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Antal hittade delar:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Antal misslyckade eller inte nerladdade delar:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textetikett2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textetikett3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Maximalt antal nerladdningar (0 = obegränsat)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Maximalt antal erbjudna flöden (0 = obegränsat)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Starta nerladdningar vid dåligt diskutrymme?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Maximalt antal anslutningar per dataflöde (0 = obegränsat)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Maximalt antal anslutningar för alla dataflöden (0 = obegränsat) "
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Maximal uppladdningshastighet i KiB/sek (0 = obegränsad)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Maximal nerladdningshastighet i KiB/sek (0 = obegränsad)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Maximalt delningsförhållande (0 = ingen begränsning)."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Maximal erbjudningstid (0 = ingen begränsning)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Visa en ikon i systembrickan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Visa hastighetsrad i systembrickan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Nerladdningsbandbredd (i Kibyte/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Uppladdningsbandbredd (i Kibyte/s):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Visa meddelanden när ett dataflöde är klart."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Fortsätt erbjuda flödet efter nerladdning är klar"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Katalog för att lagra tillfälliga filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Om nerladdningar automatiskt ska sparas i angiven katalog"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Katalog för att lagra nerladdade filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Om färdiga nerladdningar automatiskt ska flyttas till färdigkatalogen"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Katalog att flytta färdiga nerladdade filer till"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ""
-@@ -2197,73 +2197,73 @@ msgstr ""
- ".torrent-filer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Katalog att kopiera .torrent-filer till"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Om en egen IP-adress ska användas att skicka till spåraren"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Katalog som användes för spara senast"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "IP-adress att skicka till spåraren"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Minnesanvändning"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Uppdateringsintervall för grafiskt gränssnitt"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Stöd för DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT-port"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Antal uppladdningsnischer"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Kolumner visade i Ktorrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Algoritm för beräknad tid"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2273,457 +2273,457 @@ msgstr ""
- "fritt diskutrymme är mindre än minimalt diskutrymme, stoppas dataflödet."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Insticksprogramhantering"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Ladda"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "Ladda &ur"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Ladda &alla"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Ladda &ur alla"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Förvald UPnP-enhet att använda"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Detekterade enheter:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Enhet"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Vidarebefordrade portar"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "Anslutning till fjärrnätverk"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Vidare&befordra portar"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Ångra vidarebefordring av portar"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Sök igen"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Aktivera sökning av katalog 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Aktivera sökning av katalog 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Aktivera sökning av katalog 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Sökväg till katalog 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Sökväg till katalog 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Sökväg till katalog 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Om dataflödet ska öppnas tyst eller inte."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Borttagningsåtgärd markerad."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Förflyttningsåtgärd är markerad."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Katalogsökinställningar"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Sök katalog &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Sök katalog &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Sök katalog &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Gå till \"l&addad\" katalog efter laddning"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Flytta dataflöde till \"laddad\" katalog efter den laddats"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Öppna dataflöden t&yst"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Visa inte dialogrutan 'Markera filer att ladda ner'"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Ta bort efter laddnin&g"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Tar bort dataflödet efter laddning"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Kataloger att söka i"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Katalog 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Katalog 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Katalog 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Sökinställningar"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Webbserver"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Vidarebefordra port"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Sessionstid att vara aktiv (i sekunder)"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Välj gränssnitt:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Användarnamn:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Ändra lösenord..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Sökväg till körbar fil för PHP:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Portnummer"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "vidarebefordra port"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Sessionstid att vara aktiv"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Gränssnittets skal"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "Sökväg till körbar fil för PHP"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "användarnamn"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "lösenord"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Delar"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Totalt:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Nuvarande nerladdningar:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Nerladdade:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Undantagna:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Kvar:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Storlek:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Del"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Förlopp"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Deltagare"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Tilldelade deltagare"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Med hela flödet:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "Med delar av flödet:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Medelnerladdningshastighet:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Medeluppladdningshastighet:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Nästa uppdatering:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Spårarens status:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Delar av flödet som har laddats ner:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Delar av flödet som är tillgängliga:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Delning"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2732,145 +2732,145 @@ msgstr ""
- "ingen begränsning."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Uppladdningen stoppas när den har laddas upp så här många timmar."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Timmar"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Förhållandegräns:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Gränsen fungerar bara när flödet erbjuds"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Tids&gräns:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Uppdatera spårare"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Minimalt uppdateringsintervall - 60 sekunder"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Lägg till spå&rare"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Ta bort spårare"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "Ändr&a spårare"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Återställ förval"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Visa visningsflik för deltagare i huvudfönstret"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Visa visningsfliken för delnerladdning i huvudfönstret"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Visa visningsflik för spårare i huvudfönstret"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Visa lista med deltagare"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Visa lista med delar som &för närvarande laddas ner"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Visa lista med spårare"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP-blockeringsinställningar"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Välj PeerGuardian-filterfil "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Använd PeerGuardian-filter?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP-filterfil:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Ladda &ner och konvertera"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2880,25 +2880,25 @@ msgstr ""
- "Observera: ZIP-filer från bluetack.co.uk stöds."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Filterwebbadress av nivå 1"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Använd nivå 1 filter?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Konverterar..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2910,61 +2910,61 @@ msgstr ""
- "tiden kommer du inte att kunna använda Ktorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Uppdatera"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Uppdatera diagram var"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Uppdateringar av grafiskt gränssnitt"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Samla in data var"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "millisekund"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Maximal"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Maximal hastighetsskala:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Exakt"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Se 'Vad är det här' för ytterligare hjälp"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2976,31 +2976,31 @@ msgstr ""
- "- Exakt: Maximal uppnådd hastighet som syns i diagrammet"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Deltagarens hastighet"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Deltagarens hastighet:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "uppdatera var"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "uppdateringar av diagramdata"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3008,817 +3008,817 @@ msgstr ""
- "processorkraft."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Deltagarens anslutningar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Stora värden kan dölja diagram för anslutna deltagare"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Visa användare med hela flödet i svärmar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Visa användare med delar av flödet i svärmar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Antal mätningar"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Uppladdning"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Anslutningar"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Deltagare"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Växla diagram med deltagares hastighet"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Intervall mellan hämtning av data om deltagares hastighet"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Växla uppritning i svärmar för användare med delar av flödet"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Växla uppritning i svärmar för användare med hela flödet"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Antal nerladdningsmätningar"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Antal mätningar av deltagares hastighet"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Antal uppladdningsmätningar"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Antal anslutningsmätningar"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Antal DHT-mätningar"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Maximalläge för OY-axel"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Importera befintlig nerladdning"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Dataflöde:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Data:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Ange dataflöde och data som redan laddats ner för det dataflödet."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Importera"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "förval"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS-kanaler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Kanaler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "&Ta bort"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Ny"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&Webbadress"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Artiklar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "&Uppdatera automatiskt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "I&gnorera TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Uppdatera"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Titel"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Behåll artiklar (dagar)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Aktiv"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filter"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filter för att acceptera"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filter för att förkasta"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Reguljära uttryck"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Behandla som &serier"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Behandla"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Kriterier för serie"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Träffar utan episod"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Sista episod"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Sista säsong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Första säsong"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Första episod"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Testte&xt"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Te&st"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtrera träffar"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Schemaläggning av bandbredd"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Vänsterklickskategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kate&gori 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "Stäng &av"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategori &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategori &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Högerklickskategori"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategori &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategori 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategorier"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1:a kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3:e kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "ladda ner:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "ladda upp:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KiB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2:a kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 betyder obegränsat"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Spara i fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Ladda från fil"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Återställ schema"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "O&k"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Inställningssida för insticksprogram för schemaläggning"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Använd schemaläggning av &bandbredd?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Schemaläggning av bandbredd"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Använd färger istället för p&unktavbildningar?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Rekommenderas för långsammare system)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Redigera s&chema"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Aktivera schemaläggning av bandbredd?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Använd färger istället för punktavbildningar?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Använd formaterad text i logg"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Meddelandeflagga för allmän information"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Meddelandeflagga för anslutningar"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Meddelandeflagga för DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Meddelandeflagga för spårningsinformation"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Meddelandeflagga för information om disk in- och utmatning"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för IP-filtrering"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Meddelandeflagga i sökinsticksprogram"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för delfilimport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för informationskomponent"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Meddelandeflagga i UPnP-insticksprogram"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för katalogsökning"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för schemaläggning"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Meddelandeflagga i RSS-insticksprogram"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Meddelandeflagga i insticksprogram för webbgränssnitt"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Loggvisningsalternativ"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Insticksprogram"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Alla"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Felsökning"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Anmärkning"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Viktigt"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Inget"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP-filter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Sök:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Sök i katalog:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Schemaläggning:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Delfilimport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Informationskomponent:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS-insticksprogram:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Insticksprogram för webbgränssnitt:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "System"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Allmänt:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Anslutningar:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk in- och utmatning:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Använd formaterad te&xt i log"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Extern webbläsare"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Öppna sökresultat i extern webbläsare"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Använd standardwebbläsare"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Sökväg till egen webbläsare:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Söktjänster"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Söktjänstens namn:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Lägg till"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Tjänster"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "Webbadress"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Ta bort alla"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Lägg till &förval"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Uppdatera från Internet"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Sök"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Söktjänst:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Nuvarande söktjänst"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Använd egen webbläsare"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Sökväg till körbar fil för egen webbläsare"
-@@ -4107,7 +4107,7 @@ msgstr "Kontrollerar data"
- msgid "Stopped. No space left on device."
- msgstr "Stoppad. Inget utrymme kvar på enheten."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4115,12 +4115,12 @@ msgstr ""
- "Du har inte tillräckligt med diskutrymme för att ladda ner dataflödet. Är du "
- "säker på att du vill fortsätta?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Otillräckligt diskutrymme för %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4128,16 +4128,16 @@ msgstr ""
- "Dataflödet \"%1\" har nått sitt maximala delningsförhållande. Ignorera gränsen "
- "och erbjud flödet ändå?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Maximalt delningsförhållande uppnått."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Fel när dataflödet %1 skulle stoppas: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Fel när dataflödet %1 skulle startas: %2"
- 
-diff --git a/translations/tr/messages/ktorrent.po b/translations/tr/messages/ktorrent.po
-index bb61410..83bd2a8 100644
---- a/translations/tr/messages/ktorrent.po
-+++ b/translations/tr/messages/ktorrent.po
-@@ -11,7 +11,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-09-09 14:47+0300\n"
- "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
- "Language-Team: Turkish <yerellestirme@kde.org.tr>\n"
-@@ -26,7 +26,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Hiç gelen bağlantı yok (güvenlik duvarı kullanıyor olabilirsiniz)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Bilgi"
-@@ -194,7 +194,7 @@ msgstr "Bozuk Adres."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "İndirilenler"
-@@ -318,7 +318,7 @@ msgid "Document to open"
- msgstr "Açılacak belge"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -585,7 +585,7 @@ msgstr "Torrent Paylaşımcı Kaynakları:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -627,7 +627,7 @@ msgid "Add to Group"
- msgstr "Gruba Ekle"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Hız Limitleri"
-@@ -646,7 +646,7 @@ msgid "Malformed IP address."
- msgstr "Bozuk IP adresi."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Tercihler"
-@@ -682,7 +682,7 @@ msgid "Advanced"
- msgstr "Gelişmiş"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Gelişmiş Seçenekler"
-@@ -693,7 +693,7 @@ msgstr "Görünen sütunlar"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Durum"
-@@ -715,7 +715,7 @@ msgstr "Gönderilenler"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "İndirme Hızı"
-@@ -836,7 +836,7 @@ msgid "User"
- msgstr "Kullanıcı"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Sıralama Yöneticisi"
-@@ -1057,8 +1057,8 @@ msgid "Start torrent"
- msgstr "Torrenti başlat"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "İndir"
-@@ -1112,13 +1112,13 @@ msgid "Encryption"
- msgstr "Şifreleme"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Protokol şifrelemesi kullan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1128,13 +1128,13 @@ msgstr ""
- "yavaşlatmasını engellemek için kullanılır."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Şifrelenmemiş bağlantılara izin ver"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1143,7 +1143,7 @@ msgstr ""
- "bağlanabiliniyor."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1154,169 +1154,169 @@ msgstr ""
- "bakın."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Daha çok paylaşımcı bulmak için DHT kullan"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "DHT iletişimi için UDP portu:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Özel IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "İzl&eyiciye bir IP adresi veya bilgisayar adı yolla"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Özel IP ya da bilgisayar:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Sistem Çekmecesi Simgesi"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "&Sistem çekmecesi simgesini göster"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Sistem çekmecesi simgesinde &hız çubuğunu göster"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Sistem çekmecesi iletilerini göster"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Gönderme bantgenişliği (KB/sn olarak):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "İndirme bantgenişliği (KB/sn olarak):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Dizinler"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Geçici dosyaların saklanacağı dizin:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Tamamlanmış indirmeleri buraya taşı:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "İndirilenleri otom&atik olarak buraya kaydet:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr ".torrent dosyalarını buraya kopyala:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "İndirme Araç Çubuğu"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Torrent için hız limitlerini ayarla"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "En yüksek gönderme hızı limiti:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "En yüksek indirme hızı limiti:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/sn (0 limit yok demektir)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Olası paylaşımcı ekle"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "Paylaşımcının IP adresi:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Port:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Paylaşımcının IP numarasını ve portunu girin."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent Kara Listesi"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1327,187 +1327,187 @@ msgstr ""
- "eklentisini kullanın (PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Yasaklanmış Paylaşımcılar"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Paylaşımcıların IP adresleri"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Paylaşımcı ekle:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Paylaşımcıyı kara listeye ekler"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Seçili Eşleri karalisteden siler"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "Temiz&le"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Bu listeyi temizler"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Farklı &Kaydet..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Bu karalisteyi KTorrent IPFiltre eklentisi kullanımı için kaydet"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "En fazla indirme:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "En fazla gönderme:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "İndirmeyi düşük disk alanı üzerinde başlat :"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "En düşük disk alanı:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Başlatma"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Herzaman sor"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Başlatmaya zorla"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 = limit yok)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "İndirme hızı limiti:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Genel bağlantı limiti:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "En yüksek paylaşım süresi:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Bir torrent için en fazla bağlantı:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Yükleme yerlerinin sayısı:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP izleyici portu:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "En yüksek paylaşım oranı:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Gönderme hızı limiti:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/sn (0 = limit yok)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Saat (0 limit yok demektir)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "İndirme işlemi tamamlandığında &yayınlamaya devam et"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Dikkat"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1517,283 +1517,283 @@ msgstr ""
- "eklentisi bunu sizin için yapabilir."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT Sıralama Penceresi"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Durum:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "İzleyici:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Paylaşım oranı:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Kalan bayt:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Kontrol eden"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "&Gönderilenler"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Gönderilen:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Y&ukarı taşı"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "A&şağı taşı"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Yukarı taşı"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Aşağı &taşı"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "&QM Denetimli"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "&Kullanıcı Denetimli"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Adres Yapıştır"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "Adres:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "&Tamam"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "İ&ptal"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Torrent Oluştur"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Torrent dosyasını oluşturmak istediğiniz dosya veya dizin:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "En az bir tane izleyici veya düğme eklemelisiniz."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Dosya Seçenekleri"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Her parçanın boyutu:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Torrenti yayınlamaya &başla"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Merkezi Olma&yan (Sadece DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Özel torrent (DHT geçişi yok)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Yorumlar:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "&Oluştur"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "İ&ptal"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "İzleyiciler"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT düğümleri"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Düğüm:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP ya da bilgisayar"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Port"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1804,19 +1804,19 @@ msgstr ""
- "numaranızı girin."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Gelişmiş Seçenekler"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1832,428 +1832,428 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Şimdiki hız"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Genel ortalama hız"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "X için Pencere"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Taşıma ortalaması"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(yeniden başlattıktan sonra etkinleştirilir)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Önceden disk alanı &ayırma özelliğini pasifleştir"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- "Önceden &gereken tüm disk alanını ayır (dosya parçalanmalarını engeller)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Basit (yavaş)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Dosya sistemine özgü"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Performans"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Bellek kullanımı:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Düşük"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Orta"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Yüksek"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Arayüz güncelleme aralığı:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1sn"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2sn"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5sn"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Hızlı İşlemci"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Yavaş İşlemci"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Veri Denetleme"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "Dosya gönderilirken şundan &büyük parçaları yeniden denetleme"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Veri doğruluğunu şundan &sonra denetle"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "bozuk parça"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Ağ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Bir torrent için izin verilen en fazla bağlantı (0 = limit yok)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "HTTP izleyici bağlantıları için KDE &vekil sunucu ayarlarını kullanma"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP izleyici vekil sunucusu:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Veriler taranıyor"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Torrent verisi taranıyor :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Bulunan parça sayısı :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Başarısız olan / indirilemeyen parça sayısı :"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Test Et"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "metinEtiketi2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "metinEtiketi3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Etkin indirimlerin limiti (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Etkin indirimlerin limiti (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Düşük disk alanı üzerinde indirmeler başlatılsın mı?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Bir torrent için izin verilen en fazla bağlantı (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Tüm torrentler için izin verilen en fazla bağlantı (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Gönderim hızı için limit (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "İndirim hızı için KB/sn bazında limit (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Azami paylaşım oranı (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Saat cinsinden azami paylaşım süresi (0 = limit yok)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Sistem çekmecesi simgesini göster"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Sistem çekmecesinde hız simgesini göster"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "İndirme bantgenişliği (kb/sn olarak):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Gönderme bantgenişliği (kb/sn olarak):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Torrent tamamlandığında uyarı iletisi göster."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "İndirim tamamlandığında yayınlamaya devam et"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Geçici dosyaların saklanacağı dizin"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "İndirilenleri otomatik olarak Kayıt dizinine kaydet"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "İndirilen dosyaların saklanacağı dizin"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "İndirme işlemi bitenleri otomatik olarak Bitirilmişler dizinine taşı"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "İndirilme işlemi biten dosyaların taşınacağı dizin"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr ".torrent dosyalarını otomatik olarak Kopyalama dizinine kopyala"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr ".torrent dosyalarının kopyalanacağı dizin"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "İzleyiciyi geçmek için özel bir IP kullan"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Kayıt dizini olarak kullanılan son dizin"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "İzleyiciyi geçmek için IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Bellek kullanımı"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Arayüz güncelleme sıklığı"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "DHT Desteği"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT bağlantı portu"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Yükleme yerleri sayısı"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "KTorrentGöstericisi tarafından gösterilen sütunlar"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ET algoritması"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2263,457 +2263,457 @@ msgstr ""
- "ulaşıldığında torrent durdurulacaktır."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Eklenti Yöneticisi"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Yükle"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Kaldır"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "&Tümünü Yükle"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "Tümünü &Kaldır"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Kullanılacak öntanımlı UPnP aygıtı"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Bulunan aygıtlar:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Aygıt"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Yönlendirilen Portlar"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN Bağlantısı"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "&Portları Yönlendir"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Bağlantı portu yönlendirmesini geri al"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Yeniden Tara"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Dizin1 taraması etkinleştirilsin mi?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Dizin2 taraması etkinleştirilsin mi?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Dizin3 taraması etkinleştirilsin mi?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Dizin1 yolu"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Dizin2 yolu"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Dizin3 yolu"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Torrentin sessiz açılıp açılmayacağı."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Seçilen davranışı sil."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Seçilen davranışı taşı."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "DizinTarama Seçenekleri"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Dizin &1 taraması"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Dizin &2 taraması"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Dizin &3 taraması"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Yüklendikten sonra \"yüklenmişler\" dizinine &taşı"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Yüklendikten sonra torrenti \"yüklenmişler\" dizinine taşı"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Torrentleri &sessizce aç"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "'İndirilecek Dosyaları Seç' penceresini gösterme"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Yük&lendikten sonra sil"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Torrentleri yüklendikten sonra siler"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Taranacak Dizinler"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Dizin 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Dizin 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Dizin 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Arama Tercihleri"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Web Sunucu"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Portu yönlendir"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Oturum TTL (sn olarak):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Arayüz seçin:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Kullanıcı adı:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Parolayı değiştir ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Php çalıştırılabilr dosyasının konumu:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Port numarası"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Portu yönlendir"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Oturum süresi"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "Arayüz teması"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "çalıştırılabilir php dosyasının konumu"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "kullanıcı adı"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "parola"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Parçalar"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Toplam:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Şu anda indirilen:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "İndirilmiş:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Hariç tutulanlar:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Kalan:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Boyut:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Parça"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "İlerleme"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Paylaşımcı"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Atanan Paylaşımcılar"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Gönderenler:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "İndirenler:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Ortalama İndirme Hızı:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Ortalama Gönderme Hızı:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Sonraki Güncelleme:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "İzleyici Durumu:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Torrentin indirilmiş parçaları:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Erişilebilir durumdaki torrent parçaları:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Paylaşım"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2722,145 +2722,145 @@ msgstr ""
- "demektir."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "Paylaşım oranı bu değere ulaştıktan sonra yükleme durdurulur."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "Saat"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Oran limiti:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Limit sadece gönderen kipinde etkin"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "Süre &limiti:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "İ&zleyiciyi Güncelle"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Asgari güncelleme aralığı - 60 saniye"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "İ&zleyici Ekle"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "İzleyiciyi Kaldır"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "İzleyi&ciyi Değiştir"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Öntanımlılara Geri Dön"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Anapencerede paylaşımcı sekmesini göster"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Anapencerede parça indirme sekmesini göster"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Anapencerede izleyici sekmesini göster"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Paylaşımcıların listesini göster"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Şu anda &indirilen parçaları listede göster"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "İzleyicilerin listesini göster"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP Engelleme Tercihleri"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Paylaşımcı için Bekçi Filtresi Dosyası Seç "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Paylaşımcı için Bekçi filtresi kullanılsın mı?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP filtreleme dosyası:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "İ&ndir/Dönüştür"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2871,25 +2871,25 @@ msgstr ""
- " Not: WIP dosyası destekleniyor."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Seviye1 filtre adresi"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Seviye1 filtresi kullanılsın mı?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Dönüştürülüyor..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2901,61 +2901,61 @@ msgstr ""
- "kullanamayacaksınız."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Güncelle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Grafikleri şu sıklıkla güncelle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Arayüz güncellemeleri"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Verileri bu sıklıkta topla"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "milisaniye"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "En fazla"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "En fazla hız cetveli kipi:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Tam"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Daha fazla bilgi için 'Bu nedir'e bakın"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2967,847 +2967,847 @@ msgstr ""
- "- Doğru: Listede yer alan en büyük hız"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Paylaşımcı hızı"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Paylaşımcı hızı:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "bu sıklıkta güncelle"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "grafik veri güncellemeleri"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "Çok fazla paylaşımcı hakkında bilgi almak CPU kullanımını arttırır."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "Paylaşımcı bağlantıları"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Büyük değerler bağlı kaynak listelerini anlaşışmaz kılabilir"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Göndericileri kümeleyerek göster"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "İndirenleri kümeleyerek göster"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Ölçüm sayıları"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Gönder"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "Bağlantılar"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Paylaşımcılar"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Kaynak ve hız listeleri arasında geçiş yap"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Kaynaklardan alınan verilerin arasındaki süre"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Kümelerde yer alan indirenlerin çizimine geçiş yap"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Kümelerde yer alan gönderenlerin çizimine geçiş yap"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "İndirme ölçüm sayısı"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Paylaşımcı hızı ölçüm sayısı"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Gönderme ölçüm sayısı"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Bağlantı ölçüm sayısı"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "DHT ölçüm sayısı"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "OY düzlemi en yüksek modu"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Mevcut bir indirmeyi al"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Veri:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Lütfen belirtili torrent için torrent'i ve de verileri belirtiniz."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&İçeri Aktar"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "öntanımlı"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Rss Beslemeleri"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Beslemeler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Si&l"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "Y&eni"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&Adres"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Yazılar"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Otomatik &tazeleme"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "TTL'yi &Yoksay"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Tazele"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Başlık"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Yazıları sakla (gün)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Etkin"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Filtreler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Filtreleri Kabul Et"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Filtreleri Reddet"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Sıradan ifadeler"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Sıraya &Göre Davran"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "İşletim"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Sıra kriterleri"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Bölümsüz Eşle"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Azami Bölüm"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Azami Sezon"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Asgari Sezon"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Asgari Bölüm"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "&Metni test et"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "De&netle"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Filtre Eşleşmeleri"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Bantgenişliği zamanlayıcısı"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Kategoriyi sol tıkla"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Kategor&i 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "K&apat"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Normal"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Kategori &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Kategori &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Kategoriyi sağ tıkla"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Kategori &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Kategori 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Kategoriler"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. Kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. Kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "indirme:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "gönderme:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/sn *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. Kategori</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "*0, limit yok demektir"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Farklı kaydet"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Dosyadan yükle"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Zamanlamacıyı sıfırla"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&Tamam"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Zamanlayıcı eklentisi tercihler sayfası"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Bantgenişliği &zamanlayıcısı kullanılsın mı?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Bantgenişliği  zamanlayıcısı"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Resim yerine &renk kullanılsın mı?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Yavaş sistemler için önerilir)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Za&manlayıcıyı ayarla"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Bantgenişliği zamanlayıcısı etkinleştirilsin mi?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Resim yerine renk kullanılsın mı?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Günlükler için zengin metin kullan"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Genel bilgi iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Bağlantı iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "İzleyici bilgi iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Bellek Giriş/Çıkış iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IPFiltre eklentisi iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Arama eklentisi iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Parça Dosya İçeri Aktarma eklentisi iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Bilgi Programcığı eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnP eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "DizinTarama eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Zamanlayıcı eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "RSS eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "AğArayüzü eklenti iletileri işaretlemesi"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "GünlükGörüntüleyici Seçenekleri"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Eklentiler"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Tümü"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Hata ayıkla"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Uyarı"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Önemli"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Hiçbiri"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP Filtresi:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Ara:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "Tarama Dizini:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Zamanlayıcı:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "Parça Dosya İçeri Aktarımı:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "Bilgi Programcığı:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS eklentisi:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Ağ Arayüzü eklentisi:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Sistem"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Genel:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "Bağlantılar:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "Disk Giriş/Çıkış:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Günlük kayıtları için &zengin metin kullan"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Harici Tarayıcı"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Aramaları harici web tarayıcısında göster"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Öntanımlı tarayıcıyı kullan"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Özel tarayıcı konumu:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Arama Motorları"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Arama motorunun adı:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Ekle"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Arama Motorları"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "Adres"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "&Tümünü Kaldır"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "&Öntanımlı Ekle"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "İnternetten Güncelle"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Ara"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Arama motoru:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Geçerli arama motoru"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Özel tarayıcı kullan"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Özel tarayıcı dosyası konumu"
-@@ -4094,7 +4094,7 @@ msgstr "Veri denetleniyor"
- msgid "Stopped. No space left on device."
- msgstr "Durduruldu. Aygıtta yer kalmadı."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4102,12 +4102,12 @@ msgstr ""
- "Bu torrenti indirmek için yeterli disk alanınız yok. Devam etmek istediğinizden "
- "emin misiniz?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "%1 için yetersiz disk alanı"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4115,16 +4115,16 @@ msgstr ""
- "Torrent \"%1\" azami paylaşım oranına ulaşmıştır. Limiti yoksayıp göndermeye "
- "devam edilsin mi?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Azami paylaşım oranına ulaşıldı."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Torrent durdururken hata %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Torrent başlatırken hata %1: %2"
- 
-diff --git a/translations/uk/messages/ktorrent.po b/translations/uk/messages/ktorrent.po
-index 1c9c4dc..b401d5b 100644
---- a/translations/uk/messages/ktorrent.po
-+++ b/translations/uk/messages/ktorrent.po
-@@ -5,7 +5,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2007-11-06 21:01-0800\n"
- "Last-Translator: Ivan Petrouchtchak <fr.ivan@ukrainian-orthodox.org>\n"
- "Language-Team: Ukrainian <translation@linux.org.ua>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "Немає з'єднань ззовні (можливо, фаєрвол перешкоджає)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "Інформація"
-@@ -189,7 +189,7 @@ msgstr "Неправильний URL."
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "Звантаження"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "Відкрити документ"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -575,7 +575,7 @@ msgstr "Джерела вузлів торента:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -617,7 +617,7 @@ msgid "Add to Group"
- msgstr "Додати до групи"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "Обмеження швидкості"
-@@ -635,7 +635,7 @@ msgid "Malformed IP address."
- msgstr "Неправильна адреса URL."
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "Параметри"
-@@ -671,7 +671,7 @@ msgid "Advanced"
- msgstr "Додатково"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "Додаткові параметри"
-@@ -682,7 +682,7 @@ msgstr "Видимі стовпчики"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "Стан"
-@@ -704,7 +704,7 @@ msgstr "Вивантажено"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "Швидкість звантаження"
-@@ -830,7 +830,7 @@ msgid "User"
- msgstr "Користувач"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "Менеджер черги"
-@@ -1061,8 +1061,8 @@ msgid "Start torrent"
- msgstr "Запустити торент"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "Звантаження"
-@@ -1116,13 +1116,13 @@ msgid "Encryption"
- msgstr "Шифрування"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "Вживати шифрування протоколу"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1132,13 +1132,13 @@ msgstr ""
- "з'єднання бітторента."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "Дозволити незашифровані з'єднання"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
-@@ -1147,7 +1147,7 @@ msgstr ""
- "шифрування."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1158,169 +1158,169 @@ msgstr ""
- "посібник."
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "&Вживати DHT для залучення додаткових вузлів"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "Порт UDP для комунікації DHT:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "Нетиповий IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "Наді&слати координатору нетипову адресу IP або назву вузла"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "Нетипові IP або назва вузла:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "Піктограма системного лотка"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "Показувати п&іктограму в системному лотку"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "Показувати п&анель швидкості в системному лотку"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "Показувати повідомлення-вигульки в системному лотку"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "Швидкість вивантаження (в КБ/с):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "Швидкість звантаження (в КБ/с):"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "Теки"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "Тека для збереження тимчасових файлів:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "Пересунути завершені звантаження до:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "&Автоматично зберегти звантаження до:"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "Скопіювати файли торента до:"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "Пенал звантаження"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "Вкажіть обмеження швидкості для торента"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "Макс. швидкість вивантаження:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "Макс. швидкість звантаження:"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "КБ/с (0 - без обмеження)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "Додати потенційний вузол"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "IP вузла:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "Порт:"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "Введіть IP і порт вузла."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "Чорний список KTorrent"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1331,187 +1331,187 @@ msgstr ""
- "(PeerGuardian)."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "Заборонені вузли"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "Адреса IP вузла"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "Додати вузол:"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "Додає вузол до чорного списку"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "Вилучає вибраний вузол з чорного списку"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "О&чистити"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "Очищає список"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "Зберегти &як..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "Зберегти цей чорний список для використання у втулку KTorrent IPFilter"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "Максимум звантажень:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "Макс. кількість поширень:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "Почати звантаження коли мало місця на диску:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "Мінімальний простір на диску:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "Не починати"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "Завжди запитувати"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "Примусово починати"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "МБ"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 - без обмеження)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "Макс. швидкість звантаження:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "Глобальне обмеження кількості з'єднань:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "Макс. час поширення:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "Максимум з'єднань на торент:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "Кількість позицій вивантаження:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "Порт UDP координатора:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "Макс. коефіцієнт звант. / вивант.:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "Макс. швидкість вивантаження:"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "КБ/с (0 - без обмеження)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "Год. (0 - без обмеження)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "&Продовжувати поширення після закінчення звантаження"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "Увага"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1521,283 +1521,283 @@ msgstr ""
- "UPnP не може цього зробити за вас."
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "Вікно черги торента"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "Стан:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Координатор:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "Коефіцієнт звант. / вивант.:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "Залишилось байтів:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Торент"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "Хто керує"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "В&ивантаження"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "Вивантажено:"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "Пе&ресунути вгору"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "Пересунути в&низ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "Пересунути у верхівку"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "Пересунути в самий &низ"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "Керується менеджером &черги"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "Керується &користувачем"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "Вставити URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL:"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "Г&аразд"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "&Скасувати"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "Створити торент"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "Файл чи тека, з яких ви хочете створити торент:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "Потрібно додати принаймні один координатор або вузол."
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "Параметри файлів"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "Розмір кожного шматка:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "КБ"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "Почати по&ширення торента"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "Нецентралі&зований (тільки DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "Приватний торент (DHT не дозволено)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "Коментарі:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "С&творити"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "С&касувати"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Координатори"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "Вузли DHT"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "Вузол:"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP або назва вузла"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "Порт"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1807,19 +1807,19 @@ msgstr ""
- "вставити вашу власну адресу IP і порт, якщо ви плануєте поширювати цей торент."
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "Додаткові параметри"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1848,427 +1848,427 @@ msgstr ""
- "зразків"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "Поточна швидкість"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "Загальна середня швидкість"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr "Вікно X"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr "Рухоме середнє"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(увійде в дію після перезапуску)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "Ви&мкнути виділення місця на диску"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "&Цілком виділити місце на диску (запобігає фрагментації)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "Простий (повільно)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "Відповідно до файлової системи"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "Швидкодія"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "Вживання пам'яті:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "Незначне"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "Середнє"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "Значне"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "Інтервал оновлення інтерфейсу:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 мс"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 с"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "Швидкий процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "Повільний процесор"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "Перевірка даних"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "При вивантаженні, &не перевіряти знов шматки, більші за"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr "Перевіряти &цілісність даних після"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "пошкоджені шматки"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "Мережа"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "Максимальна кількість встановлень з'єднань:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "DSCP для пакетів IP:"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "Не вживати про&ксі KDE для HTTP-з'єднань координатора"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "Проксі HTTP координатора:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "Сканування даних"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "Сканування даних торента:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "Знайдено шматків:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "Шматків з помилками / не звантажених:"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "Тест"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "Максимальна кількість звантажень (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "Максимальна кількість поширень (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "Починати звантаження, коли мало місця на диску?"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "Максимальна кількість з'єднань на торент (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "Макс. кількість з'єднань для всіх торентів (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "Макс. швидкість вивантаження в КБ/с (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "Макс. швидкість звантаження в КБ/с (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "Макс. коефіцієнт вгору/вниз (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "Макс. час поширення в годинах (0 = без обмеження)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "Показувати піктограму в системному лотку"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "Показувати панель швидкості в системному лотку"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "Швидкість звантаження (в кб/с):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "Швидкість вивантаження (в кб/с):"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Показувати вигулькні повідомлення про завершення торента."
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "Продовжувати поширення після закінчення звантаження"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "Тека для збереження тимчасових файлів"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "Чи автоматично зберігати звантаження у каталозі збереження"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "Тека для збереження звантажених файлів"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "Чи автоматично пересувати звантаження до теки завершених"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "Тека для пересування файлів, звантаження яких завершено"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "Чи автоматично копіювати файли торента до torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "Тека для копіювання файлів .torrent"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "Чи передавати координатору нетипову адресу IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr "Каталог, який було вжито для останнього збереження"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "Передати координатору адресу IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "Вживання пам'яті"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "Інтервал оновлення графічного інтерфейсу"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "Підтримка DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "Порт DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "Кількість позицій вивантаження"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "Стовпчики показані в KTorrentView"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "Алгоритм (оцінки часу)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2278,457 +2278,457 @@ msgstr ""
- "ніж вказано в minDiskSpace, торент зупиниться."
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "Менеджер втулків"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "Завантажити"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "&Розвантажити"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "Завантажити в&сі"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "&Розвантажити всі"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "Вживати типовий пристрій UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "Виявлені пристрої:"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "Пристрій"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "Перенаправлені порти"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "З'єднання WAN"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "Перенап&равити порти"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "Повернути перенаправлення портів"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "Пересканувати"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "Увімкнути сканування теки 1?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "Увімкнути сканування теки 2?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "Увімкнути сканування теки 3?"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "Шлях теки 1"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "Шлях теки 2"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "Шлях теки 3"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "Чи відкривати торент без втручання."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "Увімкнено дію вилучення."
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "Увімкнена дія пересування."
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "Параметри сканування тек"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "Сканувати теку &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "Сканувати теку &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "Сканувати теку &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "Піс&ля завантаження пересунути в теку \"завантажених\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "Після завантаження торента пересунути його у теку \"завантажених\""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "Відкривати торент без втр&учання"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "Не показувати вікно «Вибрати файли для звантаження»"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "Вилучити після заван&таження"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "Вилучає торент після завантаження"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "Сканувати теки"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "Тека 1:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "Тека 2:"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "Тека 3:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "Параметри пошуку"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Веб-сервер"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "Перенаправити порт"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "Сеанс TTL (в сек.):"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "Виберіть інтерфейс:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "Ім'я користувача:"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "Змінити пароль ..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "Шлях до програми php:"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "Номер порту"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "Перенаправити порт"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "Тривалість життя сеансу"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "жупан інтерфейсу"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "шлях до програми php"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "ім'я користувача"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "пароль"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "Шматки"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "Всього:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "Звантажується:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "Звантажено:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "Виключено:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "Ліворуч:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "Розмір:"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "Шматок"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "Поступ"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "Вузол"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "Призначені вузли"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "Поширювачі:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "П'явки:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "Середня швидкість звантаження:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "Середня швидкість вивантаження:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "Наступне оновлення через:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Стан координатора:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "Звантажені частини торента:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "Наявні частини торента:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "Вгору/вниз"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
-@@ -2737,7 +2737,7 @@ msgstr ""
- "означає - без обмеження."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr ""
-@@ -2745,139 +2745,139 @@ msgstr ""
- "годин."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "год."
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "Обмеження коефіцієнта:"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "Обмеження працює тільки в режимі поширення"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "&Обмеження часу:"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "&Оновити координатор"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "Мінімальний інтервал оновлення - 60 секунд"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "Дода&ти координатор"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "Вилучити координатор"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "З&мінити координатор"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "Відновити типові параметри"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "Показати в головному вікні вкладку перегляду вузлів"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "Показати в головному вікні вкладку перегляду звантаження шматків"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "Показати в головному вікні вкладку перегляду координаторів"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "Показати список вузлів"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "Показати список шматків, які теп&ер звантажуються"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "Показати список координаторів"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "Параметри блокування адрес IP"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "Виберіть файл фільтра PeerGuardian "
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "Вживати фільтр PeerGuardian?"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "Файл фільтра IP:"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "Званта&жити / перетворити"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2887,25 +2887,25 @@ msgstr ""
- "ПРИМІТКА: підтримується ZIP-файл з bluetack.co.uk."
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "Адреса URL фільтра 1 рівня"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "Вживати фільтр 1 рівня?"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "Перетворення..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2917,61 +2917,61 @@ msgstr ""
- "під час перетворення ви не зможете користуватись програмою KTorrent."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "Оновити"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "Оновляти графіки кожні"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "Оновлення інтерфейсу"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "Збирати дані кожні"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "мс"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "Макс."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "Макс. режим шкали швидкості:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "Точна"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "Щоб отримати більше інформації, дивіться «Що це?»"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2983,31 +2983,31 @@ msgstr ""
- "- Точна: Макс. досягнута швидкість, яку видно на графіку"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "Швидкість вузлів"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "Швидкість вузлів:"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "оновлювати кожні"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "оновлення даних графіка"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
-@@ -3015,817 +3015,817 @@ msgstr ""
- "процесор."
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "З'єднання вузлів"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "Великі значення можуть спотворити графіки з’єднаних вузлів"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "Показувати поширювачів роями"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "Показувати п’явки роями"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr "Кількість вимірів"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "Вивантажити"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "З'єднання"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "Вузли"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "Перемикання графіків швидкості вузлів"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "Інтервал між отриманням даних про швидкість вузлів"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr "Перемикання показу п’явок роями"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr "Перемикання показу поширювачів роями"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, no-c-format
- msgid "Download mesurments count"
- msgstr "Звантажити кількість вимірів"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr "Кількість вимірів швидкості вузлів"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr "Вивантажити кількість вимірів"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr "Кількість вимірів з’єднань"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr "Кількість вимірів DHT"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr "Макс. режим осі OY"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "Імпортувати існуюче звантаження"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Торент:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "Дані:"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "Будь ласка, вкажіть торент і дані, які вже для нього звантажені."
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "&Імпортувати"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "типовий"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "Подачі RSS"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "Подачі"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "Ви&лучити"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "&Створити"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "Статті"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "Авто&оновлення"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "І&гнорувати TTL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "Освіжити"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "&Заголовок"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "Зберігати статті (днів)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "&Активний"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "Фільтри"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "Фільтри прийняття"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "Фільтри відкидання"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "Формальні вирази"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "Розглядати як &серії"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "Процес"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "Критерії серій"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr "Звантажити збіг без епізоду"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr "Макс. епізодів"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, no-c-format
- msgid "Max Season"
- msgstr "Макс. сезонів"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr "Мін. сезонів"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr "Мін. епізодів"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "Перевірити &текст"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "Те&ст"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "Фільтрувати співпадання"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "Планування пропускної здатності"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "Клацніть лівою кнопкою мишки на категорію"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "Категорі&я 1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "В&имкнути"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "&Звичайний"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "Категорія &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "Категорія &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "Клацніть правою кнопкою мишки на категорію"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "Категорія &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "&Категорія 3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "Категорії"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. категорія</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. категорія</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "звантаження:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "вивантаження:"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "КБ/с *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. категорія</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 означає - без обмеження"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "Зберегти у файл"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "&Завантажити з файла"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "Скинути планування"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "&Гаразд"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "Сторінка параметрів втулка планування"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "Вживати планування п&ропускної здатності?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "Планування пропускної здатності"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "Вживати замість мал&юнків кольори?"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(Рекомендовано для повільних систем)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "Змінити п&ланування"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "Увімкнути планування пропускної здатності?"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "Вживати замість малюнків кольори?"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "Вживати в журналі багатий текст"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "Прапорець загальних повідомлень"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "Прапорець повідомлень про з'єднання"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "Прапорець повідомлень DHT"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Прапорець повідомлень про координатор"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "Прапорець повідомлень дискового В/В"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "Прапорець повідомлень втулка IPFilter"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "Прапорець повідомлень втулка пошуку"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "Прапорець повідомлень втулка PartFileImport"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "Прапорець повідомлень втулка InfoWidget"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "Прапорець повідомлень втулка UPnP"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "Прапорець повідомлень втулка ScanFolder"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "Прапорець повідомлень втулка планування"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "Прапорець повідомлень втулка RSS"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Прапорець повідомлень втулку веб-інтерфейсу"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "Параметри перегляду журналу"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "Втулки"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "Всі"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "Зневадження"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "Примітка"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "Важливо"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "Немає"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IPFilter:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "Пошук:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "ScanFolder:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "Планування:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "InfoWidget:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "Втулок RSS:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Втулок веб-інтерфейсу:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "Система"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "Загальні:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "З'єднання:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "В/В диска:"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "Вживати в журналі багатий те&кст"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "Зовнішній навігатор Тенет"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "Відкривати результати пошуку в зовнішньому навігаторі"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "Вживати типовий навігатор"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "Нетиповий шлях навігатора:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "Рушії пошуку"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "Назва рушія пошуку:"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "&Додати"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "Рушії"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "Ви&лучити всі"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "Додати ти&повий"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "Оновити з Інтернету"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "Пошук"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "Рушій пошуку:"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "Поточний рушій пошуку"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "Вживати нетиповий навігатор"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "Шлях до програми нетипового навігатора"
-@@ -4115,7 +4115,7 @@ msgstr "Перевірка даних"
- msgid "Stopped. No space left on device."
- msgstr "Зупинено. На пристрої не залишилось місця."
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
-@@ -4123,12 +4123,12 @@ msgstr ""
- "У вас замало місця на диску для звантаження цього торента. Ви справді хочете "
- "продовжити?"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, c-format
- msgid "Insufficient disk space for %1"
- msgstr "Замало простору на диску для %1"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
-@@ -4136,16 +4136,16 @@ msgstr ""
- "Торент «%1» досягнув максимальне значення коефіцієнта вивантаження / "
- "звантаження. Ігнорувати обмеження і продовжити поширення?"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "Досягнуте максимальне значення коефіцієнта вивантаження / звантаження."
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "Помилка зупинки торента %1: %2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "Помилка запуску торента %1: %2"
- 
-diff --git a/translations/zh_CN/messages/ktorrent.po b/translations/zh_CN/messages/ktorrent.po
-index 28d4f13..8cb36d8 100644
---- a/translations/zh_CN/messages/ktorrent.po
-+++ b/translations/zh_CN/messages/ktorrent.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent 1.1rc1\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2008-01-21 15:13+0800\n"
- "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
- "Language-Team: zh_CN <kde-china@kde.org>\n"
-@@ -21,7 +21,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr "无进入连接(可能被防火墙阻挡)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "信息"
-@@ -187,7 +187,7 @@ msgstr "错误的 URL。"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "下载"
-@@ -302,7 +302,7 @@ msgid "Document to open"
- msgstr "要打开的文档"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -564,7 +564,7 @@ msgstr "种子对等点来源："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -606,7 +606,7 @@ msgid "Add to Group"
- msgstr "添加到组"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, no-c-format
- msgid "Speed Limits"
- msgstr "速度限制"
-@@ -624,7 +624,7 @@ msgid "Malformed IP address."
- msgstr "IP 地址错误。"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "首选项"
-@@ -660,7 +660,7 @@ msgid "Advanced"
- msgstr "高级"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, no-c-format
- msgid "Advanced Options"
- msgstr "高级选项"
-@@ -671,7 +671,7 @@ msgstr "可见列"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "状态"
-@@ -693,7 +693,7 @@ msgstr "已上传"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "下载速度"
-@@ -808,7 +808,7 @@ msgid "User"
- msgstr "用户"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "队列管理器"
-@@ -1012,8 +1012,8 @@ msgid "Start torrent"
- msgstr "开始种子任务"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "下载"
-@@ -1067,13 +1067,13 @@ msgid "Encryption"
- msgstr "加密"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "使用协议加密"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1081,20 +1081,20 @@ msgid ""
- msgstr "协议加密可让您的 ISP 不能减慢您的 BT 下载连接速度。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "允许不加密的连接"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1102,169 +1102,169 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "使用 DHT 获得额外的下载者(&U)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "DHT 通讯的 UDP 端口："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "自定义 IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "向 tracker 发送自定义 IP 或主机名(&N)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "自定义 IP 或主机名："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, no-c-format
- msgid "System Tray Icon"
- msgstr "系统托盘图标"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "显示系统托盘图标(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "在托盘图标中显示速度栏(&B)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, no-c-format
- msgid "Show system tray popup messages"
- msgstr "显示系统托盘弹出消息"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr "上传带宽(KB/秒)："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr "下载带宽(KB/秒)："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "文件夹"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "保存临时文件的文件夹："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, no-c-format
- msgid "Move completed downloads to:"
- msgstr "将已完成的下载移动到："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "自动保存下载到(&A)："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "复制 .torrent 文件到："
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "下载工具栏"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "设置种子的速度限制"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, no-c-format
- msgid "Max upload rate:"
- msgstr "最大上传速率："
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, no-c-format
- msgid "Max download rate:"
- msgstr "最大下载速率："
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/秒 (0为无限制)"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr "添加潜在对等点"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, no-c-format
- msgid "Peer IP:"
- msgstr "对等点 IP："
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "端口："
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr "输入对等点 IP 和端口。"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent 黑名单"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1272,187 +1272,187 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "已封禁的对等点"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "对等点 IP 地址"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "添加对等点："
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "添加对等点到黑名单"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "从黑名单中删除选中的对等点"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "清除(&L)"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "清除此列表"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "另存为(&A)..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "最大任务数："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "最大种子数："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr "在低剩余空间的磁盘上下载："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, no-c-format
- msgid "Minimum disk space:"
- msgstr "最小磁盘空间："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, no-c-format
- msgid "Don't start"
- msgstr "不开始"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr "总是询问"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, no-c-format
- msgid "Force start"
- msgstr "强行开始"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr "MB"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "(0 为无限制)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "最大下载速率："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, no-c-format
- msgid "Global connection limit:"
- msgstr "全局连接限制："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, no-c-format
- msgid "Max seed time:"
- msgstr "最大做种时间："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "每任务最大连接数："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "上传通道数："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP Tracker 端口："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, no-c-format
- msgid "Max share ratio:"
- msgstr "最大共享率："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "最大上传速率："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/秒 (0为无限制)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "小时 (0 为无限制)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "下载完成后保持做种(&K)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "注意"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1460,283 +1460,283 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT 队列对话框"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "状态："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "Tracker："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "共享率："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "剩余字节数："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "控制方式"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "上传(&S)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "已上传："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "上移(&O)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "下移(&N)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, no-c-format
- msgid "Move to top"
- msgstr "移到顶端"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr "移到底端(&B)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "队列管理器控制(&Q)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "用户控制(&U)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "粘贴 URL"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "URL："
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "确定(&K)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "取消(&A)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "创建 Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "您想要创建 torrent 的文件或文件夹："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "您必须至少添加一个 tracker 或节点。"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "文件选项"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "每块的大小："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "开始做种(&G)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr "分布式(只对 DHT 网络有效)(&Z)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "私有 torrent(不允许 DHT)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "注释："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, no-c-format
- msgid "&Create"
- msgstr "创建(&C)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "取消(&N)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "Trackers"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr "DHT 结点"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, no-c-format
- msgid "Node:"
- msgstr "结点："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, no-c-format
- msgid "IP or hostname"
- msgstr "IP 或主机名"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "端口"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1744,19 +1744,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, no-c-format
- msgid "Advanced Preferences"
- msgstr "高级首选项"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1772,427 +1772,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, no-c-format
- msgid "Current speed"
- msgstr "当前速度"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr "全局平均速度"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr "(重新启动程序后生效)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr "禁用磁盘空间预分配(&B)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr "预分配全部磁盘空间(可避免碎片)(&U)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr "基本(较慢)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr "文件系统特定"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, no-c-format
- msgid "Performance"
- msgstr "性能"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "内存占用："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "低"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "中"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "高"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "界面更新间隔："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500 毫秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5 秒"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr "快速 CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr "慢速 CPU"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, no-c-format
- msgid "Data Checking"
- msgstr "数据检查"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr "在上传期间，对大于以下尺寸的块不重新检查(&N) "
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr "损坏的块"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr "联网"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "最大连接数："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr "IP 数据包的 DSCP："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr "HTTP tracker 连接时不使用 KDE 的代理设置(&X)"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "HTTP Tracker 端口："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "扫描数据"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "正在扫描种子数据："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "找到的块数量："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "失败/未下载的块数量："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "测试"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr "textLabel2"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr "textLabel3"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "下载的最大任务数(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "种子的最大任务数(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr "在低剩余空间的磁盘上下载吗？"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "每个下载任务的最大连接数(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "所有下载任务的最大连接数(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "最大上传速度(KB/秒)(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "最大下载速度(KB/秒)(0为无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "最大共享率(0 代表无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "最大共享率(按小时计，0 代表无限制)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "显示系统托盘图标"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "在托盘图标中显示速度栏"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr "下载带宽(kb/秒)："
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr "上传带宽(kb/秒)："
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "下载任务完成时显示弹出消息。"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "在下载完成后保持做种"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "保存临时文件的文件夹"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "是否将下载自动保存到 saveDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "保存下载文件的文件夹"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "是否将已完成的下载自动移动到 completedDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "已完成的下载移动到"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "是否将 .torrent 文件自动复制到 torrentCopyDir"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr ".torrent 文件复制到"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "是否将自定义 IP 传递给 tracker"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "传递给 tracker 的 IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "内存占用"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "界面更新间隔"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "支持 DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT 端口"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "上传通道数"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr "KTorrent 视图要显示的列"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr "ET 算法"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2200,602 +2200,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "插件管理器"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "装入"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "卸载(&N)"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, no-c-format
- msgid "Load &All"
- msgstr "全部装入(&A)"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, no-c-format
- msgid "&Unload All"
- msgstr "全部卸载(&U)"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "要使用的默认的 UPnP 设备"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "检测到的设备："
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "设备"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "转发的端口"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, no-c-format
- msgid "WAN Connection"
- msgstr "WAN 连接"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, no-c-format
- msgid "Forw&ard Ports"
- msgstr "转发端口(&A)"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "撤消端口转发"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "重新扫描"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "允许扫描文件夹1？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "允许扫描文件夹2？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "允许扫描文件夹3？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "文件夹1路径"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "文件夹2路径"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "文件夹3路径"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "是否以静默方式打开 torrent。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "选中了删除动作。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "选中了移动动作。"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "扫描文件夹首选项"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "扫描文件夹 &1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "扫描文件夹 &2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "扫描文件夹 &3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "装入后移动到“已装入”目录(&A)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr ""
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "以静默方式打开 torrent(&Y)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "不显示“选择要下载的文件”对话框"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "装入后删除(&G)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "装入后删除 torrent"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "要扫描的文件夹"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "文件夹 1："
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "文件夹 2："
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "文件夹 3："
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "搜索首选项"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr "Web 服务器"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, no-c-format
- msgid "Forward port"
- msgstr "转发端口"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr "会话 TTL(秒)："
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, no-c-format
- msgid "Select interface:"
- msgstr "选择接口："
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, no-c-format
- msgid "Username:"
- msgstr "用户名："
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr "更改密码..."
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr "PHP 可执行文件路径："
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr "端口号"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, no-c-format
- msgid "forward Port"
- msgstr "转发端口"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr "会话生存时间"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, no-c-format
- msgid "interface skin"
- msgstr "界面皮肤"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr "PHP 可执行文件路径"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr "用户名"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr "密码"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "块"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "总共："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "当前正在下载："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "已下载："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "已排除："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr "剩余："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "大小："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "块"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "进度"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "下载者"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "指派的下载者"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "种子："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "下载者："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "平均下载速度："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "平均上传速度："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "下次更新于："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "Tracker 状态："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "这个 torrent 已经下载的部分："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "这个 torrent 可用的部分："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "分享"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr "您的上传会在达到指定分享比率后自动停止。0 代表无限制。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "您的上传会在指定小时数后自动停止。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr "小时"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, no-c-format
- msgid "Ratio limit:"
- msgstr "比率限制："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "限制只在种子模式中有效"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, no-c-format
- msgid "Time &limit:"
- msgstr "时间限制(&L)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, no-c-format
- msgid "&Update Tracker"
- msgstr "更新 tracker(&U)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "最小更新间隔 - 60 秒"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, no-c-format
- msgid "Add Trac&ker"
- msgstr "添加 tracker(&K)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "删除 Tracker"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "更改 tracker(&A)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "恢复默认值"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "在主窗口中显示下载者查看标签"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "在主窗口中显示块下载查看标签"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "在主窗口中显示 trackers 查看标签"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "显示下载者列表"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "显示当前正在下载的块列表(&Y)"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "显示 tracker 列表"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IP 屏蔽首选项"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "使用 KTorrent 过滤器吗？"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, fuzzy, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "使用 KTorrent 过滤器吗？"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP 过滤器文件："
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "下载/转换(&N)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2803,25 +2803,25 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "一级过滤器 URL"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "使用一级过滤器吗？"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "正在转换..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2830,61 +2830,61 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr "更新"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr "图表更新间隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, no-c-format
- msgid "GUI updates"
- msgstr "界面更新间隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr "数据收集间隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr "毫秒"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, no-c-format
- msgid "Maximum"
- msgstr "最大"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "最大速度刻度："
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr "精确"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr "查看“这是什么”获取更多帮助"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2893,847 +2893,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, no-c-format
- msgid "Peers speed"
- msgstr "对等点速度"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, no-c-format
- msgid "Peers speed:"
- msgstr "对等点速度："
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr "更新间隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr "图表数据更新"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr "收集大量连接点的数据时会导致较大的 CPU 开销。"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, no-c-format
- msgid "Peers connections"
- msgstr "对等点连接"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr "过大的连接点值会使图表变得模糊"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, no-c-format
- msgid "Show seeders in swarms"
- msgstr "显示群集中的吸血虫"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr "显示群集中吸血虫"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, no-c-format
- msgid "Upload"
- msgstr "上传"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, no-c-format
- msgid "Connections"
- msgstr "连接"
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "下载者"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr "切换对等点速度图表"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr "获取对等点连接速度数据的间隔"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "下载 Torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, no-c-format
- msgid "Connections mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "导入已有的下载"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent："
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "数据："
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "请指定 torrent 和该 torrent 已下载的数据。"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "导入(&I)"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, no-c-format
- msgid "default"
- msgstr "默认"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr "RSS 种子"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, no-c-format
- msgid "Feeds"
- msgstr "种子"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr "删除(&L)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr "新建(&N)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, no-c-format
- msgid "&URL"
- msgstr "&URL"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr "文章数"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr "自动刷新(&R)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr "忽略 TTL(&G)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr "刷新"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr "标题(&T)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr "保留文章(天)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr "活动(&A)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, no-c-format
- msgid "Filters"
- msgstr "过滤器"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, no-c-format
- msgid "Accept Filters"
- msgstr "接受过滤器"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr "拒绝过滤器"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr "正则表达式"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr "串行处理(&S)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, no-c-format
- msgid "Process"
- msgstr "处理"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr "串行条件"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "最大比率："
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr "测试文本(&X)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, no-c-format
- msgid "Te&st"
- msgstr "测试(&S)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, no-c-format
- msgid "Filter Matches"
- msgstr "过滤器匹配"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "带宽规划器"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "左键单击类别"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "类别 1(&Y)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "关闭(&U)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "普通(&N)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "类别 &3"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "类别 &2"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "右键单击类别"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "类别 &1"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "类别 3(&C)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "类别"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. 类别</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. 类别</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "下载："
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "上传："
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/s *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. 类别</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 为无限制"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "保存到文件"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "从文件装入(&L)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "重置规划"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "确定(&K)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "规划器插件首选项页"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "使用带宽规划器吗？(&B)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "带宽规划器"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "使用颜色取代点阵吗(&X)？"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "(较慢系统推荐适用)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "编辑规划(&C)"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "启用带宽规划器吗？"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "使用颜色取代点阵吗？"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "使用富格式日志文本"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "常规消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "连接消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT 消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "Tracker 消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "磁盘 IO 消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IP 过滤器插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "搜索插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "部分文件导入插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "信息部件插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnP 插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "扫描文件夹插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "规划器插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "RSS 插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "Web 界面插件消息标记"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "日志查看器选项"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "插件"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "全部"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "调试"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "注意"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "重要"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "无"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP 过滤器："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "搜索："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "扫描文件夹："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "规划器："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "部分文件导入："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "信息部件："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr "RSS 插件："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, no-c-format
- msgid "WebInterface plugin:"
- msgstr "Web 界面插件："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "系统"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "常规："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "连接："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "磁盘 I/O："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "日志使用富格式文本(&X)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr "外部浏览器"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr "在外部浏览器中打开搜索"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr "使用默认浏览器"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, no-c-format
- msgid "Custom browser path:"
- msgstr "自定义浏览器路径："
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "搜索引擎"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "搜索引擎名称："
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "添加(&A)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "引擎"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "URL"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "全部删除(&E)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "添加默认(&L)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, no-c-format
- msgid "Update From Internet"
- msgstr "从 Internet 上更新"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "搜索"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "搜索引擎："
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "当前的搜索引擎"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr "使用自定义浏览器"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr "自定义浏览器可执行文件路径"
-@@ -4011,33 +4011,33 @@ msgstr "正检查数据"
- msgid "Stopped. No space left on device."
- msgstr "下载已停止。设备上没有剩余空间。"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr "您没有下载种子任务所需的足够磁盘空间。您确认想要继续吗？"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy, c-format
- msgid "Insufficient disk space for %1"
- msgstr "正分配磁盘空间"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "达到了最大共享率限制。"
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "停止 torrent %1 出错：%2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "启动 torrent %1 出错：%2"
- 
-diff --git a/translations/zh_TW/messages/ktorrent.po b/translations/zh_TW/messages/ktorrent.po
-index 82d3a18..d03f408 100644
---- a/translations/zh_TW/messages/ktorrent.po
-+++ b/translations/zh_TW/messages/ktorrent.po
-@@ -4,7 +4,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: ktorrent\n"
--"POT-Creation-Date: 2008-04-18 19:40+0200\n"
-+"POT-Creation-Date: 2008-07-08 22:20+0200\n"
- "PO-Revision-Date: 2006-08-28 14:39+0800\n"
- "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
- "dot tw>\n"
-@@ -19,7 +19,7 @@ msgid "No incoming connections (possibly firewalled)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 42
--#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:345 rc.cpp:383 rc.cpp:1019
-+#: apps/ktorrent/ktorrent.cpp:184 rc.cpp:336 rc.cpp:369 rc.cpp:989
- #, no-c-format
- msgid "Info"
- msgstr "資訊"
-@@ -191,7 +191,7 @@ msgstr "不正確的網址"
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 9
- #: apps/ktorrent/groups/downloadgroup.cpp:27
- #: apps/ktorrent/groups/groupmanager.h:57 apps/ktorrent/pref.cpp:147
--#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:138 rc.cpp:342
-+#: apps/ktorrent/viewmanager.cpp:62 rc.cpp:132 rc.cpp:333
- #, no-c-format
- msgid "Downloads"
- msgstr "下載"
-@@ -311,7 +311,7 @@ msgid "Document to open"
- msgstr "要開啟的文件"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 59
--#: apps/ktorrent/main.cpp:120 rc.cpp:553
-+#: apps/ktorrent/main.cpp:120 rc.cpp:532
- #, no-c-format
- msgid "KTorrent"
- msgstr "KTorrent"
-@@ -597,7 +597,7 @@ msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 85
- #: apps/ktorrent/ktorrentviewmenu.cpp:66 plugins/infowidget/peerview.cpp:221
--#: rc.cpp:77 rc.cpp:1256 rc.cpp:1307
-+#: rc.cpp:75 rc.cpp:1208 rc.cpp:1259
- #, no-c-format
- msgid "DHT"
- msgstr "DHT"
-@@ -641,7 +641,7 @@ msgid "Add to Group"
- msgstr "自訂 IP"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 16
--#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:147
-+#: apps/ktorrent/ktorrentviewmenu.cpp:100 rc.cpp:141
- #, fuzzy, no-c-format
- msgid "Speed Limits"
- msgstr "速度限制，以 KB/s 為單位"
-@@ -660,7 +660,7 @@ msgid "Malformed IP address."
- msgstr "端點 IP 位址"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 311
--#: apps/ktorrent/pref.cpp:58 rc.cpp:282
-+#: apps/ktorrent/pref.cpp:58 rc.cpp:273
- #, no-c-format
- msgid "Preferences"
- msgstr "喜好設定"
-@@ -697,7 +697,7 @@ msgid "Advanced"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 27
--#: apps/ktorrent/pref.cpp:411 rc.cpp:540
-+#: apps/ktorrent/pref.cpp:411 rc.cpp:519
- #, fuzzy, no-c-format
- msgid "Advanced Options"
- msgstr "掃描資料夾選項"
-@@ -708,7 +708,7 @@ msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 16
- #: apps/ktorrent/ktorrentview.cpp:135
--#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:1016
-+#: plugins/infowidget/infowidgetplugin.cpp:76 rc.cpp:986
- #, no-c-format
- msgid "Status"
- msgstr "狀態"
-@@ -730,7 +730,7 @@ msgstr "已上傳"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 313
- #: apps/ktorrent/ktorrentview.cpp:139 plugins/infowidget/peerview.cpp:216
--#: rc.cpp:1010
-+#: rc.cpp:980
- #, no-c-format
- msgid "Down Speed"
- msgstr "下載速度"
-@@ -854,7 +854,7 @@ msgid "User"
- msgstr "使用者"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 24
--#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:249
-+#: apps/ktorrent/queuedialog.cpp:75 rc.cpp:240
- #, no-c-format
- msgid "Queue Manager"
- msgstr "佇列管理員"
-@@ -1062,8 +1062,8 @@ msgid "Start torrent"
- msgstr "開始 Torrent(&G)"
- 
- #. i18n: file ./apps/ktorrent/fileselectdlgbase.ui line 160
--#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1244 rc.cpp:1259
--#: rc.cpp:1349 rc.cpp:1439
-+#: plugins/infowidget/fileview.cpp:49 rc.cpp:27 rc.cpp:1196 rc.cpp:1211
-+#: rc.cpp:1301 rc.cpp:1385
- #, no-c-format
- msgid "Download"
- msgstr "下載"
-@@ -1117,13 +1117,13 @@ msgid "Encryption"
- msgstr "加密"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 58
--#: rc.cpp:64 rc.cpp:787
-+#: rc.cpp:63 rc.cpp:764
- #, no-c-format
- msgid "Use protocol encryption"
- msgstr "使用協定加密"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 64
--#: rc.cpp:68
-+#: rc.cpp:66
- #, no-c-format
- msgid ""
- "Protocol encryption is used to prevent ISP's from slowing down bittorrent "
-@@ -1131,20 +1131,20 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 72
--#: rc.cpp:71 rc.cpp:790
-+#: rc.cpp:69 rc.cpp:767
- #, no-c-format
- msgid "Allow unencrypted connections"
- msgstr "允許未加密的連線"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 75
--#: rc.cpp:74
-+#: rc.cpp:72
- #, no-c-format
- msgid ""
- "If unchecked, you'll be able to connect only to clients supporting encryption."
- msgstr "如果取消勾選的話，您就只能與支援加密的客戶端連線。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 88
--#: rc.cpp:80
-+#: rc.cpp:78
- #, no-c-format
- msgid ""
- "<b>D</b>istributed <b>H</b>ash <b>T</b>able protocol."
-@@ -1154,169 +1154,169 @@ msgstr ""
- "<br> 分散式端點交換協定。詳情請參考手冊。"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 99
--#: rc.cpp:83
-+#: rc.cpp:81
- #, no-c-format
- msgid "&Use DHT to get additional peers"
- msgstr "使用 DHT 取得額外的端點(&U)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 118
--#: rc.cpp:87
-+#: rc.cpp:84
- #, no-c-format
- msgid "UDP port for DHT communication:"
- msgstr "DHT 溝通使用的 UDP 連接埠："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 161
--#: rc.cpp:90
-+#: rc.cpp:87
- #, no-c-format
- msgid "Custom IP"
- msgstr "自訂 IP"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 172
--#: rc.cpp:93
-+#: rc.cpp:90
- #, fuzzy, no-c-format
- msgid "Se&nd the tracker a custom IP address or hostname"
- msgstr "傳送自訂 IP 或主機名稱給追蹤器(&N)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 188
--#: rc.cpp:96
-+#: rc.cpp:93
- #, fuzzy, no-c-format
- msgid "Custom IP address or hostname:"
- msgstr "自訂 IP 或主機名稱："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 205
--#: rc.cpp:99
-+#: rc.cpp:96
- #, fuzzy, no-c-format
- msgid "System Tray Icon"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 216
--#: rc.cpp:102
-+#: rc.cpp:99
- #, no-c-format
- msgid "Show s&ystem tray icon"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 224
--#: rc.cpp:105
-+#: rc.cpp:102
- #, fuzzy, no-c-format
- msgid "Show speed &bar in tray icon"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 232
--#: rc.cpp:108
-+#: rc.cpp:105
- #, fuzzy, no-c-format
- msgid "Show system tray popup messages"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 251
--#: rc.cpp:112
-+#: rc.cpp:108
- #, no-c-format
- msgid "Upload bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 276
--#: rc.cpp:115
-+#: rc.cpp:111
- #, no-c-format
- msgid "Download bandwidth (in KB/sec):"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 305
--#: rc.cpp:118
-+#: rc.cpp:114
- #, no-c-format
- msgid "Folders"
- msgstr "資料夾"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 324
--#: rc.cpp:121
-+#: rc.cpp:117
- #, no-c-format
- msgid "Folder to store temporary files:"
- msgstr "儲存暫存檔的資料夾："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 342
--#: rc.cpp:124
-+#: rc.cpp:120
- #, fuzzy, no-c-format
- msgid "Move completed downloads to:"
- msgstr "不要下載"
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 353
--#: rc.cpp:128
-+#: rc.cpp:123
- #, no-c-format
- msgid "&Automatically save downloads to:"
- msgstr "自動儲存下載到(&A)："
- 
- #. i18n: file ./apps/ktorrent/generalpref.ui line 395
--#: rc.cpp:131
-+#: rc.cpp:126
- #, fuzzy, no-c-format
- msgid "Copy .torrent files to:"
- msgstr "torrent 檔案"
- 
- #. i18n: file ./apps/ktorrent/ktorrentui.rc line 34
--#: rc.cpp:144
-+#: rc.cpp:138
- #, no-c-format
- msgid "Download Toolbar"
- msgstr "下載工具列"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 27
--#: rc.cpp:150
-+#: rc.cpp:144
- #, fuzzy, no-c-format
- msgid "Set the speed limits for torrent"
- msgstr "開始 Torrent(&G)"
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 51
--#: rc.cpp:153
-+#: rc.cpp:147
- #, fuzzy, no-c-format
- msgid "Max upload rate:"
- msgstr "最大上傳速率："
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 59
--#: rc.cpp:156
-+#: rc.cpp:150
- #, fuzzy, no-c-format
- msgid "Max download rate:"
- msgstr "最大下載速率："
- 
- #. i18n: file ./apps/ktorrent/speedlimitsdlgbase.ui line 97
--#: rc.cpp:159 rc.cpp:162
-+#: rc.cpp:153 rc.cpp:156
- #, fuzzy, no-c-format
- msgid "KB/s (0 is no limit)"
- msgstr "KB/秒（0 表示不限制）"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 16
--#: rc.cpp:171
-+#: rc.cpp:165
- #, no-c-format
- msgid "Add potential peer"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 35
--#: rc.cpp:174
-+#: rc.cpp:168
- #, fuzzy, no-c-format
- msgid "Peer IP:"
- msgstr "端點"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 43
--#: rc.cpp:177 rc.cpp:208
-+#: rc.cpp:171 rc.cpp:201
- #, no-c-format
- msgid "127.0.0.1"
- msgstr "127.0.0.1"
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 51
--#: rc.cpp:180 rc.cpp:288 rc.cpp:525 rc.cpp:931
-+#: rc.cpp:174 rc.cpp:279 rc.cpp:504 rc.cpp:908
- #, no-c-format
- msgid "Port:"
- msgstr "連接埠："
- 
- #. i18n: file ./apps/ktorrent/addpeerwidgetbase.ui line 100
--#: rc.cpp:183
-+#: rc.cpp:177
- #, no-c-format
- msgid "Enter peer IP and port."
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 16
--#: rc.cpp:193
-+#: rc.cpp:186
- #, no-c-format
- msgid "KTorrent Blacklist"
- msgstr "KTorrent 黑名單"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 30
--#: rc.cpp:196
-+#: rc.cpp:189
- #, no-c-format
- msgid ""
- "Note: Blacklist applies to current session only. Use save/open to save your "
-@@ -1324,187 +1324,187 @@ msgid ""
- msgstr "注意：黑名單只會套用到目前的工作階段。用「儲存」來儲存，或是用 IPFilter 外掛程式（PeerGuardian）。"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 41
--#: rc.cpp:199
-+#: rc.cpp:192
- #, no-c-format
- msgid "Banned Peers"
- msgstr "被拒的端點"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 50
--#: rc.cpp:202
-+#: rc.cpp:195
- #, no-c-format
- msgid "Peer IP address"
- msgstr "端點 IP 位址"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 96
--#: rc.cpp:205
-+#: rc.cpp:198
- #, no-c-format
- msgid "Add peer:"
- msgstr "新增端點："
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 134
--#: rc.cpp:215
-+#: rc.cpp:207
- #, no-c-format
- msgid "Adds a peer to blacklist"
- msgstr "將端點加入黑名單"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 168
--#: rc.cpp:222
-+#: rc.cpp:213
- #, no-c-format
- msgid "Removes selected peer from blacklist"
- msgstr "從黑名單中移除所選的端點"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 176
--#: rc.cpp:225
-+#: rc.cpp:216
- #, no-c-format
- msgid "C&lear"
- msgstr "清除(&L)"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 182
--#: rc.cpp:228
-+#: rc.cpp:219
- #, no-c-format
- msgid "Clears this list"
- msgstr "清除此清單"
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 218
--#: rc.cpp:234
-+#: rc.cpp:225
- #, no-c-format
- msgid "Save &As..."
- msgstr "另存為(&A)..."
- 
- #. i18n: file ./apps/ktorrent/ipfilterwidgetbase.ui line 224
--#: rc.cpp:237
-+#: rc.cpp:228
- #, no-c-format
- msgid "Save this blacklist to use with KTorrent IPFilter plugin"
- msgstr "儲存此黑名單，以便在 KTorrent IPFilter 外掛程式中使用"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 59
--#: rc.cpp:252
-+#: rc.cpp:243
- #, no-c-format
- msgid "Maximum downloads:"
- msgstr "最大下載數："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 86
--#: rc.cpp:255
-+#: rc.cpp:246
- #, no-c-format
- msgid "Maximum seeds:"
- msgstr "最大 seed 數："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 94
--#: rc.cpp:258
-+#: rc.cpp:249
- #, no-c-format
- msgid "Start download on low disk space :"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 102
--#: rc.cpp:261
-+#: rc.cpp:252
- #, fuzzy, no-c-format
- msgid "Minimum disk space:"
- msgstr "配置磁碟空間"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 140
--#: rc.cpp:264
-+#: rc.cpp:255
- #, fuzzy, no-c-format
- msgid "Don't start"
- msgstr "未開始"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 145
--#: rc.cpp:267
-+#: rc.cpp:258
- #, no-c-format
- msgid "Always ask"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 150
--#: rc.cpp:270
-+#: rc.cpp:261
- #, fuzzy, no-c-format
- msgid "Force start"
- msgstr "未開始"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 208
--#: rc.cpp:273
-+#: rc.cpp:264
- #, no-c-format
- msgid "MB"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 236
--#: rc.cpp:276 rc.cpp:279 rc.cpp:312 rc.cpp:315 rc.cpp:324
-+#: rc.cpp:267 rc.cpp:270 rc.cpp:303 rc.cpp:306 rc.cpp:315
- #, no-c-format
- msgid "(0 is no limit)"
- msgstr "（0 表示不限制）"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 330
--#: rc.cpp:285
-+#: rc.cpp:276
- #, no-c-format
- msgid "Maximum download rate:"
- msgstr "最大下載速率："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 346
--#: rc.cpp:291
-+#: rc.cpp:282
- #, fuzzy, no-c-format
- msgid "Global connection limit:"
- msgstr "全域連線限制"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 354
--#: rc.cpp:294
-+#: rc.cpp:285
- #, fuzzy, no-c-format
- msgid "Max seed time:"
- msgstr "分享比例："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 370
--#: rc.cpp:297
-+#: rc.cpp:288
- #, no-c-format
- msgid "Maximum connections per torrent:"
- msgstr "每個 torrent 最大連線數："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 397
--#: rc.cpp:300
-+#: rc.cpp:291
- #, no-c-format
- msgid "Number of upload slots:"
- msgstr "上傳槽的數量："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 405
--#: rc.cpp:303
-+#: rc.cpp:294
- #, no-c-format
- msgid "UDP tracker port:"
- msgstr "UDP 追蹤器連接埠："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 413
--#: rc.cpp:306
-+#: rc.cpp:297
- #, fuzzy, no-c-format
- msgid "Max share ratio:"
- msgstr "分享比例："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 421
--#: rc.cpp:309
-+#: rc.cpp:300
- #, no-c-format
- msgid "Maximum upload rate:"
- msgstr "最大上傳速率："
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 576
--#: rc.cpp:318 rc.cpp:321
-+#: rc.cpp:309 rc.cpp:312
- #, no-c-format
- msgid "KB/sec (0 is no limit)"
- msgstr "KB/秒（0 表示不限制）"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 651
--#: rc.cpp:327
-+#: rc.cpp:318
- #, fuzzy, no-c-format
- msgid "Hours (0 is no limit)"
- msgstr "（0 表示不限制）"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 663
--#: rc.cpp:330
-+#: rc.cpp:321
- #, no-c-format
- msgid "&Keep seeding after download is finished"
- msgstr "下載完成後仍保留 seed(&K)"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 674
--#: rc.cpp:333
-+#: rc.cpp:324
- #, no-c-format
- msgid "Attention"
- msgstr "注意"
- 
- #. i18n: file ./apps/ktorrent/downloadpref.ui line 685
--#: rc.cpp:336
-+#: rc.cpp:327
- #, fuzzy, no-c-format
- msgid ""
- "The above ports must also be forwarded if you are behind a router. The UPnP "
-@@ -1512,283 +1512,283 @@ msgid ""
- msgstr "若您在路由器後面，則以上的連接埠必須經過轉接。UPnP 外掛程式可以為您做這個工作。"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 16
--#: rc.cpp:339
-+#: rc.cpp:330
- #, no-c-format
- msgid "KT Queue Dialog"
- msgstr "KT 佇列對話框"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 69
--#: rc.cpp:348 rc.cpp:386 rc.cpp:1107
-+#: rc.cpp:339 rc.cpp:372 rc.cpp:1067
- #, no-c-format
- msgid "Status:"
- msgstr "狀態："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 85
--#: rc.cpp:351 rc.cpp:389 rc.cpp:1808
-+#: rc.cpp:342 rc.cpp:375 rc.cpp:1751
- #, no-c-format
- msgid "Tracker:"
- msgstr "追蹤器："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 93
--#: rc.cpp:354 rc.cpp:392 rc.cpp:1805
-+#: rc.cpp:345 rc.cpp:378 rc.cpp:1748
- #, no-c-format
- msgid "DHT:"
- msgstr "DHT："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 109
--#: rc.cpp:357 rc.cpp:395 rc.cpp:1061
-+#: rc.cpp:348 rc.cpp:381 rc.cpp:1025
- #, no-c-format
- msgid "Share ratio:"
- msgstr "分享比例："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 117
--#: rc.cpp:360
-+#: rc.cpp:351
- #, no-c-format
- msgid "Bytes left:"
- msgstr "剩餘位元組："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 177
--#: rc.cpp:368 rc.cpp:377
-+#: rc.cpp:354 rc.cpp:363
- #, no-c-format
- msgid "Torrent"
- msgstr "Torrent"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 188
--#: rc.cpp:371 rc.cpp:380
-+#: rc.cpp:357 rc.cpp:366
- #, no-c-format
- msgid "Controlled by"
- msgstr "控制者："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 214
--#: rc.cpp:374
-+#: rc.cpp:360
- #, no-c-format
- msgid "Upload&s"
- msgstr "上傳(&S)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 333
--#: rc.cpp:398
-+#: rc.cpp:384
- #, no-c-format
- msgid "Uploaded:"
- msgstr "已上傳："
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 486
--#: rc.cpp:406
-+#: rc.cpp:387
- #, no-c-format
- msgid "M&ove up"
- msgstr "上移(&O)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 494
--#: rc.cpp:409
-+#: rc.cpp:390
- #, no-c-format
- msgid "Move dow&n"
- msgstr "下移(&N)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 519
--#: rc.cpp:412
-+#: rc.cpp:393
- #, fuzzy, no-c-format
- msgid "Move to top"
- msgstr "上移(&O)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 530
--#: rc.cpp:416
-+#: rc.cpp:396
- #, no-c-format
- msgid "Move to &bottom"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 555
--#: rc.cpp:419
-+#: rc.cpp:399
- #, no-c-format
- msgid "&QM Controlled"
- msgstr "佇列管理員控制(&Q)"
- 
- #. i18n: file ./apps/ktorrent/queuedlg.ui line 563
--#: rc.cpp:422
-+#: rc.cpp:402
- #, no-c-format
- msgid "&User Controlled"
- msgstr "使用者控制(&U)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 30
--#: rc.cpp:434
-+#: rc.cpp:414
- #, no-c-format
- msgid "Paste URL"
- msgstr "貼上網址"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 52
--#: rc.cpp:437 rc.cpp:1104 rc.cpp:1919
-+#: rc.cpp:417 rc.cpp:1064 rc.cpp:1859
- #, no-c-format
- msgid "URL:"
- msgstr "網址："
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 106
--#: rc.cpp:440
-+#: rc.cpp:420
- #, no-c-format
- msgid "O&K"
- msgstr "確定(&K)"
- 
- #. i18n: file ./apps/ktorrent/pastedlgbase.ui line 114
--#: rc.cpp:443 rc.cpp:675 rc.cpp:1176
-+#: rc.cpp:423 rc.cpp:653 rc.cpp:1128
- #, no-c-format
- msgid "C&ancel"
- msgstr "取消(&A)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 16
--#: rc.cpp:446
-+#: rc.cpp:426
- #, no-c-format
- msgid "Create Torrent"
- msgstr "建立 Torrent"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 38
--#: rc.cpp:449
-+#: rc.cpp:429
- #, no-c-format
- msgid "The file or folder of which you want to create a torrent:"
- msgstr "您要建立 Torrent 的檔案或資料夾："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 53
--#: rc.cpp:452
-+#: rc.cpp:432
- #, fuzzy, no-c-format
- msgid "You must add at least one tracker or node."
- msgstr "您必須至少加入一個追蹤器。"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 61
--#: rc.cpp:455
-+#: rc.cpp:435
- #, no-c-format
- msgid "File Options"
- msgstr "檔案選項"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 80
--#: rc.cpp:458
-+#: rc.cpp:438
- #, no-c-format
- msgid "Size of each chunk:"
- msgstr "區塊大小："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 86
--#: rc.cpp:461
-+#: rc.cpp:441
- #, no-c-format
- msgid "32"
- msgstr "32"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 91
--#: rc.cpp:464
-+#: rc.cpp:444
- #, no-c-format
- msgid "64"
- msgstr "64"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 96
--#: rc.cpp:467
-+#: rc.cpp:447
- #, no-c-format
- msgid "128"
- msgstr "128"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 101
--#: rc.cpp:470
-+#: rc.cpp:450
- #, no-c-format
- msgid "256"
- msgstr "256"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 106
--#: rc.cpp:473
-+#: rc.cpp:453
- #, no-c-format
- msgid "512"
- msgstr "512"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 111
--#: rc.cpp:476
-+#: rc.cpp:456
- #, no-c-format
- msgid "1024"
- msgstr "1024"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 116
--#: rc.cpp:479
-+#: rc.cpp:459
- #, no-c-format
- msgid "2048"
- msgstr "2048"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 121
--#: rc.cpp:482
-+#: rc.cpp:462
- #, no-c-format
- msgid "4096"
- msgstr "4096"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 126
--#: rc.cpp:485
-+#: rc.cpp:465
- #, no-c-format
- msgid "8192"
- msgstr "8192"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 138
--#: rc.cpp:488 rc.cpp:633
-+#: rc.cpp:468 rc.cpp:611
- #, no-c-format
- msgid "KB"
- msgstr "KB"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 165
--#: rc.cpp:491
-+#: rc.cpp:471
- #, no-c-format
- msgid "Start seedin&g the torrent"
- msgstr "開始 Torrent(&G)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 176
--#: rc.cpp:494
-+#: rc.cpp:474
- #, no-c-format
- msgid "Decentrali&zed (DHT only)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 184
--#: rc.cpp:497
-+#: rc.cpp:477
- #, no-c-format
- msgid "Private torrent (DHT not allowed)"
- msgstr "私密 Torrent（不允許 DHT）"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 202
--#: rc.cpp:500
-+#: rc.cpp:480
- #, no-c-format
- msgid "Comments:"
- msgstr "註解："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 248
--#: rc.cpp:503
-+#: rc.cpp:483
- #, fuzzy, no-c-format
- msgid "&Create"
- msgstr "建立(&A)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 262
--#: rc.cpp:506 rc.cpp:1325
-+#: rc.cpp:486 rc.cpp:1277
- #, no-c-format
- msgid "Ca&ncel"
- msgstr "取消(&N)"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 275
--#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:509 rc.cpp:1101
-+#: plugins/infowidget/infowidgetplugin.cpp:214 rc.cpp:489 rc.cpp:1061
- #, no-c-format
- msgid "Trackers"
- msgstr "追蹤器"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 283
--#: rc.cpp:512
-+#: rc.cpp:492
- #, no-c-format
- msgid "DHT nodes"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 333
--#: rc.cpp:522
-+#: rc.cpp:501
- #, fuzzy, no-c-format
- msgid "Node:"
- msgstr "無"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 385
--#: rc.cpp:528
-+#: rc.cpp:507
- #, fuzzy, no-c-format
- msgid "IP or hostname"
- msgstr "自訂 IP 或主機名稱："
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 396
--#: rc.cpp:531 rc.cpp:718 rc.cpp:721
-+#: rc.cpp:510 rc.cpp:695 rc.cpp:698
- #, no-c-format
- msgid "Port"
- msgstr "連接埠"
- 
- #. i18n: file ./apps/ktorrent/torrentcreatordlgbase.ui line 437
--#: rc.cpp:534
-+#: rc.cpp:513
- #, no-c-format
- msgid ""
- "NOTE: Some known good DHT nodes are already inserted. You should probably "
-@@ -1796,19 +1796,19 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 16
--#: rc.cpp:537
-+#: rc.cpp:516
- #, fuzzy, no-c-format
- msgid "Advanced Preferences"
- msgstr "搜尋喜好設定"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 46
--#: rc.cpp:543
-+#: rc.cpp:522
- #, no-c-format
- msgid "Time left estimation algorithm:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 53
--#: rc.cpp:546 rc.cpp:568
-+#: rc.cpp:525 rc.cpp:547
- #, no-c-format
- msgid ""
- "<b>KTorrent algorithm:</b> Default algorithm using combination of other "
-@@ -1824,427 +1824,427 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 64
--#: rc.cpp:556
-+#: rc.cpp:535
- #, fuzzy, no-c-format
- msgid "Current speed"
- msgstr "目前的搜尋引擎"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 69
--#: rc.cpp:559
-+#: rc.cpp:538
- #, no-c-format
- msgid "Global average speed"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 74
--#: rc.cpp:562
-+#: rc.cpp:541
- #, no-c-format
- msgid "Window of X"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 79
--#: rc.cpp:565
-+#: rc.cpp:544
- #, no-c-format
- msgid "Moving average"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 98
--#: rc.cpp:575
-+#: rc.cpp:554
- #, no-c-format
- msgid "(takes effect after restart)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 125
--#: rc.cpp:578
-+#: rc.cpp:557
- #, no-c-format
- msgid "Disa&ble diskspace preallocation"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 141
--#: rc.cpp:581
-+#: rc.cpp:560
- #, no-c-format
- msgid "F&ully preallocate diskspace (avoids fragmentation)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 147
--#: rc.cpp:584
-+#: rc.cpp:563
- #, no-c-format
- msgid "Basic (slow)"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 152
--#: rc.cpp:587
-+#: rc.cpp:566
- #, no-c-format
- msgid "Filesystem specific"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 174
--#: rc.cpp:590
-+#: rc.cpp:569
- #, fuzzy, no-c-format
- msgid "Performance"
- msgstr "喜好設定"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 193
--#: rc.cpp:593
-+#: rc.cpp:572
- #, no-c-format
- msgid "Memory usage:"
- msgstr "記憶體用量："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 199
--#: rc.cpp:596
-+#: rc.cpp:575
- #, no-c-format
- msgid "Low"
- msgstr "低"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 204
--#: rc.cpp:599
-+#: rc.cpp:578
- #, no-c-format
- msgid "Medium"
- msgstr "中"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 209
--#: rc.cpp:602
-+#: rc.cpp:581
- #, no-c-format
- msgid "High"
- msgstr "高"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 248
--#: rc.cpp:605
-+#: rc.cpp:584
- #, no-c-format
- msgid "GUI update interval:"
- msgstr "GUI 更新間隔："
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 254
--#: rc.cpp:608
-+#: rc.cpp:587
- #, no-c-format
- msgid "500ms"
- msgstr "500ms"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 259
--#: rc.cpp:611
-+#: rc.cpp:590
- #, no-c-format
- msgid "1s"
- msgstr "1s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 264
--#: rc.cpp:614
-+#: rc.cpp:593
- #, no-c-format
- msgid "2s"
- msgstr "2s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 269
--#: rc.cpp:617
-+#: rc.cpp:596
- #, no-c-format
- msgid "5s"
- msgstr "5s"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 308
--#: rc.cpp:620
-+#: rc.cpp:599
- #, no-c-format
- msgid "Fast CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 342
--#: rc.cpp:624
-+#: rc.cpp:602
- #, no-c-format
- msgid "Slow CPU"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 354
--#: rc.cpp:627
-+#: rc.cpp:605
- #, fuzzy, no-c-format
- msgid "Data Checking"
- msgstr "檢查資料中"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 373
--#: rc.cpp:630
-+#: rc.cpp:608
- #, no-c-format
- msgid "During uploading, do &not recheck chunks bigger than"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 430
--#: rc.cpp:636
-+#: rc.cpp:614
- #, no-c-format
- msgid "Do a data integrit&y check after"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 449
--#: rc.cpp:639
-+#: rc.cpp:617
- #, no-c-format
- msgid "corrupted chunks"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 478
--#: rc.cpp:642
-+#: rc.cpp:620
- #, no-c-format
- msgid "Networking"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 505
--#: rc.cpp:645
-+#: rc.cpp:623
- #, fuzzy, no-c-format
- msgid "Maximum number of connection setups:"
- msgstr "每個 torrent 的最大連線數（0 表示不限制）"
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 527
--#: rc.cpp:648
-+#: rc.cpp:626
- #, no-c-format
- msgid "DSCP for IP packets:"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 570
--#: rc.cpp:651
-+#: rc.cpp:629
- #, no-c-format
- msgid "Do not use the KDE pro&xy settings for HTTP tracker connections"
- msgstr ""
- 
- #. i18n: file ./apps/ktorrent/advancedpref.ui line 586
--#: rc.cpp:654
-+#: rc.cpp:632
- #, fuzzy, no-c-format
- msgid "HTTP tracker proxy:"
- msgstr "UDP 追蹤器連接埠："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 24
--#: rc.cpp:657
-+#: rc.cpp:635
- #, no-c-format
- msgid "Scanning data"
- msgstr "掃描資料中"
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 38
--#: rc.cpp:660
-+#: rc.cpp:638
- #, fuzzy, no-c-format
- msgid "Scanning data of torrent :"
- msgstr "掃描區塊資料中："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 62
--#: rc.cpp:663
-+#: rc.cpp:641
- #, no-c-format
- msgid "Number of chunks found :"
- msgstr "找到的區塊數："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 70
--#: rc.cpp:666
-+#: rc.cpp:644
- #, no-c-format
- msgid "Number of chunks failed / not downloaded :"
- msgstr "失敗/未下載的區塊數："
- 
- #. i18n: file ./apps/ktorrent/scandlgbase.ui line 97
--#: rc.cpp:669 rc.cpp:672
-+#: rc.cpp:647 rc.cpp:650
- #, no-c-format
- msgid "0"
- msgstr "0"
- 
- #. i18n: file ./apps/ktupnptest/mainwidget.ui line 54
--#: rc.cpp:678
-+#: rc.cpp:656
- #, no-c-format
- msgid "Test"
- msgstr "測試"
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 49
--#: rc.cpp:685
-+#: rc.cpp:662
- #, no-c-format
- msgid "textLabel2"
- msgstr ""
- 
- #. i18n: file ./libktorrent/labelviewitembase.ui line 65
--#: rc.cpp:688
-+#: rc.cpp:665
- #, no-c-format
- msgid "textLabel3"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 10
--#: rc.cpp:691
-+#: rc.cpp:668
- #, no-c-format
- msgid "Maximum number of downloads (0 = no limit)"
- msgstr "最大下載數（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 15
--#: rc.cpp:694
-+#: rc.cpp:671
- #, no-c-format
- msgid "Maximum number of seeds (0 = no limit)"
- msgstr "最大 seed 數（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 20
--#: rc.cpp:697
-+#: rc.cpp:674
- #, no-c-format
- msgid "Start downloads on low disk space?"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 24
--#: rc.cpp:700
-+#: rc.cpp:677
- #, no-c-format
- msgid "Maximum number of connections per torrent (0 = no limit)"
- msgstr "每個 torrent 的最大連線數（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 29
--#: rc.cpp:703
-+#: rc.cpp:680
- #, no-c-format
- msgid "Maximum number of connections for all torrents (0 = no limit) "
- msgstr "所有 torrent 的最大連線數（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 34
--#: rc.cpp:706
-+#: rc.cpp:683
- #, no-c-format
- msgid "Maximum upload speed in KB/sec (0 = no limit)"
- msgstr "最大上傳速度，以 KB/秒 為單位（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 39
--#: rc.cpp:709
-+#: rc.cpp:686
- #, no-c-format
- msgid "Maximum download speed in KB/sec (0 = no limit)"
- msgstr "最大下載速度，以 KB/秒為單位（0 表示不限制）"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 44
--#: rc.cpp:712
-+#: rc.cpp:689
- #, fuzzy, no-c-format
- msgid "Maximum share ratio(0 = no limit)"
- msgstr "已達到最大分享比例限制。"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 49
--#: rc.cpp:715
-+#: rc.cpp:692
- #, fuzzy, no-c-format
- msgid "Maximum seed time in hours (0 = no limit)"
- msgstr "已達到最大分享比例限制。"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 66
--#: rc.cpp:724
-+#: rc.cpp:701
- #, no-c-format
- msgid "Show a system tray icon"
- msgstr "顯示系統匣圖示"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 70
--#: rc.cpp:727
-+#: rc.cpp:704
- #, fuzzy, no-c-format
- msgid "Show speed bar in tray icon"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 74
--#: rc.cpp:730
-+#: rc.cpp:707
- #, no-c-format
- msgid "Download bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 80
--#: rc.cpp:733
-+#: rc.cpp:710
- #, no-c-format
- msgid "Upload bandwidth (in kb/s):"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 86
--#: rc.cpp:736
-+#: rc.cpp:713
- #, no-c-format
- msgid "Show popup messages when torrent is finished."
- msgstr "Torrent 完成時顯示彈出訊息。"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 90
--#: rc.cpp:739
-+#: rc.cpp:716
- #, no-c-format
- msgid "Keep seeding after download has finished"
- msgstr "下載完成後仍保留 seed"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 94
--#: rc.cpp:742
-+#: rc.cpp:719
- #, no-c-format
- msgid "Folder to store temporary files"
- msgstr "暫存檔案的資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 98
--#: rc.cpp:745
-+#: rc.cpp:722
- #, no-c-format
- msgid "Whether to automatically save downloads to saveDir"
- msgstr "是否要自動儲存下載到資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 102
--#: rc.cpp:748
-+#: rc.cpp:725
- #, no-c-format
- msgid "Folder to store downloaded files"
- msgstr "儲存下載檔案的資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 106
--#: rc.cpp:751
-+#: rc.cpp:728
- #, fuzzy, no-c-format
- msgid "Whether to automatically move completed downloads to completedDir"
- msgstr "是否要自動儲存下載到資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 110
--#: rc.cpp:754
-+#: rc.cpp:731
- #, fuzzy, no-c-format
- msgid "Folder to move completed downloaded files to"
- msgstr "儲存下載檔案的資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 114
--#: rc.cpp:757
-+#: rc.cpp:734
- #, fuzzy, no-c-format
- msgid "Whether to automatically copy .torrent files to torrentCopyDir"
- msgstr "是否要自動儲存下載到資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 118
--#: rc.cpp:760
-+#: rc.cpp:737
- #, fuzzy, no-c-format
- msgid "Folder to copy .torrent files to"
- msgstr "暫存檔案的資料夾"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 122
--#: rc.cpp:763
-+#: rc.cpp:740
- #, no-c-format
- msgid "Whether to use a custom IP to pass to the tracker"
- msgstr "是否要將自定 IP 傳送給追蹤器"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 126
--#: rc.cpp:766
-+#: rc.cpp:743
- #, no-c-format
- msgid "Directory which was used as the last save directory"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 130
--#: rc.cpp:769
-+#: rc.cpp:746
- #, no-c-format
- msgid "IP to pass to the tracker"
- msgstr "要傳送給追蹤器的 IP"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 134
--#: rc.cpp:772
-+#: rc.cpp:749
- #, no-c-format
- msgid "Memory usage"
- msgstr "記憶體用量"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 138
--#: rc.cpp:775
-+#: rc.cpp:752
- #, no-c-format
- msgid "GUI update interval"
- msgstr "GUI 更新間隔"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 142
--#: rc.cpp:778
-+#: rc.cpp:755
- #, no-c-format
- msgid "Support for DHT"
- msgstr "支援 DHT"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 146
--#: rc.cpp:781
-+#: rc.cpp:758
- #, no-c-format
- msgid "DHT port"
- msgstr "DHT 連接埠"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 152
--#: rc.cpp:784
-+#: rc.cpp:761
- #, no-c-format
- msgid "Number of upload slots"
- msgstr "上傳槽的數量"
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 196
--#: rc.cpp:793
-+#: rc.cpp:770
- #, no-c-format
- msgid "Columns shown in KTorrentView"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 205
--#: rc.cpp:796
-+#: rc.cpp:773
- #, no-c-format
- msgid "ET algorithm"
- msgstr ""
- 
- #. i18n: file ./libktorrent/ktorrent.kcfg line 227
--#: rc.cpp:799
-+#: rc.cpp:776
- #, no-c-format
- msgid ""
- "When there's no space left to complete download and free diskspace is less than "
-@@ -2252,602 +2252,602 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 16
--#: rc.cpp:802
-+#: rc.cpp:779
- #, no-c-format
- msgid "Plugin Manager"
- msgstr "外掛程式管理器"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 48
--#: rc.cpp:805
-+#: rc.cpp:782
- #, no-c-format
- msgid "Load"
- msgstr "載入"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 56
--#: rc.cpp:808
-+#: rc.cpp:785
- #, no-c-format
- msgid "U&nload"
- msgstr "卸載(&N)"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 64
--#: rc.cpp:811
-+#: rc.cpp:788
- #, fuzzy, no-c-format
- msgid "Load &All"
- msgstr "全部載入"
- 
- #. i18n: file ./libktorrent/pluginmanagerwidget.ui line 72
--#: rc.cpp:814
-+#: rc.cpp:791
- #, fuzzy, no-c-format
- msgid "&Unload All"
- msgstr "全部卸載"
- 
- #. i18n: file ./plugins/upnp/ktupnpplugin.kcfg line 10
--#: rc.cpp:817
-+#: rc.cpp:794
- #, no-c-format
- msgid "Default UPnP device to use"
- msgstr "預設使用的 UPnP 裝置"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 16
--#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:820
-+#: plugins/upnp/upnpplugin.cpp:46 plugins/upnp/upnpprefpage.cpp:31 rc.cpp:797
- #, no-c-format
- msgid "UPnP"
- msgstr "UPnP"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 35
--#: rc.cpp:823
-+#: rc.cpp:800
- #, no-c-format
- msgid "Detected devices:"
- msgstr "偵測到的裝置："
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 41
--#: rc.cpp:826
-+#: rc.cpp:803
- #, no-c-format
- msgid "Device"
- msgstr "裝置"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 52
--#: rc.cpp:829
-+#: rc.cpp:806
- #, no-c-format
- msgid "Ports Forwarded"
- msgstr "轉接的連接埠"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 63
--#: rc.cpp:832
-+#: rc.cpp:809
- #, fuzzy, no-c-format
- msgid "WAN Connection"
- msgstr "連線："
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 91
--#: rc.cpp:835
-+#: rc.cpp:812
- #, fuzzy, no-c-format
- msgid "Forw&ard Ports"
- msgstr "轉接連接埠"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 99
--#: rc.cpp:838
-+#: rc.cpp:815
- #, no-c-format
- msgid "Undo Port Forwarding"
- msgstr "復原轉接連接埠"
- 
- #. i18n: file ./plugins/upnp/upnpwidget.ui line 124
--#: rc.cpp:841
-+#: rc.cpp:818
- #, no-c-format
- msgid "Rescan"
- msgstr "重新掃描"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 9
--#: rc.cpp:844
-+#: rc.cpp:821
- #, no-c-format
- msgid "Enable scanning of folder1?"
- msgstr "要開啟掃描資料夾 1 嗎？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 14
--#: rc.cpp:847
-+#: rc.cpp:824
- #, no-c-format
- msgid "Enable scanning of folder2?"
- msgstr "要開啟掃描資料夾 2 嗎？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 19
--#: rc.cpp:850
-+#: rc.cpp:827
- #, no-c-format
- msgid "Enable scanning of folder3?"
- msgstr "要開啟掃描資料夾 3 嗎？"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 24
--#: rc.cpp:853
-+#: rc.cpp:830
- #, no-c-format
- msgid "Folder1 path"
- msgstr "資料夾 1 路徑"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 29
--#: rc.cpp:856
-+#: rc.cpp:833
- #, no-c-format
- msgid "Folder2 path"
- msgstr "資料夾 2 路徑"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 34
--#: rc.cpp:859
-+#: rc.cpp:836
- #, no-c-format
- msgid "Folder3 path"
- msgstr "資料夾 3 路徑"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 39
--#: rc.cpp:862
-+#: rc.cpp:839
- #, no-c-format
- msgid "Whether to open torrent silently or not."
- msgstr "是否要安靜地開啟 torrent。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 44
--#: rc.cpp:865
-+#: rc.cpp:842
- #, no-c-format
- msgid "Delete action checked."
- msgstr "刪除勾選的動作。"
- 
- #. i18n: file ./plugins/scanfolder/ktscanfolderplugin.kcfg line 49
--#: rc.cpp:868
-+#: rc.cpp:845
- #, no-c-format
- msgid "Move action checked."
- msgstr "移動勾選的動作。"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 16
--#: rc.cpp:871
-+#: rc.cpp:848
- #, no-c-format
- msgid "ScanFolder Preferences"
- msgstr "資料夾掃描喜好設定"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 35
--#: rc.cpp:874
-+#: rc.cpp:851
- #, no-c-format
- msgid "Scan folder &1"
- msgstr "掃描資料夾 1(&1)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 38
--#: rc.cpp:877 rc.cpp:1480
-+#: rc.cpp:854 rc.cpp:1424
- #, no-c-format
- msgid "Alt+1"
- msgstr "Alt+1"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 46
--#: rc.cpp:880
-+#: rc.cpp:857
- #, no-c-format
- msgid "Scan folder &2"
- msgstr "掃描資料夾 2(&2)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 49
--#: rc.cpp:883 rc.cpp:1471 rc.cpp:1495
-+#: rc.cpp:860 rc.cpp:1415 rc.cpp:1439
- #, no-c-format
- msgid "Alt+2"
- msgstr "Alt+2"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 57
--#: rc.cpp:886
-+#: rc.cpp:863
- #, no-c-format
- msgid "Scan folder &3"
- msgstr "掃描資料夾 3(&3)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 60
--#: rc.cpp:889 rc.cpp:1465
-+#: rc.cpp:866 rc.cpp:1409
- #, no-c-format
- msgid "Alt+3"
- msgstr "Alt+3"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 81
--#: rc.cpp:895
-+#: rc.cpp:872
- #, no-c-format
- msgid "Move to \"loaded\" directory &after loading"
- msgstr "載入後移動到「已載入」目錄"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 84
--#: rc.cpp:898
-+#: rc.cpp:875
- #, no-c-format
- msgid "Move torrent to \"loaded\" directory after loading it"
- msgstr "載入 torrent 後將 torrent 移動到「已載入」目錄"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 92
--#: rc.cpp:901
-+#: rc.cpp:878
- #, no-c-format
- msgid "Open torrents silentl&y"
- msgstr "安靜地開啟 torrent(&Y)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 95
--#: rc.cpp:904
-+#: rc.cpp:881
- #, fuzzy, no-c-format
- msgid "Do not show 'Select files to download' dialog"
- msgstr "不要顯示「選擇要下載的檔案」對話框"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 103
--#: rc.cpp:907
-+#: rc.cpp:884
- #, no-c-format
- msgid "Delete after loadin&g"
- msgstr "載入後刪除(&G)"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 106
--#: rc.cpp:910
-+#: rc.cpp:887
- #, no-c-format
- msgid "Deletes torrent after loading"
- msgstr "載入 torrent 後刪除之"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 116
--#: rc.cpp:913
-+#: rc.cpp:890
- #, no-c-format
- msgid "Folders to scan"
- msgstr "要掃描的資料夾"
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 151
--#: rc.cpp:916
-+#: rc.cpp:893
- #, no-c-format
- msgid "Folder 1:"
- msgstr "資料夾 1："
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 162
--#: rc.cpp:919
-+#: rc.cpp:896
- #, no-c-format
- msgid "Folder 2:"
- msgstr "資料夾 2："
- 
- #. i18n: file ./plugins/scanfolder/sfprefwidgetbase.ui line 173
--#: rc.cpp:922
-+#: rc.cpp:899
- #, no-c-format
- msgid "Folder 3:"
- msgstr "資料夾 3："
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 30
--#: rc.cpp:925 rc.cpp:1895
-+#: rc.cpp:902 rc.cpp:1838
- #, no-c-format
- msgid "Search Preferences"
- msgstr "搜尋喜好設定"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 41
--#: rc.cpp:928
-+#: rc.cpp:905
- #, no-c-format
- msgid "Web Server"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 82
--#: rc.cpp:934
-+#: rc.cpp:911
- #, fuzzy, no-c-format
- msgid "Forward port"
- msgstr "轉接連接埠"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 107
--#: rc.cpp:937
-+#: rc.cpp:914
- #, no-c-format
- msgid "Session TTL (in sec):"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 142
--#: rc.cpp:940
-+#: rc.cpp:917
- #, fuzzy, no-c-format
- msgid "Select interface:"
- msgstr "全不選(&N)"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 173
--#: rc.cpp:943
-+#: rc.cpp:920
- #, fuzzy, no-c-format
- msgid "Username:"
- msgstr "使用者"
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 188
--#: rc.cpp:946
-+#: rc.cpp:923
- #, no-c-format
- msgid "Change password ..."
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/webinterfacepref.ui line 206
--#: rc.cpp:949
-+#: rc.cpp:926
- #, no-c-format
- msgid "Php executable path:"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 10
--#: rc.cpp:953
-+#: rc.cpp:929
- #, no-c-format
- msgid "Port number"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 15
--#: rc.cpp:956
-+#: rc.cpp:932
- #, fuzzy, no-c-format
- msgid "forward Port"
- msgstr "轉接連接埠"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 20
--#: rc.cpp:959
-+#: rc.cpp:935
- #, no-c-format
- msgid "Session time to live"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 24
--#: rc.cpp:962
-+#: rc.cpp:938
- #, fuzzy, no-c-format
- msgid "interface skin"
- msgstr "一般選項"
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 28
--#: rc.cpp:965
-+#: rc.cpp:941
- #, no-c-format
- msgid "php executable path"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 33
--#: rc.cpp:968
-+#: rc.cpp:944
- #, no-c-format
- msgid "username"
- msgstr ""
- 
- #. i18n: file ./plugins/webinterface/ktwebinterfaceplugin.kcfg line 37
--#: rc.cpp:971
-+#: rc.cpp:947
- #, no-c-format
- msgid "password"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 16
--#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:974 rc.cpp:1046
-+#: plugins/infowidget/infowidgetplugin.cpp:194 rc.cpp:950 rc.cpp:1010
- #, no-c-format
- msgid "Chunks"
- msgstr "區塊"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 43
--#: rc.cpp:977
-+#: rc.cpp:953
- #, no-c-format
- msgid "Total:"
- msgstr "總計："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 81
--#: rc.cpp:981
-+#: rc.cpp:956
- #, no-c-format
- msgid "Currently downloading:"
- msgstr "目前下載："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 119
--#: rc.cpp:985
-+#: rc.cpp:959
- #, no-c-format
- msgid "Downloaded:"
- msgstr "已下載："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 157
--#: rc.cpp:989
-+#: rc.cpp:962
- #, no-c-format
- msgid "Excluded:"
- msgstr "已排除："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 195
--#: rc.cpp:993
-+#: rc.cpp:965
- #, no-c-format
- msgid "Left:"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 233
--#: rc.cpp:997
-+#: rc.cpp:968
- #, no-c-format
- msgid "Size:"
- msgstr "大小："
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 280
--#: rc.cpp:1001
-+#: rc.cpp:971
- #, no-c-format
- msgid "Chunk"
- msgstr "區塊"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 291
--#: rc.cpp:1004
-+#: rc.cpp:974
- #, no-c-format
- msgid "Progress"
- msgstr "進度"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 302
--#: rc.cpp:1007
-+#: rc.cpp:977
- #, no-c-format
- msgid "Peer"
- msgstr "端點"
- 
- #. i18n: file ./plugins/infowidget/chunkdownloadviewbase.ui line 324
--#: rc.cpp:1013
-+#: rc.cpp:983
- #, no-c-format
- msgid "Assigned Peers"
- msgstr "指定的端點"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 63
--#: rc.cpp:1022
-+#: rc.cpp:992
- #, no-c-format
- msgid "Seeders:"
- msgstr "傳送者："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 71
--#: rc.cpp:1025
-+#: rc.cpp:995
- #, no-c-format
- msgid "Leechers:"
- msgstr "接收者："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 129
--#: rc.cpp:1030
-+#: rc.cpp:998
- #, no-c-format
- msgid "Average Down Speed:"
- msgstr "平均下載速度："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 177
--#: rc.cpp:1035
-+#: rc.cpp:1001
- #, no-c-format
- msgid "Average Up Speed:"
- msgstr "平均上傳速度："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 195
--#: rc.cpp:1038 rc.cpp:1111
-+#: rc.cpp:1004 rc.cpp:1070
- #, no-c-format
- msgid "Next update in:"
- msgstr "下次更新時間："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 203
--#: rc.cpp:1041
-+#: rc.cpp:1007
- #, no-c-format
- msgid "Tracker Status:"
- msgstr "追蹤器狀態："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 332
--#: rc.cpp:1049
-+#: rc.cpp:1013
- #, no-c-format
- msgid "Parts of the torrent which have been downloaded:"
- msgstr "已下載的 torrent 部份："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 367
--#: rc.cpp:1052
-+#: rc.cpp:1016
- #, no-c-format
- msgid "Parts of the torrent which are available:"
- msgstr "可用的 torrent 部份："
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 457
--#: rc.cpp:1055
-+#: rc.cpp:1019
- #, no-c-format
- msgid "Sharing"
- msgstr "分享"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 487
--#: rc.cpp:1058
-+#: rc.cpp:1022
- #, no-c-format
- msgid ""
- "Your upload will stop when share ratio gets to this value. Zero means no limit."
- msgstr "您的上傳在分享比例大於此值時會停止。0 表示不限制。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 525
--#: rc.cpp:1064
-+#: rc.cpp:1028
- #, fuzzy, no-c-format
- msgid "Your upload will stop when you have uploaded for this many hours."
- msgstr "您的上傳在分享比例大於此值時會停止。0 表示不限制。"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 533
--#: rc.cpp:1067
-+#: rc.cpp:1031
- #, no-c-format
- msgid "Hours"
- msgstr ""
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 543
--#: rc.cpp:1070
-+#: rc.cpp:1034
- #, fuzzy, no-c-format
- msgid "Ratio limit:"
- msgstr "全域連線限制"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 549
--#: rc.cpp:1074
-+#: rc.cpp:1037
- #, no-c-format
- msgid "Limit works only in seed mode"
- msgstr "限制在 seed 模式下工作"
- 
- #. i18n: file ./plugins/infowidget/statustabbase.ui line 557
--#: rc.cpp:1077
-+#: rc.cpp:1040
- #, fuzzy, no-c-format
- msgid "Time &limit:"
- msgstr "要限制嗎？(&U)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 37
--#: rc.cpp:1081
-+#: rc.cpp:1043
- #, fuzzy, no-c-format
- msgid "&Update Tracker"
- msgstr "更新追蹤器(&A)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 40
--#: rc.cpp:1084
-+#: rc.cpp:1046
- #, no-c-format
- msgid "Minimum update interval - 60 seconds"
- msgstr "最小更新間隔─60 秒"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 48
--#: rc.cpp:1087
-+#: rc.cpp:1049
- #, fuzzy, no-c-format
- msgid "Add Trac&ker"
- msgstr "新增追蹤器(&R)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 64
--#: rc.cpp:1090
-+#: rc.cpp:1052
- #, no-c-format
- msgid "Remove Tracker"
- msgstr "移除追蹤器"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 75
--#: rc.cpp:1094
-+#: rc.cpp:1055
- #, fuzzy, no-c-format
- msgid "Ch&ange Tracker"
- msgstr "變更追蹤器(&N)"
- 
- #. i18n: file ./plugins/infowidget/trackerviewbase.ui line 100
--#: rc.cpp:1097
-+#: rc.cpp:1058
- #, no-c-format
- msgid "Restore Defaults"
- msgstr "還原預設值"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 10
--#: rc.cpp:1115
-+#: rc.cpp:1073
- #, no-c-format
- msgid "Show peer view tab in main window"
- msgstr "在主視窗顯示端點檢視表"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 14
--#: rc.cpp:1118
-+#: rc.cpp:1076
- #, no-c-format
- msgid "Show chunk download view tab in main window"
- msgstr "在主視窗顯示區塊檢視表"
- 
- #. i18n: file ./plugins/infowidget/ktinfowidgetplugin.kcfg line 18
--#: rc.cpp:1121
-+#: rc.cpp:1079
- #, no-c-format
- msgid "Show trackers view tab in main window"
- msgstr "在主視窗顯示追蹤器檢視表"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 24
--#: rc.cpp:1124
-+#: rc.cpp:1082
- #, no-c-format
- msgid "Show list of peers"
- msgstr "顯示端點清單"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 35
--#: rc.cpp:1128
-+#: rc.cpp:1085
- #, no-c-format
- msgid "Show list of chunks currentl&y downloading"
- msgstr "顯示目前下載的區塊清單(&Y)"
- 
- #. i18n: file ./plugins/infowidget/iwpref.ui line 60
--#: rc.cpp:1131
-+#: rc.cpp:1088
- #, no-c-format
- msgid "Show list of trackers"
- msgstr "顯示追蹤器清單"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 16
--#: rc.cpp:1135
-+#: rc.cpp:1091
- #, no-c-format
- msgid "IPBlocking Preferences"
- msgstr "IPBlocking 喜好設定"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 47
--#: rc.cpp:1138
-+#: rc.cpp:1094
- #, fuzzy, no-c-format
- msgid "Select PeerGuardian Filter File "
- msgstr "選擇 PeerGuardian 過濾器檔案"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 58
--#: rc.cpp:1141
-+#: rc.cpp:1097
- #, no-c-format
- msgid "Use PeerGuardian filter?"
- msgstr "要使用 PeerGuardian 過濾器嗎？"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 77
--#: rc.cpp:1145
-+#: rc.cpp:1100
- #, no-c-format
- msgid "IP filter file:"
- msgstr "IP 過濾器檔案："
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 85
--#: rc.cpp:1148
-+#: rc.cpp:1103
- #, no-c-format
- msgid "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- msgstr "http://www.bluetack.co.uk/modules.php?name=Downloads&d_op=getit&lid=8"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 123
--#: rc.cpp:1151
-+#: rc.cpp:1106
- #, no-c-format
- msgid "Dow&nload/Convert"
- msgstr "下載/轉換(&N)"
- 
- #. i18n: file ./plugins/ipfilter/ipblockingpref.ui line 134
--#: rc.cpp:1154
-+#: rc.cpp:1109
- #, no-c-format
- msgid ""
- "Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-@@ -2857,25 +2857,25 @@ msgstr ""
- "注意：支援從 bluetack.co.uk 下載 ZIP 檔。"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 10
--#: rc.cpp:1159
-+#: rc.cpp:1113
- #, no-c-format
- msgid "Level1 filter url"
- msgstr "第一級過濾器網址"
- 
- #. i18n: file ./plugins/ipfilter/ktipfilterplugin.kcfg line 14
--#: rc.cpp:1162
-+#: rc.cpp:1116
- #, no-c-format
- msgid "Use level1 filter?"
- msgstr "要使用第一級過濾器嗎？"
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 24
--#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1165
-+#: plugins/ipfilter/convertdialog.cpp:155 rc.cpp:1119
- #, no-c-format
- msgid "Converting..."
- msgstr "轉換中..."
- 
- #. i18n: file ./plugins/ipfilter/convert_dlg.ui line 41
--#: rc.cpp:1168
-+#: rc.cpp:1122
- #, fuzzy, no-c-format
- msgid ""
- "Click on the 'convert' button to start converting antip2p file. NOTE: This "
-@@ -2884,61 +2884,61 @@ msgid ""
- msgstr "按下「轉換」鍵開始轉換 antip2p 檔。注意：即使在快的機器上，這個過程可能也要一陣子，而這段時間您將無法使用 KTorrent。"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 27
--#: rc.cpp:1179
-+#: rc.cpp:1131
- #, no-c-format
- msgid "Update"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 46
--#: rc.cpp:1182 rc.cpp:1268
-+#: rc.cpp:1134 rc.cpp:1220
- #, no-c-format
- msgid "Update charts every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 71
--#: rc.cpp:1185
-+#: rc.cpp:1137
- #, fuzzy, no-c-format
- msgid "GUI updates"
- msgstr "GUI 更新間隔"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 92
--#: rc.cpp:1188 rc.cpp:1271
-+#: rc.cpp:1140 rc.cpp:1223
- #, no-c-format
- msgid "Gather data every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 120
--#: rc.cpp:1191
-+#: rc.cpp:1143
- #, no-c-format
- msgid "miliseconds"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 135
--#: rc.cpp:1194
-+#: rc.cpp:1146
- #, fuzzy, no-c-format
- msgid "Maximum"
- msgstr "最大 seed 數："
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 154
--#: rc.cpp:1197
-+#: rc.cpp:1149
- #, fuzzy, no-c-format
- msgid "Maximum speed scale mode:"
- msgstr "最大 seed 數："
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 165
--#: rc.cpp:1203
-+#: rc.cpp:1155
- #, no-c-format
- msgid "Exact"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 175
--#: rc.cpp:1206
-+#: rc.cpp:1158
- #, no-c-format
- msgid "See 'What's this' for more help"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 180
--#: rc.cpp:1209
-+#: rc.cpp:1161
- #, no-c-format
- msgid ""
- "Set maximum value on OY scale as:\n"
-@@ -2947,847 +2947,847 @@ msgid ""
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 192
--#: rc.cpp:1214 rc.cpp:1247
-+#: rc.cpp:1166 rc.cpp:1199
- #, fuzzy, no-c-format
- msgid "Peers speed"
- msgstr "端點"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 211
--#: rc.cpp:1217
-+#: rc.cpp:1169
- #, fuzzy, no-c-format
- msgid "Peers speed:"
- msgstr "端點"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 222
--#: rc.cpp:1220
-+#: rc.cpp:1172
- #, no-c-format
- msgid "update every"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 244
--#: rc.cpp:1223
-+#: rc.cpp:1175
- #, no-c-format
- msgid "chart data updates"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 254
--#: rc.cpp:1226
-+#: rc.cpp:1178
- #, no-c-format
- msgid "Gathering data about many connected peers can be CPU consuming."
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 267
--#: rc.cpp:1229
-+#: rc.cpp:1181
- #, fuzzy, no-c-format
- msgid "Peers connections"
- msgstr "連線："
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 270
--#: rc.cpp:1232
-+#: rc.cpp:1184
- #, no-c-format
- msgid "Large values can obscure charts of connected peers"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 289
--#: rc.cpp:1235
-+#: rc.cpp:1187
- #, fuzzy, no-c-format
- msgid "Show seeders in swarms"
- msgstr "顯示系統匣圖示(&Y)"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 297
--#: rc.cpp:1238
-+#: rc.cpp:1190
- #, no-c-format
- msgid "Show leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 309
--#: rc.cpp:1241
-+#: rc.cpp:1193
- #, no-c-format
- msgid "Measurements count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 392
--#: rc.cpp:1250 rc.cpp:1265
-+#: rc.cpp:1202 rc.cpp:1217
- #, fuzzy, no-c-format
- msgid "Upload"
- msgstr "上傳"
- 
- #. i18n: file ./plugins/stats/sprefwgt.ui line 424
--#: rc.cpp:1253
-+#: rc.cpp:1205
- #, fuzzy, no-c-format
- msgid "Connections"
- msgstr "連線："
- 
- #. i18n: file ./plugins/stats/statsspdwgt.ui line 40
--#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1262 rc.cpp:1304
-+#: plugins/infowidget/infowidgetplugin.cpp:173 rc.cpp:1214 rc.cpp:1256
- #, no-c-format
- msgid "Peers"
- msgstr "端點"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 18
--#: rc.cpp:1274
-+#: rc.cpp:1226
- #, no-c-format
- msgid "Toggle peers speed charts"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 22
--#: rc.cpp:1277
-+#: rc.cpp:1229
- #, no-c-format
- msgid "Interval between getting data about peers speed"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 26
--#: rc.cpp:1280
-+#: rc.cpp:1232
- #, no-c-format
- msgid "Toggle drawing of leechers in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 30
--#: rc.cpp:1283
-+#: rc.cpp:1235
- #, no-c-format
- msgid "Toggle drawing of seeders in swarms"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 35
--#: rc.cpp:1286
-+#: rc.cpp:1238
- #, fuzzy, no-c-format
- msgid "Download mesurments count"
- msgstr "下載 torrent"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 39
--#: rc.cpp:1289
-+#: rc.cpp:1241
- #, no-c-format
- msgid "Peers speed mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 43
--#: rc.cpp:1292
-+#: rc.cpp:1244
- #, no-c-format
- msgid "Upload mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 47
--#: rc.cpp:1295
-+#: rc.cpp:1247
- #, fuzzy, no-c-format
- msgid "Connections mesurments count"
- msgstr "連線訊息旗標"
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 51
--#: rc.cpp:1298
-+#: rc.cpp:1250
- #, no-c-format
- msgid "DHT mesurments count"
- msgstr ""
- 
- #. i18n: file ./plugins/stats/ktstatsplugin.kcfg line 56
--#: rc.cpp:1301
-+#: rc.cpp:1253
- #, no-c-format
- msgid "OY axis max mode"
- msgstr ""
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 16
--#: rc.cpp:1310
-+#: rc.cpp:1262
- #, no-c-format
- msgid "Import an existing download"
- msgstr "匯入已存在的下載"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 49
--#: rc.cpp:1313
-+#: rc.cpp:1265
- #, no-c-format
- msgid "Torrent:"
- msgstr "Torrent："
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 63
--#: rc.cpp:1316
-+#: rc.cpp:1268
- #, no-c-format
- msgid "Data:"
- msgstr "資料："
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 95
--#: rc.cpp:1319
-+#: rc.cpp:1271
- #, no-c-format
- msgid ""
- "Please specify the torrent and the data already downloaded for that torrent."
- msgstr "請指定 torrent 及該 torrent 已下載的資料。"
- 
- #. i18n: file ./plugins/partfileimport/importdlgbase.ui line 133
--#: rc.cpp:1322
-+#: rc.cpp:1274
- #, no-c-format
- msgid "&Import"
- msgstr "匯入(&I)"
- 
- #. i18n: file ./plugins/rssfeed/ktrssfeedplugin.kcfg line 10
--#: rc.cpp:1328
-+#: rc.cpp:1280
- #, fuzzy, no-c-format
- msgid "default"
- msgstr "新增預設(&L)"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 18
--#: rc.cpp:1331
-+#: rc.cpp:1283
- #, no-c-format
- msgid "Rss Feeds"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 36
--#: rc.cpp:1334
-+#: rc.cpp:1286
- #, fuzzy, no-c-format
- msgid "Feeds"
- msgstr "傳送者："
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 78
--#: rc.cpp:1337
-+#: rc.cpp:1289
- #, no-c-format
- msgid "De&lete"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 86
--#: rc.cpp:1340 rc.cpp:1382 rc.cpp:1392
-+#: rc.cpp:1292 rc.cpp:1331 rc.cpp:1340
- #, no-c-format
- msgid "&New"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 117
--#: rc.cpp:1343
-+#: rc.cpp:1295
- #, fuzzy, no-c-format
- msgid "&URL"
- msgstr "網址"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 139
--#: rc.cpp:1346
-+#: rc.cpp:1298
- #, no-c-format
- msgid "Articles"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 216
--#: rc.cpp:1353
-+#: rc.cpp:1304
- #, no-c-format
- msgid "Auto&refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 242
--#: rc.cpp:1356
-+#: rc.cpp:1307
- #, no-c-format
- msgid "I&gnore TTL"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 270
--#: rc.cpp:1359
-+#: rc.cpp:1310
- #, no-c-format
- msgid "Refresh"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 299
--#: rc.cpp:1363 rc.cpp:1395
-+#: rc.cpp:1313 rc.cpp:1343
- #, no-c-format
- msgid "&Title"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 323
--#: rc.cpp:1366
-+#: rc.cpp:1316
- #, no-c-format
- msgid "Keep Articles (days)"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 347
--#: rc.cpp:1369 rc.cpp:1398
-+#: rc.cpp:1319 rc.cpp:1346
- #, no-c-format
- msgid "&Active"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 362
--#: rc.cpp:1372
-+#: rc.cpp:1322
- #, fuzzy, no-c-format
- msgid "Filters"
- msgstr "IP 過濾器"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 389
--#: rc.cpp:1375
-+#: rc.cpp:1325
- #, fuzzy, no-c-format
- msgid "Accept Filters"
- msgstr "所有檔案"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 440
--#: rc.cpp:1385
-+#: rc.cpp:1334
- #, no-c-format
- msgid "Reject Filters"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 557
--#: rc.cpp:1401
-+#: rc.cpp:1349
- #, no-c-format
- msgid "Regular Expressions"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 587
--#: rc.cpp:1404
-+#: rc.cpp:1352
- #, no-c-format
- msgid "Treat as &Series"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 624
--#: rc.cpp:1407
-+#: rc.cpp:1355
- #, fuzzy, no-c-format
- msgid "Process"
- msgstr "進度"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 643
--#: rc.cpp:1411
-+#: rc.cpp:1358
- #, no-c-format
- msgid "Series Criteria"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 679
--#: rc.cpp:1414
-+#: rc.cpp:1361
- #, no-c-format
- msgid "Match Without Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 713
--#: rc.cpp:1418
-+#: rc.cpp:1364
- #, no-c-format
- msgid "Max Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 739
--#: rc.cpp:1421
-+#: rc.cpp:1367
- #, fuzzy, no-c-format
- msgid "Max Season"
- msgstr "最大比例："
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 758
--#: rc.cpp:1424
-+#: rc.cpp:1370
- #, no-c-format
- msgid "Min Season"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 782
--#: rc.cpp:1427
-+#: rc.cpp:1373
- #, no-c-format
- msgid "Min Episode"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 814
--#: rc.cpp:1430
-+#: rc.cpp:1376
- #, no-c-format
- msgid "Test te&xt"
- msgstr ""
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 840
--#: rc.cpp:1433
-+#: rc.cpp:1379
- #, fuzzy, no-c-format
- msgid "Te&st"
- msgstr "測試"
- 
- #. i18n: file ./plugins/rssfeed/rssfeedwidget.ui line 858
--#: rc.cpp:1436
-+#: rc.cpp:1382
- #, fuzzy, no-c-format
- msgid "Filter Matches"
- msgstr "資料夾 1 路徑"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 28
--#: rc.cpp:1447
-+#: rc.cpp:1391
- #, no-c-format
- msgid "Bandwidth scheduler"
- msgstr "頻寬排程器"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 50
--#: rc.cpp:1450
-+#: rc.cpp:1394
- #, no-c-format
- msgid "Left click category"
- msgstr "左邊點擊類別"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 61
--#: rc.cpp:1453
-+#: rc.cpp:1397
- #, no-c-format
- msgid "Categor&y 1"
- msgstr "類別 1(&Y)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 157
--#: rc.cpp:1456 rc.cpp:1483
-+#: rc.cpp:1400 rc.cpp:1427
- #, no-c-format
- msgid "T&urn off"
- msgstr "關閉(&U)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 165
--#: rc.cpp:1459 rc.cpp:1486
-+#: rc.cpp:1403 rc.cpp:1430
- #, no-c-format
- msgid "&Normal"
- msgstr "一般(&N)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 195
--#: rc.cpp:1462
-+#: rc.cpp:1406
- #, no-c-format
- msgid "Category &3"
- msgstr "類別 3(&3)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 206
--#: rc.cpp:1468 rc.cpp:1492
-+#: rc.cpp:1412 rc.cpp:1436
- #, no-c-format
- msgid "Category &2"
- msgstr "類別 2(&2)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 219
--#: rc.cpp:1474
-+#: rc.cpp:1418
- #, no-c-format
- msgid "Right click category"
- msgstr "右邊點擊類別"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 230
--#: rc.cpp:1477
-+#: rc.cpp:1421
- #, no-c-format
- msgid "Category &1"
- msgstr "類別 1(&1)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 367
--#: rc.cpp:1489
-+#: rc.cpp:1433
- #, no-c-format
- msgid "&Category 3"
- msgstr "類別 3(&C)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 390
--#: rc.cpp:1498
-+#: rc.cpp:1442
- #, no-c-format
- msgid "Categories"
- msgstr "類別"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 401
--#: rc.cpp:1501
-+#: rc.cpp:1445
- #, no-c-format
- msgid "<b>1. Category</b>"
- msgstr "<b>1. 類別</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 409
--#: rc.cpp:1504
-+#: rc.cpp:1448
- #, no-c-format
- msgid "<b>3. Category</b>"
- msgstr "<b>3. 類別</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 425
--#: rc.cpp:1507 rc.cpp:1516 rc.cpp:1525
-+#: rc.cpp:1451 rc.cpp:1460 rc.cpp:1469
- #, no-c-format
- msgid "download:"
- msgstr "下載："
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 441
--#: rc.cpp:1510 rc.cpp:1519 rc.cpp:1528
-+#: rc.cpp:1454 rc.cpp:1463 rc.cpp:1472
- #, no-c-format
- msgid "upload:"
- msgstr "上傳："
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 457
--#: rc.cpp:1513 rc.cpp:1522 rc.cpp:1531
-+#: rc.cpp:1457 rc.cpp:1466 rc.cpp:1475
- #, no-c-format
- msgid "KB/s *"
- msgstr "KB/秒 *"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 567
--#: rc.cpp:1534
-+#: rc.cpp:1478
- #, no-c-format
- msgid "<b>2. Category</b>"
- msgstr "<b>2. 類別</b>"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 626
--#: rc.cpp:1538
-+#: rc.cpp:1481
- #, no-c-format
- msgid "* zero means no limit"
- msgstr "* 0 表示不限制"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 672
--#: rc.cpp:1541
-+#: rc.cpp:1484
- #, no-c-format
- msgid "Save to file"
- msgstr "儲存至檔案"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 680
--#: rc.cpp:1544
-+#: rc.cpp:1487
- #, no-c-format
- msgid "&Load from file"
- msgstr "從檔案載入(&L)"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 688
--#: rc.cpp:1547
-+#: rc.cpp:1490
- #, no-c-format
- msgid "Reset schedule"
- msgstr "重設排程"
- 
- #. i18n: file ./plugins/scheduler/bwspage.ui line 751
--#: rc.cpp:1550
-+#: rc.cpp:1493
- #, no-c-format
- msgid "O&k"
- msgstr "確定(&K)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 16
--#: rc.cpp:1559
-+#: rc.cpp:1502
- #, no-c-format
- msgid "Scheduler Plugin Pref Page"
- msgstr "排程外掛程式喜好設定"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 27
--#: rc.cpp:1562
-+#: rc.cpp:1505
- #, no-c-format
- msgid "Use &bandwidth scheduler?"
- msgstr "要使用頻寬排程器嗎？(&B)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 35
--#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1565
-+#: plugins/scheduler/schedulerplugin.cpp:59 rc.cpp:1508
- #, no-c-format
- msgid "Bandwidth Scheduler"
- msgstr "頻寬排程器"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 46
--#: rc.cpp:1568
-+#: rc.cpp:1511
- #, no-c-format
- msgid "Use colors instead of pi&xmaps?"
- msgstr "要使用顏色取代像素圖嗎？(&X)"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 54
--#: rc.cpp:1571
-+#: rc.cpp:1514
- #, no-c-format
- msgid "(Recommended for slower systems)"
- msgstr "（在較慢的系統上建議使用）"
- 
- #. i18n: file ./plugins/scheduler/schedulerpage.ui line 62
--#: rc.cpp:1574
-+#: rc.cpp:1517
- #, no-c-format
- msgid "Edit s&chedule"
- msgstr "編輯排程(&C)"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 10
--#: rc.cpp:1577
-+#: rc.cpp:1520
- #, no-c-format
- msgid "Enable bandwidth scheduler?"
- msgstr "要開啟頻寬排程器嗎？"
- 
- #. i18n: file ./plugins/scheduler/ktschedulerplugin.kcfg line 14
--#: rc.cpp:1580
-+#: rc.cpp:1523
- #, no-c-format
- msgid "Use colors instead of pixmaps?"
- msgstr "要使用顏色取代像素圖嗎？"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 10
--#: rc.cpp:1583
-+#: rc.cpp:1526
- #, no-c-format
- msgid "Use rich log text"
- msgstr "使用 rich text 紀錄"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 15
--#: rc.cpp:1586
-+#: rc.cpp:1529
- #, no-c-format
- msgid "General info messages flag"
- msgstr "一般資訊訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 19
--#: rc.cpp:1589
-+#: rc.cpp:1532
- #, no-c-format
- msgid "Connections messages flag"
- msgstr "連線訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 23
--#: rc.cpp:1592
-+#: rc.cpp:1535
- #, no-c-format
- msgid "DHT messages flag"
- msgstr "DHT 訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 27
--#: rc.cpp:1595
-+#: rc.cpp:1538
- #, no-c-format
- msgid "Tracker info messages flag"
- msgstr "追蹤器訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 31
--#: rc.cpp:1598
-+#: rc.cpp:1541
- #, no-c-format
- msgid "Disk IO info messages flag"
- msgstr "磁碟 IO 資訊訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 35
--#: rc.cpp:1601
-+#: rc.cpp:1544
- #, no-c-format
- msgid "IPFilter plugin messages flag"
- msgstr "IP 過濾器外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 39
--#: rc.cpp:1604
-+#: rc.cpp:1547
- #, no-c-format
- msgid "Search plugin messages flag"
- msgstr "搜尋外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 43
--#: rc.cpp:1607
-+#: rc.cpp:1550
- #, no-c-format
- msgid "PartFileImport plugin messages flag"
- msgstr "PartFileImport 外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 47
--#: rc.cpp:1610
-+#: rc.cpp:1553
- #, no-c-format
- msgid "InfoWidget plugin messages flag"
- msgstr "資訊元件外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 51
--#: rc.cpp:1613
-+#: rc.cpp:1556
- #, no-c-format
- msgid "UPnP plugin messages flag"
- msgstr "UPnp 外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 55
--#: rc.cpp:1616
-+#: rc.cpp:1559
- #, no-c-format
- msgid "ScanFolder plugin messages flag"
- msgstr "掃描資料夾外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 59
--#: rc.cpp:1619
-+#: rc.cpp:1562
- #, no-c-format
- msgid "Scheduler plugin messages flag"
- msgstr "排程器外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 63
--#: rc.cpp:1622
-+#: rc.cpp:1565
- #, fuzzy, no-c-format
- msgid "RSS plugin messages flag"
- msgstr "搜尋外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/ktlogviewerplugin.kcfg line 67
--#: rc.cpp:1625
-+#: rc.cpp:1568
- #, fuzzy, no-c-format
- msgid "WebInterface plugin messages flag"
- msgstr "IP 過濾器外掛程式訊息旗標"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 16
--#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1628
-+#: plugins/logviewer/logprefpage.cpp:31 rc.cpp:1571
- #, no-c-format
- msgid "LogViewer Options"
- msgstr "紀錄顯示器選項"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 44
--#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1631
-+#: libktorrent/pluginmanagerprefpage.cpp:63 rc.cpp:1574
- #, no-c-format
- msgid "Plugins"
- msgstr "外掛程式"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 53
--#: rc.cpp:1634 rc.cpp:1652 rc.cpp:1670 rc.cpp:1691 rc.cpp:1706 rc.cpp:1724
--#: rc.cpp:1745 rc.cpp:1763 rc.cpp:1778 rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
--#: rc.cpp:1859 rc.cpp:1874
-+#: rc.cpp:1577 rc.cpp:1595 rc.cpp:1613 rc.cpp:1634 rc.cpp:1649 rc.cpp:1667
-+#: rc.cpp:1688 rc.cpp:1706 rc.cpp:1721 rc.cpp:1754 rc.cpp:1769 rc.cpp:1784
-+#: rc.cpp:1802 rc.cpp:1817
- #, no-c-format
- msgid "All"
- msgstr "全部"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 58
--#: rc.cpp:1637 rc.cpp:1655 rc.cpp:1673 rc.cpp:1694 rc.cpp:1709 rc.cpp:1727
--#: rc.cpp:1748 rc.cpp:1766 rc.cpp:1781 rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
--#: rc.cpp:1862 rc.cpp:1877
-+#: rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1637 rc.cpp:1652 rc.cpp:1670
-+#: rc.cpp:1691 rc.cpp:1709 rc.cpp:1724 rc.cpp:1757 rc.cpp:1772 rc.cpp:1787
-+#: rc.cpp:1805 rc.cpp:1820
- #, no-c-format
- msgid "Debug"
- msgstr "除錯"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 63
--#: rc.cpp:1640 rc.cpp:1658 rc.cpp:1676 rc.cpp:1697 rc.cpp:1712 rc.cpp:1730
--#: rc.cpp:1751 rc.cpp:1769 rc.cpp:1784 rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
--#: rc.cpp:1865 rc.cpp:1880
-+#: rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1640 rc.cpp:1655 rc.cpp:1673
-+#: rc.cpp:1694 rc.cpp:1712 rc.cpp:1727 rc.cpp:1760 rc.cpp:1775 rc.cpp:1790
-+#: rc.cpp:1808 rc.cpp:1823
- #, no-c-format
- msgid "Notice"
- msgstr "注意"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 68
--#: rc.cpp:1643 rc.cpp:1661 rc.cpp:1679 rc.cpp:1700 rc.cpp:1715 rc.cpp:1733
--#: rc.cpp:1754 rc.cpp:1772 rc.cpp:1787 rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
--#: rc.cpp:1868 rc.cpp:1883
-+#: rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1643 rc.cpp:1658 rc.cpp:1676
-+#: rc.cpp:1697 rc.cpp:1715 rc.cpp:1730 rc.cpp:1763 rc.cpp:1778 rc.cpp:1793
-+#: rc.cpp:1811 rc.cpp:1826
- #, no-c-format
- msgid "Important"
- msgstr "重要"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 73
--#: rc.cpp:1646 rc.cpp:1664 rc.cpp:1682 rc.cpp:1703 rc.cpp:1718 rc.cpp:1736
--#: rc.cpp:1757 rc.cpp:1775 rc.cpp:1790 rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
--#: rc.cpp:1871 rc.cpp:1886
-+#: rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1646 rc.cpp:1661 rc.cpp:1679
-+#: rc.cpp:1700 rc.cpp:1718 rc.cpp:1733 rc.cpp:1766 rc.cpp:1781 rc.cpp:1796
-+#: rc.cpp:1814 rc.cpp:1829
- #, no-c-format
- msgid "None"
- msgstr "無"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 85
--#: rc.cpp:1649
-+#: rc.cpp:1592
- #, no-c-format
- msgid "IPFilter:"
- msgstr "IP 過濾器："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 126
--#: rc.cpp:1667
-+#: rc.cpp:1610
- #, no-c-format
- msgid "Search:"
- msgstr "搜尋："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 167
--#: rc.cpp:1685
-+#: rc.cpp:1628
- #, no-c-format
- msgid "UPnP:"
- msgstr "UPnP："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 178
--#: rc.cpp:1688
-+#: rc.cpp:1631
- #, no-c-format
- msgid "ScanFolder:"
- msgstr "掃描資料夾："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 249
--#: rc.cpp:1721
-+#: rc.cpp:1664
- #, no-c-format
- msgid "Scheduler:"
- msgstr "排程器："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 290
--#: rc.cpp:1739
-+#: rc.cpp:1682
- #, no-c-format
- msgid "PartFileImport:"
- msgstr "PartFileImport："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 301
--#: rc.cpp:1742
-+#: rc.cpp:1685
- #, no-c-format
- msgid "InfoWidget:"
- msgstr "資訊元件："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 342
--#: rc.cpp:1760
-+#: rc.cpp:1703
- #, no-c-format
- msgid "RSS plugin:"
- msgstr ""
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 413
--#: rc.cpp:1793
-+#: rc.cpp:1736
- #, fuzzy, no-c-format
- msgid "WebInterface plugin:"
- msgstr "一般選項"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 426
--#: rc.cpp:1796
-+#: rc.cpp:1739
- #, no-c-format
- msgid "System"
- msgstr "系統"
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 437
--#: rc.cpp:1799
-+#: rc.cpp:1742
- #, no-c-format
- msgid "General:"
- msgstr "一般："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 445
--#: rc.cpp:1802
-+#: rc.cpp:1745
- #, no-c-format
- msgid "Connections:"
- msgstr "連線："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 559
--#: rc.cpp:1856
-+#: rc.cpp:1799
- #, no-c-format
- msgid "Disk I/O:"
- msgstr "磁碟 I/O："
- 
- #. i18n: file ./plugins/logviewer/logprefwidgetbase.ui line 640
--#: rc.cpp:1892
-+#: rc.cpp:1835
- #, no-c-format
- msgid "Use rich te&xt for log"
- msgstr "使用 rich text 來紀錄(&X)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 41
--#: rc.cpp:1898
-+#: rc.cpp:1841
- #, no-c-format
- msgid "External Browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 52
--#: rc.cpp:1901
-+#: rc.cpp:1844
- #, no-c-format
- msgid "Open searches in external browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 60
--#: rc.cpp:1904 rc.cpp:1955
-+#: rc.cpp:1847 rc.cpp:1892
- #, no-c-format
- msgid "Use default browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/searchpref.ui line 79
--#: rc.cpp:1908
-+#: rc.cpp:1850
- #, fuzzy, no-c-format
- msgid "Custom browser path:"
- msgstr "自訂 IP"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 116
--#: rc.cpp:1912
-+#: rc.cpp:1853
- #, no-c-format
- msgid "Search Engines"
- msgstr "搜尋引擎"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 143
--#: rc.cpp:1916
-+#: rc.cpp:1856
- #, no-c-format
- msgid "Search engine name:"
- msgstr "搜尋引擎名稱："
- 
- #. i18n: file ./plugins/search/searchpref.ui line 187
--#: rc.cpp:1922
-+#: rc.cpp:1862
- #, no-c-format
- msgid "&Add"
- msgstr "新增(&A)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 195
--#: rc.cpp:1925
-+#: rc.cpp:1865
- #, no-c-format
- msgid "Engines"
- msgstr "引擎"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 206
--#: rc.cpp:1928
-+#: rc.cpp:1868
- #, no-c-format
- msgid "URL"
- msgstr "網址"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 257
--#: rc.cpp:1934
-+#: rc.cpp:1874
- #, no-c-format
- msgid "R&emove All"
- msgstr "全部移除(&E)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 282
--#: rc.cpp:1937
-+#: rc.cpp:1877
- #, no-c-format
- msgid "Add Defau&lt"
- msgstr "新增預設(&L)"
- 
- #. i18n: file ./plugins/search/searchpref.ui line 290
--#: rc.cpp:1940
-+#: rc.cpp:1880
- #, fuzzy, no-c-format
- msgid "Update From Internet"
- msgstr "從網際網路更新"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 53
- #: plugins/search/searchplugin.cpp:50 plugins/search/searchtab.cpp:48
--#: rc.cpp:1946
-+#: rc.cpp:1883
- #, no-c-format
- msgid "Search"
- msgstr "搜尋"
- 
- #. i18n: file ./plugins/search/searchbar.ui line 78
--#: rc.cpp:1949
-+#: rc.cpp:1886
- #, no-c-format
- msgid "Search engine:"
- msgstr "搜尋引擎："
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 10
--#: rc.cpp:1952
-+#: rc.cpp:1889
- #, no-c-format
- msgid "Current search engine"
- msgstr "目前的搜尋引擎"
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 19
--#: rc.cpp:1958
-+#: rc.cpp:1895
- #, no-c-format
- msgid "Use custom browser"
- msgstr ""
- 
- #. i18n: file ./plugins/search/ktsearchplugin.kcfg line 23
--#: rc.cpp:1961
-+#: rc.cpp:1898
- #, no-c-format
- msgid "Custom browser executable path"
- msgstr ""
-@@ -4068,34 +4068,34 @@ msgstr "檢查資料中"
- msgid "Stopped. No space left on device."
- msgstr ""
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy
- msgid ""
- "You don't have enough disk space to download this torrent. Are you sure you "
- "want to continue?"
- msgstr "若是您取消選擇檔案。您將失去所有檔案中的資料。您確定要這樣做嗎？"
- 
--#: libktorrent/torrent/queuemanager.cpp:135
-+#: libktorrent/torrent/queuemanager.cpp:136
- #, fuzzy, c-format
- msgid "Insufficient disk space for %1"
- msgstr "配置磁碟空間"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid ""
- "Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start "
- "seeding anyway?"
- msgstr "Torrent %1 已達到最大分享比例。要忽略此限制並開始傳送嗎？"
- 
--#: libktorrent/torrent/queuemanager.cpp:157
-+#: libktorrent/torrent/queuemanager.cpp:158
- msgid "Maximum share ratio limit reached."
- msgstr "已達到最大分享比例限制。"
- 
--#: libktorrent/torrent/queuemanager.cpp:236
--#: libktorrent/torrent/queuemanager.cpp:760
-+#: libktorrent/torrent/queuemanager.cpp:237
-+#: libktorrent/torrent/queuemanager.cpp:763
- msgid "Error stopping torrent %1 : %2"
- msgstr "停止 torrent %1 時發生錯誤：%2"
- 
--#: libktorrent/torrent/queuemanager.cpp:742
-+#: libktorrent/torrent/queuemanager.cpp:745
- msgid "Error starting torrent %1 : %2"
- msgstr "啟動 torrent %1 時發生錯誤：%2"
- 
diff --git a/redhat/applications/ktorrent/bp007-355c6b69.diff b/redhat/applications/ktorrent/bp007-355c6b69.diff
deleted file mode 100644
index dd4d76143..000000000
--- a/redhat/applications/ktorrent/bp007-355c6b69.diff
+++ /dev/null
@@ -1,122 +0,0 @@
-commit 355c6b69c69b0bc8cf10b7a3c846b5d6ca27abc4
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1332640454 -0500
-
-    Change default configuration to use external geoip database when found and
-    use internal database only when external database is not found.
-    This resolves bug report 443.
-
-diff --git a/configure.in b/configure.in
-index 31a7116..fc4482e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -191,7 +191,7 @@ AC_ARG_ENABLE(geoip,
-      esac],[geoip=true])
- 
- AC_ARG_ENABLE(system-geoip,
--    [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (no by default)])],
-+    [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])],
-     [case "${enableval}" in
-         yes) if test "$have_system_geoip" = yes; then
-                 system_geoip=true
-@@ -199,9 +199,18 @@ AC_ARG_ENABLE(system-geoip,
-              else
-                 AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system)
-              fi ;;
--        no) system_geoip=true ;;
-+        no) system_geoip=false ;;
-         *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;;
--    esac],[system_geoip=false])
-+    esac],[system_geoip=auto])
-+
-+if test x$system_geoip = xauto; then
-+    if test "$have_system_geoip" = yes; then
-+        system_geoip=true
-+        geoip=false
-+    else
-+        system_geoip=false
-+    fi
-+fi
- 
- AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue)
- AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue)
-@@ -212,12 +221,20 @@ fi
- 
- 
- AC_ARG_ENABLE(builtin-country-flags,
--    [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (yes by default)])],
-+    [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])],
-     [case "${enableval}" in
-         yes) builtin_country_flags=true ;;
-         no) builtin_country_flags=false ;;
-         *) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;;
--    esac],[builtin_country_flags=true])
-+    esac],[builtin_country_flags=auto])
-+
-+if test x$builtin_country_flags = xauto; then
-+    if test x$geoip = xtrue; then
-+        builtin_country_flags=true
-+    else
-+        builtin_country_flags=false
-+    fi
-+fi
- 
- AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue)
- 
-diff --git a/configure.in.in b/configure.in.in
-index fae7ea7..438fff9 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -126,7 +126,7 @@ AC_ARG_ENABLE(geoip,
-      esac],[geoip=true])
- 
- AC_ARG_ENABLE(system-geoip,
--    [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (no by default)])],
-+    [AS_HELP_STRING(--enable-system-geoip,[Enables use of system-wide GeoIP database (implies --disable-geoip) (auto by default)])],
-     [case "${enableval}" in
-         yes) if test "$have_system_geoip" = yes; then
-                 system_geoip=true
-@@ -134,9 +134,18 @@ AC_ARG_ENABLE(system-geoip,
-              else
-                 AC_MSG_ERROR(cannot enable system geoip. GeoIP library headers were not found on your system)
-              fi ;;
--        no) system_geoip=true ;;
-+        no) system_geoip=false ;;
-         *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-geoip) ;;
--    esac],[system_geoip=false])
-+    esac],[system_geoip=auto])
-+
-+if test x$system_geoip = xauto; then
-+    if test "$have_system_geoip" = yes; then
-+        system_geoip=true
-+        geoip=false
-+    else
-+        system_geoip=false
-+    fi
-+fi
- 
- AM_CONDITIONAL(ENABLE_GEOIP, test x$geoip = xtrue)
- AM_CONDITIONAL(USE_SYSTEM_GEOIP, test x$system_geoip = xtrue)
-@@ -147,12 +156,20 @@ fi
- 
- 
- AC_ARG_ENABLE(builtin-country-flags,
--    [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (yes by default)])],
-+    [AS_HELP_STRING(--enable-builtin-country-flags,[Install and prefer builtin country flags to the ones provided by KDE (auto by default)])],
-     [case "${enableval}" in
-         yes) builtin_country_flags=true ;;
-         no) builtin_country_flags=false ;;
-         *) AC_MSG_ERROR(bad value ${enableval} for --enable-builtin-country-flags) ;;
--    esac],[builtin_country_flags=true])
-+    esac],[builtin_country_flags=auto])
-+
-+if test x$builtin_country_flags = xauto; then
-+    if test x$geoip = xtrue; then
-+        builtin_country_flags=true
-+    else
-+        builtin_country_flags=false
-+    fi
-+fi
- 
- AM_CONDITIONAL(ENABLE_BUILTIN_COUNTRY_FLAGS, test x$builtin_country_flags = xtrue)
- 
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13-5dcbbbba-partial.diff b/redhat/applications/ktorrent/ktorrent-3.5.13-5dcbbbba-partial.diff
deleted file mode 100644
index a972cea72..000000000
--- a/redhat/applications/ktorrent/ktorrent-3.5.13-5dcbbbba-partial.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/translations/ca/messages/ktorrent.po b/translations/ca/messages/ktorrent.po
-index b3a124b..7cd624f 100644
---- a/translations/ca/messages/ktorrent.po
-+++ b/translations/ca/messages/ktorrent.po
-@@ -10,7 +10,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2008-02-09 15:12+0100\n"
- "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
--"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
-+"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/de/messages/ktorrent.po b/translations/de/messages/ktorrent.po
-index 27a65ed..861e491 100644
---- a/translations/de/messages/ktorrent.po
-+++ b/translations/de/messages/ktorrent.po
-@@ -13,7 +13,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-11-11 13:57+0100\n"
- "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
--"Language-Team: Deutsch <kde-i18n-de@lists.kde.org>\n"
-+"Language-Team: Deutsch <tde-i18n-de@lists.kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/fa/messages/ktorrent.po b/translations/fa/messages/ktorrent.po
-index f1c4096..f03da1d 100644
---- a/translations/fa/messages/ktorrent.po
-+++ b/translations/fa/messages/ktorrent.po
-@@ -8,7 +8,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-01-15 14:30+0330\n"
- "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
--"Language-Team: Persian <kde-i18n-fa@kde.org>\n"
-+"Language-Team: Persian <tde-i18n-fa@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/it/messages/ktorrent.po b/translations/it/messages/ktorrent.po
-index fda5204..d0f38ee 100644
---- a/translations/it/messages/ktorrent.po
-+++ b/translations/it/messages/ktorrent.po
-@@ -8,7 +8,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-07-09 15:09+0200\n"
- "Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
--"Language-Team: Italian <kde-i18n-it@kde.org>\n"
-+"Language-Team: Italian <tde-i18n-it@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/lt/messages/ktorrent.po b/translations/lt/messages/ktorrent.po
-index fa52745..499f9fc 100644
---- a/translations/lt/messages/ktorrent.po
-+++ b/translations/lt/messages/ktorrent.po
-@@ -7,7 +7,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-09-03 13:21+0300\n"
- "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
--"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
-+"Language-Team: Lithuanian <tde-i18n-lt@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/ms/messages/ktorrent.po b/translations/ms/messages/ktorrent.po
-index ac08726..5103563 100644
---- a/translations/ms/messages/ktorrent.po
-+++ b/translations/ms/messages/ktorrent.po
-@@ -7,7 +7,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-02-13 12:57+0730\n"
- "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
--"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
-+"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/nds/messages/ktorrent.po b/translations/nds/messages/ktorrent.po
-index 4b3463d..58c347e 100644
---- a/translations/nds/messages/ktorrent.po
-+++ b/translations/nds/messages/ktorrent.po
-@@ -8,7 +8,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-12-07 22:58+0100\n"
- "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
--"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
-+"Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/nl/messages/ktorrent.po b/translations/nl/messages/ktorrent.po
-index 91cafe5..4f53930 100644
---- a/translations/nl/messages/ktorrent.po
-+++ b/translations/nl/messages/ktorrent.po
-@@ -10,7 +10,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2008-03-10 13:43+0100\n"
- "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
--"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
-+"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/pt/messages/ktorrent.po b/translations/pt/messages/ktorrent.po
-index 7e123e8..7ab4997 100644
---- a/translations/pt/messages/ktorrent.po
-+++ b/translations/pt/messages/ktorrent.po
-@@ -4,7 +4,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-12-14 18:05+0000\n"
- "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
--"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
-+"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/pt_BR/messages/ktorrent.po b/translations/pt_BR/messages/ktorrent.po
-index 2eafd97..e60c28c 100644
---- a/translations/pt_BR/messages/ktorrent.po
-+++ b/translations/pt_BR/messages/ktorrent.po
-@@ -10,7 +10,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-08-10 20:52-0300\n"
- "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
--"Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n"
-+"Language-Team: Português do Brasil <tde-i18n-pt_br@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/sr/messages/ktorrent.po b/translations/sr/messages/ktorrent.po
-index c641e05..747f10a 100644
---- a/translations/sr/messages/ktorrent.po
-+++ b/translations/sr/messages/ktorrent.po
-@@ -9,7 +9,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2008-02-26 13:59+0100\n"
- "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
--"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
-+"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/translations/sr@Latn/messages/ktorrent.po b/translations/sr@Latn/messages/ktorrent.po
-index 488a470..d39cdc4 100644
---- a/translations/sr@Latn/messages/ktorrent.po
-+++ b/translations/sr@Latn/messages/ktorrent.po
-@@ -9,7 +9,7 @@ msgstr ""
- "POT-Creation-Date: 2008-04-18 19:40+0200\n"
- "PO-Revision-Date: 2007-07-24 15:03+0200\n"
- "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
--"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
-+"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch b/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ef85a74f8..000000000
--- a/redhat/applications/ktorrent/ktorrent-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ktorrent/libktorrent/Makefile.am.ORI	2012-08-06 11:11:35.700759480 +0200
-+++ ktorrent/libktorrent/Makefile.am	2012-08-06 11:11:44.437574091 +0200
-@@ -18,5 +18,5 @@
- libktorrent_la_LIBADD = ../libktorrent/net/libnet.la \
- 	../libktorrent/datachecker/libdatachecker.la ../libktorrent/mse/libmse.la ../libktorrent/migrate/libmigrate.la \
- 	../libktorrent/util/libutil.la ../libktorrent/torrent/libtorrent.la \
--	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_KPARTS)
-+	../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
- KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec
deleted file mode 100644
index 6bf9eff98..000000000
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-# Default version for this component
-%define kdecomp ktorrent
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	BitTorrent client for Trinity
-Version:	2.2.8
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://ktorrent.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KTorrent is a BitTorrent program for Trinity. Its features include speed capping
-(both down and up), integrated searching, UDP tracker support, preview of
-certain file types (video and audio) and integration into the KDE Panel
-enabling background downloading.
- 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libktorrent.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktcachecheck
-%{tde_bindir}/ktorrent
-%{tde_bindir}/ktshell
-%{tde_bindir}/kttorinfo
-%{tde_bindir}/ktupnptest
-%{tde_libdir}/libktorrent-%{version}.so
-%{tde_libdir}/libktorrent.la
-%{tde_tdelibdir}/ktinfowidgetplugin.la
-%{tde_tdelibdir}/ktinfowidgetplugin.so
-%{tde_tdelibdir}/ktipfilterplugin.la
-%{tde_tdelibdir}/ktipfilterplugin.so
-%{tde_tdelibdir}/ktlogviewerplugin.la
-%{tde_tdelibdir}/ktlogviewerplugin.so
-%{tde_tdelibdir}/ktpartfileimportplugin.la
-%{tde_tdelibdir}/ktpartfileimportplugin.so
-%{tde_tdelibdir}/ktrssfeedplugin.la
-%{tde_tdelibdir}/ktrssfeedplugin.so
-%{tde_tdelibdir}/ktscanfolderplugin.la
-%{tde_tdelibdir}/ktscanfolderplugin.so
-%{tde_tdelibdir}/ktschedulerplugin.la
-%{tde_tdelibdir}/ktschedulerplugin.so
-%{tde_tdelibdir}/ktsearchplugin.la
-%{tde_tdelibdir}/ktsearchplugin.so
-%{tde_tdelibdir}/ktstatsplugin.la
-%{tde_tdelibdir}/ktstatsplugin.so
-%{tde_tdelibdir}/ktupnpplugin.la
-%{tde_tdelibdir}/ktupnpplugin.so
-%{tde_tdelibdir}/ktwebinterfaceplugin.la
-%{tde_tdelibdir}/ktwebinterfaceplugin.so
-%{tde_tdeappdir}/ktorrent.desktop
-%{tde_datadir}/apps/ktorrent
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/ktorrentplugin.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1
-- Rename old tq methods that no longer need a unique name [Commit #a90eb215]
-- Remove additional unneeded tq method conversions [Commit #bb37c405]
-- Rename obsolete tq methods to standard names [Commit #0d48fca8]
-- Rename a few stragglers [Commit #c3480dfe]
-- Fix inadvertent "TQ" changes. [Commit #445a5152]
-- Fix configure output message to clarify that missing avahi support is caused by missing avahi-tqt package as well as avahi-client. [Commit #03d0c794]
-- Update ktorrent package to 2.2.8 and fix internal geoip database. [Bug #363] [Commit #5af9907f]
-- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
deleted file mode 100644
index 992ef2e1a..000000000
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-# Default version for this component
-%define tde_pkg ktorrent
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		BitTorrent client for Trinity
-Version:		2.2.8
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://ktorrent.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-
-%description
-KTorrent is a BitTorrent program for Trinity. Its features include speed capping
-(both down and up), integrated searching, UDP tracker support, preview of
-certain file types (video and audio) and integration into the TDE Panel
-enabling background downloading.
- 
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . "/etc/profile.d/qt3.sh"
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix="%{tde_prefix}" \
-  --exec-prefix="%{tde_prefix}" \
-  --bindir="%{tde_bindir}" \
-  --datadir="%{tde_datadir}" \
-  --libdir="%{tde_libdir}" \
-  --mandir="%{tde_mandir}" \
-  --includedir="%{tde_tdeincludedir}" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  %{?!with_avahi:--without-avahi}
-
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install DESTDIR="%{buildroot}"
-
-%find_lang %{tde_pkg}
-
-# Unwanted files
-%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so"
-
-
-%clean
-%__rm -rf "%{buildroot}"
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktcachecheck
-%{tde_bindir}/ktorrent
-%{tde_bindir}/ktshell
-%{tde_bindir}/kttorinfo
-%{tde_bindir}/ktupnptest
-%{tde_libdir}/libktorrent-%{version}.so
-%{tde_libdir}/libktorrent.la
-%{tde_tdelibdir}/ktinfowidgetplugin.la
-%{tde_tdelibdir}/ktinfowidgetplugin.so
-%{tde_tdelibdir}/ktipfilterplugin.la
-%{tde_tdelibdir}/ktipfilterplugin.so
-%{tde_tdelibdir}/ktlogviewerplugin.la
-%{tde_tdelibdir}/ktlogviewerplugin.so
-%{tde_tdelibdir}/ktpartfileimportplugin.la
-%{tde_tdelibdir}/ktpartfileimportplugin.so
-%{tde_tdelibdir}/ktrssfeedplugin.la
-%{tde_tdelibdir}/ktrssfeedplugin.so
-%{tde_tdelibdir}/ktscanfolderplugin.la
-%{tde_tdelibdir}/ktscanfolderplugin.so
-%{tde_tdelibdir}/ktschedulerplugin.la
-%{tde_tdelibdir}/ktschedulerplugin.so
-%{tde_tdelibdir}/ktsearchplugin.la
-%{tde_tdelibdir}/ktsearchplugin.so
-%{tde_tdelibdir}/ktstatsplugin.la
-%{tde_tdelibdir}/ktstatsplugin.so
-%{tde_tdelibdir}/ktupnpplugin.la
-%{tde_tdelibdir}/ktupnpplugin.so
-%{tde_tdelibdir}/ktwebinterfaceplugin.la
-%{tde_tdelibdir}/ktwebinterfaceplugin.so
-%{tde_tdeappdir}/ktorrent.desktop
-%{tde_datadir}/apps/ktorrent
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/ktorrentplugin.desktop
-
-%if 0%{?with_avahi}
-%{tde_tdelibdir}/ktzeroconfplugin.la
-%{tde_tdelibdir}/ktzeroconfplugin.so
-%endif
-
-
-%changelog
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.spec
deleted file mode 100644
index 71908a999..000000000
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.spec
+++ /dev/null
@@ -1,204 +0,0 @@
-# Default version for this component
-%define kdecomp ktorrent
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	BitTorrent client for Trinity
-Version:	2.2.8
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://ktorrent.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [ktorrent] Rename old tq methods that no longer need a unique name [Commit #a90eb215]
-Patch0:		bp000-a90eb215.diff
-# [ktorrent] Remove additional unneeded tq method conversions [Commit #bb37c405]
-Patch1:		bp001-bb37c405.diff
-# [ktorrent] Rename obsolete tq methods to standard names [Commit #0d48fca8]
-Patch2:		bp002-0d48fca8.diff
-# [ktorrent] Rename a few stragglers [Commit #c3480dfe]
-Patch3:		bp003-c3480dfe.diff
-# [ktorrent] Fix inadvertent "TQ" changes. [Commit #445a5152]
-Patch4:		bp004-445a5152.diff
-# [ktorrent] Fix configure output message to clarify that missing avahi support is caused by missing avahi-tqt package as well as avahi-client. [Commit #03d0c794]
-Patch5:		bp005-03d0c794.diff
-# [ktorrent] Additional renaming of kde to tde
-Patch6:		ktorrent-3.5.13-5dcbbbba-partial.diff
-# [ktorrent] Update ktorrent package to 2.2.8 and fix internal geoip database. [Bug #363] [Commit #5af9907f]
-Patch7:		bp006-5af9907f.diff
-# [ktorrent] Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
-Patch8:		bp007-355c6b69.diff
-# [ktorrent] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch9:		ktorrent-3.5.13-missing_ldflags.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-KTorrent is a BitTorrent program for Trinity. Its features include speed capping
-(both down and up), integrated searching, UDP tracker support, preview of
-certain file types (video and audio) and integration into the KDE Panel
-enabling background downloading.
- 
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libktorrent.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktcachecheck
-%{tde_bindir}/ktorrent
-%{tde_bindir}/ktshell
-%{tde_bindir}/kttorinfo
-%{tde_bindir}/ktupnptest
-%{tde_libdir}/libktorrent-%{version}.so
-%{tde_libdir}/libktorrent.la
-%{tde_tdelibdir}/ktinfowidgetplugin.la
-%{tde_tdelibdir}/ktinfowidgetplugin.so
-%{tde_tdelibdir}/ktipfilterplugin.la
-%{tde_tdelibdir}/ktipfilterplugin.so
-%{tde_tdelibdir}/ktlogviewerplugin.la
-%{tde_tdelibdir}/ktlogviewerplugin.so
-%{tde_tdelibdir}/ktpartfileimportplugin.la
-%{tde_tdelibdir}/ktpartfileimportplugin.so
-%{tde_tdelibdir}/ktrssfeedplugin.la
-%{tde_tdelibdir}/ktrssfeedplugin.so
-%{tde_tdelibdir}/ktscanfolderplugin.la
-%{tde_tdelibdir}/ktscanfolderplugin.so
-%{tde_tdelibdir}/ktschedulerplugin.la
-%{tde_tdelibdir}/ktschedulerplugin.so
-%{tde_tdelibdir}/ktsearchplugin.la
-%{tde_tdelibdir}/ktsearchplugin.so
-%{tde_tdelibdir}/ktstatsplugin.la
-%{tde_tdelibdir}/ktstatsplugin.so
-%{tde_tdelibdir}/ktupnpplugin.la
-%{tde_tdelibdir}/ktupnpplugin.so
-%{tde_tdelibdir}/ktwebinterfaceplugin.la
-%{tde_tdelibdir}/ktwebinterfaceplugin.so
-%{tde_tdeappdir}/ktorrent.desktop
-%{tde_datadir}/apps/ktorrent
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/ktorrentplugin.desktop
-
-
-%Changelog
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1
-- Rename old tq methods that no longer need a unique name [Commit #a90eb215]
-- Remove additional unneeded tq method conversions [Commit #bb37c405]
-- Rename obsolete tq methods to standard names [Commit #0d48fca8]
-- Rename a few stragglers [Commit #c3480dfe]
-- Fix inadvertent "TQ" changes. [Commit #445a5152]
-- Fix configure output message to clarify that missing avahi support is caused by missing avahi-tqt package as well as avahi-client. [Commit #03d0c794]
-- Update ktorrent package to 2.2.8 and fix internal geoip database. [Bug #363] [Commit #5af9907f]
-- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kuickshow/bp000-8712ab46.diff b/redhat/applications/kuickshow/bp000-8712ab46.diff
deleted file mode 100644
index 2f7e0b2cf..000000000
--- a/redhat/applications/kuickshow/bp000-8712ab46.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-commit 8712ab46f5d6dc08d2ff6a1e238773adfc5ab85e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253623 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
-index d5d3a84..ce85788 100644
---- a/kuickshow/src/aboutwidget.cpp
-+++ b/kuickshow/src/aboutwidget.cpp
-@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
- 
-     TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
-     gBox->setGeometry( 10, 10, width()-20, height()-20 );
--    gBox->tqsetAlignment( AlignHCenter );
-+    gBox->setAlignment( AlignHCenter );
-     gBox->installEventFilter( this );
- 
-     gBox->setPalette( TQPalette( TQColor( white ) ) );
-@@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
- 
-     TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION
- 				 " was brought to you by", gBox);
--    authors->tqsetAlignment( AlignCenter );
-+    authors->setAlignment( AlignCenter );
- 
-     m_homepage = new KURLWidget("Carsten Pfeiffer", gBox);
-     m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" );
--    m_homepage->tqsetAlignment( AlignCenter );
-+    m_homepage->setAlignment( AlignCenter );
- 
-     TQLabel *copy = new TQLabel("(C) 1998-2006", gBox);
--    copy->tqsetAlignment( AlignCenter );
-+    copy->setAlignment( AlignCenter );
- 
-     ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" );
-     if ( im->loadImage( file ) )
-diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
-index c0bef52..e444605 100644
---- a/kuickshow/src/defaultswidget.cpp
-+++ b/kuickshow/src/defaultswidget.cpp
-@@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
-   // --
- 
-   gbPreview = new TQGroupBox( i18n("Preview"), this );
--  gbPreview->tqsetAlignment( AlignCenter );
-+  gbPreview->setAlignment( AlignCenter );
- 
-   lbImOrig = new TQLabel( i18n("Original"), gbPreview );
-   imOrig = new ImlibWidget( 0L, gbPreview, "original image" );
-diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp
-index d68bc89..2fb4f6d 100644
---- a/kuickshow/src/filecache.cpp
-+++ b/kuickshow/src/filecache.cpp
-@@ -68,7 +68,7 @@ TQString FileCache::tempDir()
- 
- KTempDir * FileCache::createTempDir()
- {
--    TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
-+    TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
-     tmpName.append( TQString::number( getpid() ) );
-     TQString dirName = locateLocal( "tmp", tmpName );
-     KTempDir *dir = new KTempDir( dirName );
-diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
-index 403269b..5f8df74 100644
---- a/kuickshow/src/filewidget.cpp
-+++ b/kuickshow/src/filewidget.cpp
-@@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading()
-     emit finished();
- }
- 
--TQSize FileWidget::tqsizeHint() const
-+TQSize FileWidget::sizeHint() const
- {
-   return TQSize( 300, 300 );
- }
-diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
-index 64f1160..8299664 100644
---- a/kuickshow/src/filewidget.h
-+++ b/kuickshow/src/filewidget.h
-@@ -71,7 +71,7 @@ protected:
-     virtual bool eventFilter( TQObject *o, TQEvent * );
-     virtual void resizeEvent( TQResizeEvent * );
-     virtual void activatedMenu( const KFileItem *, const TQPoint& );
--    virtual TQSize tqsizeHint() const;
-+    virtual TQSize sizeHint() const;
- 
- private slots:
-     void slotReturnPressed( const TQString& text );
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index f56c7b3..8b195a7 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
- {
-     if ( myIsFullscreen || totalScreen )
-     {
--        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width();
-+        return KGlobalSettings::desktopGeometry(topLevelWidget()).width();
-     } else
- 	return Kuick::workArea().width();
- }
-@@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
- int ImageWindow::desktopHeight( bool totalScreen ) const
- {
-     if ( myIsFullscreen || totalScreen ) {
--        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height();
-+        return KGlobalSettings::desktopGeometry(topLevelWidget()).height();
-     } else {
- 	return Kuick::workArea().height();
-     }
-@@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
- TQSize ImageWindow::maxImageSize() const
- {
-     if ( myIsFullscreen ) {
--        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
-+        return KGlobalSettings::desktopGeometry(topLevelWidget()).size();
-     }
-     else {
- 	return Kuick::workArea().size() - Kuick::frameSize( winId() );
-@@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
-     if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
-         return false;
-     
--    TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
-+    TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size();
- 
-     int desktopArea = desktopSize.width() * desktopSize.height();
-     int imageArea = newWidth * newHeight;
-diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
-index 4e0aa57..b20606a 100644
---- a/kuickshow/src/kuickfile.cpp
-+++ b/kuickshow/src/kuickfile.cpp
-@@ -94,7 +94,7 @@ bool KuickFile::download()
-     return m_job != 0L;
- }
- 
--KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
-+KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
- {
-     if ( isAvailable() )
-         return OK;
-@@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job )
- 
-         TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
-         TQFile::remove( canceledFile );
--        m_progress->tqtopLevelWidget()->hide();
-+        m_progress->topLevelWidget()->hide();
-     }
-     else {
- 	    m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
-@@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job )
- 	        m_progress->setProgress( 100 );
- #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
- 	        if ( KDE::version() <= BUGGY_VERSION ) {
--	            m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog
-+	            m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
- 	        }
- 	    }
-     }
-diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h
-index af92355..49ee389 100644
---- a/kuickshow/src/kuickfile.h
-+++ b/kuickshow/src/kuickfile.h
-@@ -27,7 +27,7 @@ class KuickFile : public TQObject
-   TQ_OBJECT
- 
- public:
--	enum DownloadtqStatus
-+	enum DownloadStatus
- 	{
- 		OK = 1,
- 		CANCELED,
-@@ -72,7 +72,7 @@ public:
-      * immediately.
-      * @return true when the download has finished or false when the user aborted the dialog
-      */
--    KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent );
-+    KuickFile::DownloadStatus waitForDownload( TQWidget *parent );
- 
- //    bool needsDownload();
- 
diff --git a/redhat/applications/kuickshow/bp001-28d9c774.diff b/redhat/applications/kuickshow/bp001-28d9c774.diff
deleted file mode 100644
index e64d68695..000000000
--- a/redhat/applications/kuickshow/bp001-28d9c774.diff
+++ /dev/null
@@ -1,226 +0,0 @@
-commit 28d9c77436d5cb4c91db8f137f8fe45d4d835527
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316391 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
-index ce85788..dc43578 100644
---- a/kuickshow/src/aboutwidget.cpp
-+++ b/kuickshow/src/aboutwidget.cpp
-@@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e )
- {
-     if ( e->type() == TQEvent::MouseButtonPress ) {
-         TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
--        if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) {
-+        if ( !m_homepage->geometry().contains( ev->pos() ) ) {
-             deleteLater();
-             return true;
-         }
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index 8b195a7..12aa911 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -310,8 +310,8 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight )
- 	
-     TQString caption = i18n( "Filename (Imagewidth x Imageheight)",
-                             "%3 (%1 x %2)" );
--    caption = caption.tqarg( m_kuim->originalWidth() ).
--              tqarg( m_kuim->originalHeight() ).tqarg( m_kuim->url().prettyURL() );
-+    caption = caption.arg( m_kuim->originalWidth() ).
-+              arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() );
-     setCaption( kapp->makeStdCaption( caption ) );
- }
- 
-@@ -403,7 +403,7 @@ void ImageWindow::scrollImage( int x, int y, bool restrict )
- //     XUnmapWindow();
- //     XSetWindowBackgroundPixmap()
- //     resize window to fit image size, center image
--//     XClearWindow(); // tqrepaint
-+//     XClearWindow(); // repaint
- //     XMapWindow(), XSync();
- //
- bool ImageWindow::showNextImage( const KURL& url )
-@@ -412,7 +412,7 @@ bool ImageWindow::showNextImage( const KURL& url )
-     switch ( file->waitForDownload( this ) ) {
-     	case KuickFile::ERROR:
-     	{
--    	    TQString tmp = i18n("Unable to download the image from %1.").tqarg(url.prettyURL());
-+    	    TQString tmp = i18n("Unable to download the image from %1.").arg(url.prettyURL());
- 	        emit sigImageError( file, tmp );
- 	        return false;
-     	}
-@@ -430,7 +430,7 @@ bool ImageWindow::showNextImage( KuickFile *file )
-     if ( !loadImage( file ) ) {
-    	    TQString tmp = i18n("Unable to load the image %1.\n"
-                        "Perhaps the file format is unsupported or "
--                       "your Imlib is not installed properly.").tqarg(file->url().prettyURL());
-+                       "your Imlib is not installed properly.").arg(file->url().prettyURL());
-         emit sigImageError( file, tmp );
-         return false;
-     }
-@@ -1203,7 +1203,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
-         return KMessageBox::warningContinueCancel(
-             this,
-             i18n("You are about to view a very large image (%1 x %2 pixels), which can be very resource-consuming and even make your computer hang.\nDo you want to continue?")
--            .tqarg( newWidth ).tqarg( newHeight ),
-+            .arg( newWidth ).arg( newHeight ),
-             TQString(),
-             KStdGuiItem::cont(),
-             "ImageWindow_confirm_very_large_window"
-diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
-index f42e6c1..0bca327 100644
---- a/kuickshow/src/imlibwidget.cpp
-+++ b/kuickshow/src/imlibwidget.cpp
-@@ -475,7 +475,7 @@ void ImlibWidget::setBackgroundColor( const TQColor& color )
- {
-     myBackgroundColor = color;
-     setPalette( TQPalette( myBackgroundColor ));
--    tqrepaint( false); // FIXME - false? necessary at all?
-+    repaint( false); // FIXME - false? necessary at all?
- }
- 
- const TQColor& ImlibWidget::backgroundColor() const
-@@ -515,7 +515,7 @@ void ImlibWidget::setBusyCursor()
- 
- void ImlibWidget::restoreCursor()
- {
--    if ( cursor().shape() == KCursor::waitCursor().tqshape() ) // only if nobody changed the cursor in the meantime!
-+    if ( cursor().shape() == KCursor::waitCursor().shape() ) // only if nobody changed the cursor in the meantime!
-          setCursor( m_oldCursor );
- }
- 
-diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
-index b20606a..247e56a 100644
---- a/kuickshow/src/kuickfile.cpp
-+++ b/kuickshow/src/kuickfile.cpp
-@@ -106,8 +106,8 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
- 
-     KProgressDialog *dialog = new KProgressDialog( parent );
-     dialog->setModal( true );
--    dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) );
--    dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() ));
-+    dialog->setCaption( i18n("Downloading %1...").arg( m_url.fileName() ) );
-+    dialog->setLabel( i18n("Please wait while downloading\n%1").arg( m_url.prettyURL() ));
-     dialog->setAllowCancel( true );
-     dialog->setAutoClose( true );
- 
-diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
-index 0392c85..b0879c0 100644
---- a/kuickshow/src/kuickshow.cpp
-+++ b/kuickshow/src/kuickshow.cpp
-@@ -133,7 +133,7 @@ KuickShow::KuickShow( const char *name )
-         if ( KMessageBox::warningYesNo(
-                  this,
-                  i18n("Do you really want to display this 1 image at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", 
--                      "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).tqarg(KStdGuiItem::no().plainText()),
-+                      "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).arg(KStdGuiItem::no().plainText()),
-                  i18n("Display Multiple Images?"))
-              != KMessageBox::Yes )
-         {
-@@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir )
-                                         coll, "kuick_print" );
-     print->setText( i18n("Print Image...") );
- 
--    KAction *configure = new KAction( i18n("Configure %1...").tqarg( KGlobal::instance()->aboutData()->programName() ), "configure",
-+    KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure",
-                                       KShortcut(),
-                                       TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
-                                       coll, "kuick_configure" );
-@@ -552,7 +552,7 @@ bool KuickShow::showImage( const KFileItem *fi,
-                      TQT_TQOBJECT(this), TQT_SLOT (slotTrashCurrentImage (ImageWindow *)));
-             if ( s_viewers.count() == 1 && moveToTopLeft ) {
-                 // we have to move to 0x0 before showing _and_
--                // after showing, otherwise we get some bogus tqgeometry()
-+                // after showing, otherwise we get some bogus geometry()
-                 m_viewer->move( Kuick::workArea().topLeft() );
-             }
- 
-@@ -641,7 +641,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *parent)
- 
-     if (KMessageBox::warningContinueCancel(
-             parent,
--            i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
-+            i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
-             i18n("Delete File"),
-             KStdGuiItem::del(),
-             "Kuick_delete_current_image")
-@@ -666,7 +666,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *parent)
- 
-     if (KMessageBox::warningContinueCancel(
-             parent,
--            i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
-+            i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
-             i18n("Trash File"),
-             KGuiItem(i18n("to trash", "&Trash"),"edittrash"),
-             "Kuick_trash_current_image")
-diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
-index 2c78a92..7005bbe 100644
---- a/kuickshow/src/printing.cpp
-+++ b/kuickshow/src/printing.cpp
-@@ -52,7 +52,7 @@ bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent )
- 
-     KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page"));
- 
--    if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) )
-+    if ( printer.setup( parent, i18n("Print %1").arg(printer.docName().section('/', -1)) ) )
-     {
-         KTempFile tmpFile( TQString(), ".png" );
-         if ( tmpFile.status() == 0 )
-@@ -109,7 +109,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
-     bool shrinkToFit = (printer.option( "app-kuickshow-shrinkToFit" ) != f);
-     TQSize imagesize = image.size();
-     if ( shrinkToFit && (image.width() > w || image.height() > h) ) {
--        imagesize.tqscale( w, h, TQSize::ScaleMin );
-+        imagesize.scale( w, h, TQSize::ScaleMin );
-     }
- 
- 
-@@ -117,28 +117,28 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
-     // align image
-     //
-     bool ok = false;
--    int tqalignment = printer.option("app-kuickshow-tqalignment").toInt( &ok );
-+    int alignment = printer.option("app-kuickshow-alignment").toInt( &ok );
-     if ( !ok )
--        tqalignment = TQt::AlignCenter; // default
-+        alignment = TQt::AlignCenter; // default
- 
-     int x = 0;
-     int y = 0;
- 
-     // ### need a GUI for this in KuickPrintDialogPage!
--    // x - tqalignment
--    if ( tqalignment & TQt::AlignHCenter )
-+    // x - alignment
-+    if ( alignment & TQt::AlignHCenter )
-         x = (w - imagesize.width())/2;
--    else if ( tqalignment & TQt::AlignLeft )
-+    else if ( alignment & TQt::AlignLeft )
-         x = 0;
--    else if ( tqalignment & TQt::AlignRight )
-+    else if ( alignment & TQt::AlignRight )
-         x = w - imagesize.width();
- 
--    // y - tqalignment
--    if ( tqalignment & TQt::AlignVCenter )
-+    // y - alignment
-+    if ( alignment & TQt::AlignVCenter )
-         y = (h - imagesize.height())/2;
--    else if ( tqalignment & TQt::AlignTop )
-+    else if ( alignment & TQt::AlignTop )
-         y = 0;
--    else if ( tqalignment & TQt::AlignBottom )
-+    else if ( alignment & TQt::AlignBottom )
-         y = h - imagesize.height();
- 
-     //
-@@ -258,7 +258,7 @@ void KuickPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts,
-     TQString t = "true";
-     TQString f = "false";
- 
--//    ### opts["app-kuickshow-tqalignment"] = ;
-+//    ### opts["app-kuickshow-alignment"] = ;
-     opts["app-kuickshow-printFilename"] = m_addFileName->isChecked() ? t : f;
-     opts["app-kuickshow-blackwhite"] = m_blackwhite->isChecked() ? t : f;
-     opts["app-kuickshow-shrinkToFit"] = m_shrinkToFit->isChecked() ? t : f;
diff --git a/redhat/applications/kuickshow/bp002-bdeb8b3a.diff b/redhat/applications/kuickshow/bp002-bdeb8b3a.diff
deleted file mode 100644
index e293c5601..000000000
--- a/redhat/applications/kuickshow/bp002-bdeb8b3a.diff
+++ /dev/null
@@ -1,166 +0,0 @@
-commit bdeb8b3ad3118b2be6fc62687092753cc12b2976
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497974 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
-index e444605..7e94b1b 100644
---- a/kuickshow/src/defaultswidget.cpp
-+++ b/kuickshow/src/defaultswidget.cpp
-@@ -105,13 +105,13 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
-   ////////////////
- 
- 
--  // tqlayout management
-+  // layout management
-   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 0,
--            KDialog::spacingHint(), "main tqlayout" );
-+            KDialog::spacingHint(), "main layout" );
- 
--  TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->tqlayout(),
-+  TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->layout(),
-             KDialog::spacingHint());
--  TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->tqlayout(),
-+  TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->layout(),
-             KDialog::spacingHint());
-   TQGridLayout *gbPreviewLayout = new TQGridLayout(gbPreview, 2, 3, 0,
-             KDialog::spacingHint());
-diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
-index 5f8df74..2662df4 100644
---- a/kuickshow/src/filewidget.cpp
-+++ b/kuickshow/src/filewidget.cpp
-@@ -196,7 +196,7 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
- 	    }
- 	
- 	    const TQString& text = k->text();
--	    if ( !text.isEmpty() && text.tqunicode()->isPrint() ) {
-+	    if ( !text.isEmpty() && text.unicode()->isPrint() ) {
-                 k->accept();
- 		
-                 if ( !m_fileFinder ) {
-diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
-index bde353d..1308885 100644
---- a/kuickshow/src/generalwidget.cpp
-+++ b/kuickshow/src/generalwidget.cpp
-@@ -36,8 +36,8 @@
- GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
-   : TQWidget( parent, name )
- {
--  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
--  tqlayout->setSpacing( KDialog::spacingHint() );
-+  TQVBoxLayout *layout = new TQVBoxLayout( this );
-+  layout->setSpacing( KDialog::spacingHint() );
- 
-   TQPixmap pixmap = UserIcon( "logo" );
-   KURLLabel *logo = new KURLLabel( this );
-@@ -50,7 +50,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
-   connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ),
-             TQT_SLOT( slotURLClicked( const TQString & ) ) );
- 
--  tqlayout->addWidget( logo, 0, AlignRight );
-+  layout->addWidget( logo, 0, AlignRight );
- 
-   cbFullscreen = new TQCheckBox( i18n("Fullscreen mode"), this, "boscreen" );
- 
-@@ -70,17 +70,17 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
-   gridLayout->addWidget( l1, 1, 0 );
-   gridLayout->addWidget( editFilter, 1, 1 );
- 
--  tqlayout->addWidget( cbFullscreen );
--  tqlayout->addWidget( cbPreload );
--  tqlayout->addWidget( cbLastdir );
--  tqlayout->addLayout( gridLayout );
-+  layout->addWidget( cbFullscreen );
-+  layout->addWidget( cbPreload );
-+  layout->addWidget( cbLastdir );
-+  layout->addLayout( gridLayout );
- 
-   ////////////////////////////////////////////////////////////////////////
- 
-   TQVGroupBox *gbox2 = new TQVGroupBox( i18n("Quality/Speed"),
- 				     this, "qualitybox" );
--  tqlayout->addWidget( gbox2 );
--  tqlayout->addStretch();
-+  layout->addWidget( gbox2 );
-+  layout->addStretch();
- 
-   cbSmoothScale = new TQCheckBox( i18n("Smooth scaling"), gbox2, "smoothscale" );
-   cbFastRender = new TQCheckBox( i18n("Fast rendering"), gbox2, "fastrender" );
-diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp
-index d94d332..47b3d83 100644
---- a/kuickshow/src/mainwidget.cpp
-+++ b/kuickshow/src/mainwidget.cpp
-@@ -35,7 +35,7 @@ MainWidget::~MainWidget()
- }
- 
- 
--// for now, no tqlayout managers
-+// for now, no layout managers
- void MainWidget::resizeEvent( TQResizeEvent * )
- {
-   box->resize( width(), height() );
-diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
-index 7005bbe..0d003a0 100644
---- a/kuickshow/src/printing.cpp
-+++ b/kuickshow/src/printing.cpp
-@@ -199,21 +199,21 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name )
- {
-     setTitle( i18n("Image Settings") );
- 
--    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
--    tqlayout->setMargin( KDialog::marginHint() );
--    tqlayout->setSpacing( KDialog::spacingHint() );
-+    TQVBoxLayout *layout = new TQVBoxLayout( this );
-+    layout->setMargin( KDialog::marginHint() );
-+    layout->setSpacing( KDialog::spacingHint() );
- 
-     m_addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
-     m_addFileName->setChecked( true );
--    tqlayout->addWidget( m_addFileName );
-+    layout->addWidget( m_addFileName );
- 
-     m_blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
-     m_blackwhite->setChecked( false );
--    tqlayout->addWidget (m_blackwhite );
-+    layout->addWidget (m_blackwhite );
- 
-     TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
-     group->setRadioButtonExclusive( true );
--    tqlayout->addWidget( group );
-+    layout->addWidget( group );
-     // m_shrinkToFit = new TQRadioButton( i18n("Shrink image to &fit, if necessary"), group );
-     m_shrinkToFit = new TQCheckBox( i18n("Shrink image to &fit, if necessary"), group );
-     m_shrinkToFit->setChecked( true );
-diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
-index ed2bedc..9727c20 100644
---- a/kuickshow/src/slideshowwidget.cpp
-+++ b/kuickshow/src/slideshowwidget.cpp
-@@ -31,8 +31,8 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
- {
- //     setTitle( i18n("Slideshow") );
- 
--    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
--    tqlayout->setSpacing( KDialog::spacingHint() );
-+    TQVBoxLayout *layout = new TQVBoxLayout( this );
-+    layout->setSpacing( KDialog::spacingHint() );
- 
-     m_fullScreen = new TQCheckBox( i18n("Switch to &full-screen"), this );
-     m_startWithCurrent = new TQCheckBox( i18n("S&tart with current image"), this);
-@@ -48,11 +48,11 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
-     m_cycles->setSpecialValueText( i18n("infinite") );
-     m_cycles->setRange( 0, 500 );
-     
--    tqlayout->addWidget( m_fullScreen );
--    tqlayout->addWidget( m_startWithCurrent );
--    tqlayout->addWidget( m_delayTime );
--    tqlayout->addWidget( m_cycles );
--    tqlayout->addStretch( 1 );
-+    layout->addWidget( m_fullScreen );
-+    layout->addWidget( m_startWithCurrent );
-+    layout->addWidget( m_delayTime );
-+    layout->addWidget( m_cycles );
-+    layout->addStretch( 1 );
- 
-     loadSettings( *kdata );
- }
diff --git a/redhat/applications/kuickshow/bp003-d97e403f.diff b/redhat/applications/kuickshow/bp003-d97e403f.diff
deleted file mode 100644
index fdce97a10..000000000
--- a/redhat/applications/kuickshow/bp003-d97e403f.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d97e403f9f70425a59f0d3bdbcfd4dd6360fa6e0
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331655316 -0500
-
-    Remove inadvertent renaming. This resolves bug report 863.
-
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index 39af7f5..51367f2 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -182,10 +182,10 @@ void ImageWindow::setupActions()
-                  TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
-                  m_actions, "rotate270" );
- 
--    new KAction( i18n("FlipQt::Horizontally"), Key_Asterisk,
-+    new KAction( i18n("Flip Horizontally"), Key_Asterisk,
-                  TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
-                  m_actions, "flip_horicontally" );
--    new KAction( i18n("FlipQt::Vertically"), Key_Slash,
-+    new KAction( i18n("Flip Vertically"), Key_Slash,
-                  TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
-                  m_actions, "flip_vertically" );
- 
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
deleted file mode 100644
index 1862df13f..000000000
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package kuickshow (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-%define tde_pkg kuickshow
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8.13
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Quick picture viewer for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IMLIB1 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	imlib-devel
-%endif
-%if 0%{?mgaversion}
-BuildRequires:	imlib1-devel
-%endif
-
-# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
-BuildRequires:	giflib-devel 
-%else
-BuildRequires:	libungif-devel 
-%endif
-
-
-%description
-Kuickshow is a picture viewer for TDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Missing category will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kuickshow
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/kuickshow/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/libtdeinit_%{tde_pkg}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/kuickshow/
-
-
-%changelog
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.12.spec b/redhat/applications/kuickshow/kuickshow-3.5.12.spec
deleted file mode 100644
index 658222daf..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.12.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-%define version 0.8.13
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Quick picture viewer for KDE 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-Conflicts:	trinity-kdegraphics
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_tdedocdir}/HTML/en/*/
-%{tde_datadir}/icons/*/*/*/*
-%{tde_libdir}/libkdeinit_%{kdecomp}.so
-
-%exclude %{tde_libdir}/*.la
-%exclude %{tde_libdir}/*/*.so
-%exclude %{tde_libdir}/*/*.la
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 8028d1941..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kuickshow/kuickshow/src/Makefile.am.ORI	2012-08-06 11:35:57.271341272 +0200
-+++ kuickshow/kuickshow/src/Makefile.am	2012-08-06 11:36:20.916830749 +0200
-@@ -10,7 +10,7 @@
- METASOURCES = AUTO
- 
- kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB)
-+kuickshow_la_LIBADD  = $(LIB_KDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
- kuickshow_la_SOURCES =	kuickshow.cpp \
- 	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
- 	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
deleted file mode 100644
index ca085bf1d..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Quick picture viewer for KDE 
-Version:	0.8.13
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	imlib-devel
-%endif
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5
-- Initial release for TDE 3.5.13.1
-
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Removes conflict with 'kdegraphics'
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-- Remove additional unneeded tq method conversions [Commit #28d9c774]
-- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
deleted file mode 100644
index e87b7ad2f..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ /dev/null
@@ -1,127 +0,0 @@
-# Default version for this component
-%define tde_pkg kuickshow
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Quick picture viewer for TDE 
-Version:		0.8.13
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
-BuildRequires:	imlib-devel
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion}
-BuildRequires:	imlib1-devel
-%endif
-
-%description
-Kuickshow is a picture viewer for TDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kuickshow
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/kuickshow/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/libkdeinit_%{tde_pkg}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/kuickshow/
-
-
-%changelog
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.spec
deleted file mode 100644
index 6602f889f..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Quick picture viewer for KDE 
-Version:	0.8.13
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kuickshow] Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-Patch0:		bp000-8712ab46.diff
-# [kuickshow] Remove additional unneeded tq method conversions [Commit #28d9c774]
-Patch1:		bp001-28d9c774.diff
-# [kuickshow] Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-Patch2:		bp002-bdeb8b3a.diff
-# [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-Patch3:		bp003-d97e403f.diff
-# [kuickshow] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch4:		kuickshow-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .ldflags
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
-
-
-%Changelog
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Removes conflict with 'kdegraphics'
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-- Remove additional unneeded tq method conversions [Commit #28d9c774]
-- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kvirc/bp000-32a249ba.diff b/redhat/applications/kvirc/bp000-32a249ba.diff
deleted file mode 100644
index d86c58714..000000000
--- a/redhat/applications/kvirc/bp000-32a249ba.diff
+++ /dev/null
@@ -1,4337 +0,0 @@
-commit 32a249baaef1b910bffd79734c78cac3671f00f2
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324253641 -0600
-
-    Rename old tq methods that no longer need a unique name
-
-diff --git a/data/deftheme/silverirc/themedata.kvc b/data/deftheme/silverirc/themedata.kvc
-index ddad668..a83296b 100644
---- a/data/deftheme/silverirc/themedata.kvc
-+++ b/data/deftheme/silverirc/themedata.kvc
-@@ -163,7 +163,7 @@ iccolor1=0,0,0
- mirccolor12=15,15,255
- mirccolor5=150,0,0
- msgtypeChanAdmin=242,3,100,1,1
--msgtypeGenerictqStatus=133,14,100,1,1
-+msgtypeGenericStatus=133,14,100,1,1
- msgtypeHalfOp=174,3,100,1,1
- msgtypeDevoice=63,3,100,1,1
- msgtypeJoin=39,14,100,1,2
-diff --git a/data/doctemplates/rfc2812.template b/data/doctemplates/rfc2812.template
-index 6672b51..9d81a1c 100644
---- a/data/doctemplates/rfc2812.template
-+++ b/data/doctemplates/rfc2812.template
-@@ -23,7 +23,7 @@ Category: Informational
- [/td][/tr]
- 
- [tr][td]
--[b]tqStatus of this Memo[/b]
-+[b]Status of this Memo[/b]
- [/td][/tr]
- 
- [tr][td]
-diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/kvi_stringconversion.cpp
-index 2836628..f316fc2 100644
---- a/src/kvilib/ext/kvi_stringconversion.cpp
-+++ b/src/kvilib/ext/kvi_stringconversion.cpp
-@@ -234,17 +234,17 @@ namespace KviStringConversion
- 	bool fromString(const TQString & szValue,TQFont &buffer)
- 	{
- 		KviStr str = szValue;
--		KviStr family,pointSize,tqstyleHint,weight,options;
-+		KviStr family,pointSize,styleHint,weight,options;
- 		str.getToken(family,',');
- 		str.getToken(pointSize,',');
--		str.getToken(tqstyleHint,',');
-+		str.getToken(styleHint,',');
- 		str.getToken(weight,','); 
- 		if(!family.isEmpty())buffer.setFamily(family.ptr());
- 		int i;
- 		bool bOk;
- 		i = pointSize.toInt(&bOk);
- 		if(bOk && (i > 0))buffer.setPointSize(i);
--		i = tqstyleHint.toInt(&bOk);
-+		i = styleHint.toInt(&bOk);
- 		if(bOk && (i >= 0))buffer.setStyleHint((TQFont::StyleHint)i);
- 		i = weight.toInt(&bOk);
- 		if(bOk && (i >= 0))buffer.setWeight(i);
-diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
-index 9986530..6b3dd91 100644
---- a/src/kvilib/net/kvi_http.cpp
-+++ b/src/kvilib/net/kvi_http.cpp
-@@ -55,24 +55,24 @@ KviHttpRequest::KviHttpRequest()
- 	m_bHeaderProcessed = false;
- 	m_pBuffer = new KviDataBuffer();
- 
--	resettqStatus();
-+	resetStatus();
- 	resetData();
- }
- 
- KviHttpRequest::~KviHttpRequest()
- {
--	resetInternaltqStatus();
-+	resetInternalStatus();
- 	delete m_pBuffer;
- }
- 
- void KviHttpRequest::abort()
- {
--	resetInternaltqStatus();
-+	resetInternalStatus();
- 	m_szLastError = __tr2qs("Aborted");
- 	emit terminated(false);
- }
- 
--void KviHttpRequest::resetInternaltqStatus()
-+void KviHttpRequest::resetInternalStatus()
- {
- 	if(m_pThread)delete m_pThread;
- 	if(m_pDns)delete m_pDns;
-@@ -91,7 +91,7 @@ void KviHttpRequest::resetInternaltqStatus()
- 	KviThreadManager::killPendingEvents(this);
- }
- 
--void KviHttpRequest::resettqStatus()
-+void KviHttpRequest::resetStatus()
- {
- 	m_szLastError = __tr2qs("No request");
- 	m_uTotalSize = 0;
-@@ -114,9 +114,9 @@ void KviHttpRequest::resetData()
- 
- void KviHttpRequest::reset()
- {
--	resettqStatus();
-+	resetStatus();
- 	resetData();
--	resetInternaltqStatus();
-+	resetInternalStatus();
- }
- 
- bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFileName)
-@@ -131,8 +131,8 @@ bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFile
- bool KviHttpRequest::start()
- {
- 	// ensure that the file is closed
--	resetInternaltqStatus();
--	resettqStatus();
-+	resetInternalStatus();
-+	resetStatus();
- 
- 	if(m_eProcessingType == StoreToFile)
- 	{
-@@ -156,14 +156,14 @@ bool KviHttpRequest::start()
- 
- 	if(m_url.host().isEmpty())
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError = __tr2qs("Invalid URL: Missing hostname");
- 		return false;
- 	}
- 
- 	if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr());
- 		return false;
- 	}
-@@ -185,7 +185,7 @@ bool KviHttpRequest::startDnsLookup()
- 
- 	if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4))
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError = __tr2qs("Unable to start the DNS lookup");
- 		return false;
- 	}
-@@ -212,7 +212,7 @@ void KviHttpRequest::dnsLookupDone(KviDns *d)
- 		haveServerIp();
- 	} else {
- 		int iErr = d->error();
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError = KviError::getDescription(iErr);
- 		emit terminated(false);
- 	}
-@@ -242,7 +242,7 @@ void KviHttpRequest::haveServerIp()
- 
- 	if(!m_pThread->start())
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError = __tr2qs("Unable to start the request slave thread");
- 		emit terminated(false);
- 		return;
-@@ -318,7 +318,7 @@ bool KviHttpRequest::event(TQEvent *e)
- 						// nothing... just make gcc happy
- 					break;
- 				}
--				resetInternaltqStatus();
-+				resetInternalStatus();
- 				m_szLastError = __tr2qs("Success");
- 				emit terminated(true);
- 				return true;
-@@ -328,7 +328,7 @@ bool KviHttpRequest::event(TQEvent *e)
- 				KviStr * err = ((KviThreadDataEvent<KviStr> *)e)->getData();
- 				m_szLastError = __tr2qs_no_xgettext(err->ptr());
- 				delete err;
--				resetInternaltqStatus();
-+				resetInternalStatus();
- 				emit terminated(false);
- 				return true;
- 			}
-@@ -425,7 +425,7 @@ bool KviHttpRequest::openFile()
- 				if(!d.rename(m_szFileName,tmp))
- 				{
- 					// fail :(
--					resetInternaltqStatus();
-+					resetInternalStatus();
- 					m_szLastError = __tr2qs("Failed to rename the existing file, please rename manually and retry");
- 					emit terminated(false);
- 					return false;
-@@ -443,7 +443,7 @@ bool KviHttpRequest::openFile()
- 
- 	if(!m_pFile->openForWriting(bAppend))
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		KviTQString::sprintf(m_szLastError,__tr2qs("Can't open file \"%Q\" for writing"),&m_szFileName);
- 		emit terminated(false);
- 		return false;
-@@ -473,7 +473,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
- 
- 	bool bValid = false;
- 
--	unsigned int utqStatus = 0;
-+	unsigned int uStatus = 0;
- 
- 	// check the response value
- 	if(kvi_strEqualCSN(szResponse.ptr(),"HTTP",4))
-@@ -486,14 +486,14 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
- 		if(idx != -1)szNumber = szR.left(idx);
- 		else szNumber = szR;
- 		bool bOk;
--		utqStatus = szNumber.toUInt(&bOk);
-+		uStatus = szNumber.toUInt(&bOk);
- 		if(bOk)bValid = true;
- 	}
- 
- 	if(!bValid)
- 	{
- 		// the response is invalid ?
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError=__tr2qs("Invalid HTTP response: %s").tqarg(szResponse.ptr());
- 		emit terminated(false);
- 		return false;
-@@ -608,14 +608,14 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
- 	//				case 504: // Gateway timeout
- 	//				case 505: // HTTP Version not supported
- 
--	if((utqStatus != 200) && (utqStatus != 206))
-+	if((uStatus != 200) && (uStatus != 206))
- 	{
- 		// this is not "OK" and not "Partial content"
- 		// Error , redirect or something confusing
- 		if(m_eProcessingType != HeadersOnly)
- 		{
- 			// this is an error then
--			resetInternaltqStatus();
-+			resetInternalStatus();
- 			m_szLastError = szResponse.ptr();
- 			emit terminated(false);
- 			return false;
-@@ -624,7 +624,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
- 
- 	if((m_uMaxContentLength > 0) && (m_uTotalSize > ((unsigned int)m_uMaxContentLength)))
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError=__tr2qs("Stream exceeding maximum length");
- 		emit terminated(false);
- 		return false;
-@@ -657,7 +657,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
- 			// header not complete
- 			if(m_pBuffer->size() > 4096)
- 			{
--				resetInternaltqStatus();
-+				resetInternalStatus();
- 				m_szLastError = __tr2qs("Header too long: exceeded 4096 bytes");
- 				emit terminated(false);
- 			}
-@@ -706,7 +706,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
- 	
- 			if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
- 			{
--				resetInternaltqStatus();
-+				resetInternalStatus();
- 				m_szLastError=__tr2qs("Stream exceeded expected length");
- 				emit terminated(false);
- 			}
-@@ -794,7 +794,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
- 						m_uRemainingChunkSize = szHexHeader.toLong(&bOk,16);
- 						if(!bOk)
- 						{
--							resetInternaltqStatus();
-+							resetInternalStatus();
- 							m_szLastError = __tr2qs("Protocol error: invalid chunk size");
- 							emit terminated(false);
- 							return;
-@@ -814,7 +814,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
- 					// chunk header not complete
- 					if(m_pBuffer->size() > 4096)
- 					{
--						resetInternaltqStatus();
-+						resetInternalStatus();
- 						m_szLastError = __tr2qs("Chunk header too long: exceeded 4096 bytes");
- 						emit terminated(false);
- 						return;
-@@ -848,7 +848,7 @@ check_stream_length:
- 
- 	if(((m_uTotalSize > 0) && (m_uReceivedSize > m_uTotalSize)) || ((m_uMaxContentLength > 0) && (m_uReceivedSize > m_uMaxContentLength)))
- 	{
--		resetInternaltqStatus();
-+		resetInternalStatus();
- 		m_szLastError=__tr2qs("Stream exceeded expected length");
- 		emit terminated(false);
- 	}
-diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h
-index de4457d..2eeec37 100644
---- a/src/kvilib/net/kvi_http.h
-+++ b/src/kvilib/net/kvi_http.h
-@@ -104,9 +104,9 @@ protected:
- 	bool openFile();
- 	void emitLines(KviDataBuffer * pDataBuffer);
- 
--	void resettqStatus();
-+	void resetStatus();
- 	void resetData();
--	void resetInternaltqStatus();
-+	void resetInternalStatus();
- protected slots:
- 	void dnsLookupDone(KviDns *d);
- 	void haveServerIp();
-diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
-index 2d946a2..1a7f975 100644
---- a/src/kvilib/tal/kvi_tal_listview.cpp
-+++ b/src/kvilib/tal/kvi_tal_listview.cpp
-@@ -479,7 +479,7 @@
- 	        return;
- 	
- 	    TQPoint pos;
--	    int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
-+	    int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
- 	    if (activatedPos(pos)) {
- 	        bool parentControl = false;
- 	        if (parent() && parent()->rtti() == 1  &&
-@@ -652,7 +652,7 @@
- 	    int h = height();
- 	    KviTalListView *lv = listView();
- 	    if (lv)
--	        h = qMax(lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
-+	        h = qMax(lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
- 	                  h);
- 	    h = qMax(h, TQApplication::globalStrut().height());
- 	    setHeight(h);
-@@ -666,7 +666,7 @@
- 	        if (myType == RadioButtonController && pixmap(0)) {
- 	            //             r += 0;
- 	        } else {
--	            r +=  lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
-+	            r +=  lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
- 	        }
- 	    }
- 	    return qMax(r, TQApplication::globalStrut().width());
-@@ -700,7 +700,7 @@
- 	        parentControl = true;
- 	
- 	    TQFontMetrics fm(lv->fontMetrics());
--	    int boxsize = lv->tqstyle()->tqpixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
-+	    int boxsize = lv->tqstyle()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
- 	                                           TQStyle::PM_CheckListButtonSize, 0, lv);
- 	    int marg = lv->itemMargin();
- 	    int r = marg;
-@@ -782,7 +782,7 @@
- 	         (lv->rootIsDecorated() || myType == RadioButton ||
- 	          (myType == CheckBox && parentControl))) {
- 	        TQRect rect;
--	        int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
-+	        int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
- 	        if (lv->columnAlignment(0) == TQt::AlignCenter) {
- 	            TQFontMetrics fm(lv->font());
- 	            int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
-@@ -1216,7 +1216,7 @@
- 		return;
- 	
- 	    TQPoint pos;
--	    int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
-+	    int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
- 	    if ( activatedPos( pos ) ) {
- 		bool parentControl = FALSE;
- 		if ( parent() && parent()->rtti() == 1  &&
-@@ -1388,7 +1388,7 @@
- 	    int h = height();
- 	    KviTalListView *lv = listView();
- 	    if ( lv )
--		h = TQMAX( lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv),
-+		h = TQMAX( lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv),
- 			  h );
- 	    h = TQMAX( h, TQApplication::globalStrut().height() );
- 	    setHeight( h );
-@@ -1402,7 +1402,7 @@
- 		if ( myType == RadioButtonController && pixmap( 0 ) ) {
- 		    //	     r += 0;
- 		} else {
--		    r +=  lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
-+		    r +=  lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
- 		}
- 	    }
- 	    return TQMAX( r, TQApplication::globalStrut().width() );
-@@ -1420,7 +1420,7 @@
- 	
- 	    const BackgroundMode bgmode = lv->viewport()->backgroundMode();
- 	    const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
--	    if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
-+	    if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
- 		p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
- 	    else
- 		lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
-@@ -1437,7 +1437,7 @@
- 		parentControl = TRUE;
- 	
- 	    TQFontMetrics fm( lv->fontMetrics() );
--	    int boxsize = lv->tqstyle().tqpixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
-+	    int boxsize = lv->tqstyle().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
- 						   TQStyle::PM_CheckListButtonSize, lv);
- 	    int marg = lv->itemMargin();
- 	    int r = marg;
-@@ -1519,7 +1519,7 @@
- 		 (lv->rootIsDecorated() || myType == RadioButton ||
- 		  (myType == CheckBox && parentControl) ) ) {
- 		TQRect rect;
--		int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
-+		int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
- 		if ( lv->columnAlignment(0) == AlignCenter ) {
- 		    TQFontMetrics fm( lv->font() );
- 		    int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
-diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
-index 53b7c03..a0aee30 100644
---- a/src/kvilib/tal/kvi_tal_wizard.cpp
-+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
-@@ -184,7 +184,7 @@ KviTalWizard::KviTalWizard(TQWidget * pParent)
- #endif
- 	m_p->pStepsLabel = new TQLabel(this);
- 	m_p->pStepsLabel->setMinimumWidth(80);
--	m_p->pStepsLabel->tqsetAlignment(TQt::AlignRight);
-+	m_p->pStepsLabel->setAlignment(TQt::AlignRight);
- #ifdef COMPILE_USE_QT4
- 	m_p->pLayout->addWidget(m_p->pStepsLabel,0,4,1,3);
- #else
-diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
-index 30f26dc..c0afdad 100644
---- a/src/kvirc/kernel/kvi_app.cpp
-+++ b/src/kvirc/kernel/kvi_app.cpp
-@@ -228,7 +228,7 @@ void KviApp::setup()
- 	//need to load image plugins:(
- 	TQString szPluginsDir;
- 	getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/");
--	tqsetLibraryPaths(TQStringList(szPluginsDir));
-+	setLibraryPaths(TQStringList(szPluginsDir));
- 	//KviMessageBox::information(libraryPaths().join(";"));
- 	//debug("%1",loader.isLoaded());
- #endif
-@@ -696,11 +696,11 @@ void KviApp::contextSensitiveHelp()
- #ifndef COMPILE_USE_QT4
- 	// the F1 Key has been pressed
- 	// try to pass it to the active widget or one of its parents
--	TQWidget * w = g_pApp->tqfocusWidget();
-+	TQWidget * w = g_pApp->focusWidget();
- 	while(w)
- 	{
- 		//TQVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG
--		TQMetaObject * o = w->tqmetaObject();
-+		TQMetaObject * o = w->metaObject();
- 		if(o)
- 		{
- 			int i = o->findProperty("contextSensitiveHelp",true);
-@@ -1368,7 +1368,7 @@ void KviApp::updateApplicationFont()
- 	if(KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont))
- 	{
- 		if(font() != KVI_OPTION_FONT(KviOption_fontApplication))
--			tqsetFont(KVI_OPTION_FONT(KviOption_fontApplication),true);
-+			setFont(KVI_OPTION_FONT(KviOption_fontApplication),true);
- 	}
- 	// FIXME: #warning "And what if this option is turned off ?...a reboot only"
- }
-diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
-index 6a9ad8a..ad8ce5a 100644
---- a/src/kvirc/kernel/kvi_app_fs.cpp
-+++ b/src/kvirc/kernel/kvi_app_fs.cpp
-@@ -228,7 +228,7 @@ bool KviApp::trashFile(const char *filename)
- 	KviStr lastPart = filename;
- 	lastPart.cutToLast(KVI_PATH_SEPARATOR_CHAR); // need only the filename
- 	lastPart.append(".bak_");
--	TQDateTime tm(TQDateTime::tqcurrentDateTime());
-+	TQDateTime tm(TQDateTime::currentDateTime());
- 	lastPart.append(tm.toString());
- 	lastPart.replaceAll(' ',"_");
- 	// Ok...have lastPart.bak_Dec_11_31_1999
-diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
-index 4c91a48..ec6085a 100644
---- a/src/kvirc/kernel/kvi_ircconnection.cpp
-+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
-@@ -981,10 +981,10 @@ void KviIrcConnection::loginToIrcServer()
- 	if(KVI_OPTION_BOOL(KviOption_boolPrependGenderInfoToRealname) && !KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).isEmpty())
- 	{
- 		szGenderTag.append(KVI_TEXT_COLOR);
--		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false))
-+		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false))
- 		{
- 			szGenderTag.append("1");
--		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false))
-+		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false))
- 		{
- 			szGenderTag.append("2");
- 		}
-@@ -1017,9 +1017,9 @@ void KviIrcConnection::loginToIrcServer()
- 		}
- 	} // else buuug
- 	
--	if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){
-+	if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){
- 			e->setGender(KviIrcUserEntry::Male);
--	} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){
-+	} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){
- 			e->setGender(KviIrcUserEntry::Female);
- 	}
- 
-diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-index f092b62..fa3ae79 100644
---- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-@@ -70,7 +70,7 @@ KviIrcConnectionTargetResolver::KviIrcConnectionTargetResolver(KviIrcConnection
- 	m_pServerDns = 0;
- 
- 	m_eState = Idle;
--	m_etqStatus = Success;
-+	m_eStatus = Success;
- 
- 	m_iLastError = KviError_success;
- }
-@@ -544,12 +544,12 @@ void KviIrcConnectionTargetResolver::haveServerIp()
- 	terminate(Success,KviError_success);
- }
- 
--void KviIrcConnectionTargetResolver::terminate(tqStatus s,int iLastError)
-+void KviIrcConnectionTargetResolver::terminate(Status s,int iLastError)
- {
- 	__ASSERT(m_eState != Terminated);
- 	cleanup(); // do a cleanup anyway
- 	m_eState = Terminated;
--	m_etqStatus = s;
-+	m_eStatus = s;
- 	m_iLastError = iLastError;
- 	emit terminated();
- }
-diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
-index 4d5d72c..a37f595 100644
---- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
-+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
-@@ -44,13 +44,13 @@ protected:
- 	KviIrcConnectionTargetResolver(KviIrcConnection * pConnection);
- 	~KviIrcConnectionTargetResolver();
- public:
--	enum tqStatus { Success, Error };
-+	enum Status { Success, Error };
- 	enum State { Idle, Running, Terminated };
- private:
- 	KviIrcConnection             * m_pConnection;       // shallow, never null
- 	KviIrcConnectionTarget       * m_pTarget;           // shallow, never null
- 	KviConsole                   * m_pConsole;          // shallow, never null
--	tqStatus                         m_etqStatus;
-+	Status                         m_eStatus;
- 	State                          m_eState;
- 
- 	// Auxiliary stuff
-@@ -66,7 +66,7 @@ private:
- public:
- 	void start(KviIrcConnectionTarget * t);
- 	// valid only after the terminated() signal
--	tqStatus status(){ return m_etqStatus; };
-+	Status status(){ return m_eStatus; };
- 	int lastError(){ return m_iLastError; };
- 	// causes the resolver to terminate with iLastError == KviError_operationAborted
- 	// the terminated() signal is emitted.
-@@ -81,7 +81,7 @@ private:
- 	void lookupServerHostname();
- 	void haveServerIp();
- 	bool validateLocalAddress(const TQString &szAddress,TQString &szBuffer);
--	void terminate(tqStatus s,int iLastError);
-+	void terminate(Status s,int iLastError);
- signals:
- 	void terminated();
- };
-diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
-index 7a55ee9..05fed67 100644
---- a/src/kvirc/kernel/kvi_main.cpp
-+++ b/src/kvirc/kernel/kvi_main.cpp
-@@ -367,7 +367,7 @@ int main(int argc,char ** argv)
- 	bool bLocked = false;
- 	if(inf.exists())
- 	{
--		iLocked = inf.lastModified().secsTo(TQDateTime::tqcurrentDateTime());
-+		iLocked = inf.lastModified().secsTo(TQDateTime::currentDateTime());
- 	}
- 	*/
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
-index 7222f05..9abb9a7 100644
---- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
-@@ -55,7 +55,7 @@ KviKvsCallbackObject::~KviKvsCallbackObject()
- 	delete m_pMagicParams;
- }
- 
--KviKvsCallbackObject::CallbacktqStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal)
-+KviKvsCallbackObject::CallbackStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal)
- {
- 	// first of all check the window
- 	if(!m_pTargetWindow)
-diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/kvi_kvs_callbackobject.h
-index c45ec1b..fca4f89 100644
---- a/src/kvirc/kvs/kvi_kvs_callbackobject.h
-+++ b/src/kvirc/kvs/kvi_kvs_callbackobject.h
-@@ -49,7 +49,7 @@ public:
- 		// the callback is executed in another window (the associated console, if possible, otherwise the first available console)
- 		OnlyIfWindowExists = 1 
- 	};
--	enum CallbacktqStatus {
-+	enum CallbackStatus {
- 		// succesfull execution
- 		Success,
- 		// error in command
-@@ -76,7 +76,7 @@ protected:
- 	unsigned int        m_uFlags;
- protected:
- 	// the parameter list is always shallow!
--	CallbacktqStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0);
-+	CallbackStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0);
- };
- 
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
-index 677095d..eaae3fd 100644
---- a/src/kvirc/kvs/kvi_kvs_object.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
-@@ -1042,7 +1042,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
- 	kvs_int_t cnt = 0;
- 	if(m_pObject)
- 	{
--		const TQMetaObject *o = m_pObject->tqmetaObject();
-+		const TQMetaObject *o = m_pObject->metaObject();
- 		if(!bArray)
- 			w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for TQt class %s"),o->className());
- #ifndef COMPILE_USE_QT4
-@@ -1120,7 +1120,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
- 				cnt++;
- 			}
- #ifndef COMPILE_USE_QT4	
--			o = o->tqsuperClass();
-+			o = o->superClass();
- 		}
- #endif
- 
-@@ -1154,9 +1154,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
- 	}
- 
- #ifdef COMPILE_USE_QT4
--	int idx = m_pObject->tqmetaObject()->indexOfProperty(szName);
-+	int idx = m_pObject->metaObject()->indexOfProperty(szName);
- #else
--	int idx = m_pObject->tqmetaObject()->findProperty(szName,true);
-+	int idx = m_pObject->metaObject()->findProperty(szName,true);
- #endif
- 	if(idx < 0)
- 	{
-@@ -1164,10 +1164,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
- 		return true;
- 	}
- #ifdef COMPILE_USE_QT4
--	TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx);
-+	TQMetaProperty prop = m_pObject->metaObject()->property(idx);
- 	const TQMetaProperty * p = &prop;
- #else
--	const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true);
-+	const TQMetaProperty * p = m_pObject->metaObject()->property(idx,true);
- #endif
- 	if(!p)
- 	{
-@@ -1385,9 +1385,9 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c)
- 	}
- 
- #ifdef COMPILE_USE_QT4
--	int idx = m_pObject->tqmetaObject()->indexOfProperty(szName);
-+	int idx = m_pObject->metaObject()->indexOfProperty(szName);
- #else
--	int idx = m_pObject->tqmetaObject()->findProperty(szName,true);
-+	int idx = m_pObject->metaObject()->findProperty(szName,true);
- #endif
- 	if(idx < 0)
- 	{
-@@ -1400,10 +1400,10 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c)
- 		return true;
- 	}
- #ifdef COMPILE_USE_QT4
--	TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx);
-+	TQMetaProperty prop = m_pObject->metaObject()->property(idx);
- 	const TQMetaProperty * p = &prop;
- #else
--	const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true);
-+	const TQMetaProperty * p = m_pObject->metaObject()->property(idx,true);
- #endif
- 	if(!p)
- 	{
-diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-index a7aeacb..2f3219c 100644
---- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-@@ -330,7 +330,7 @@ void KviKvsProcessAsyncOperation::processExited()
- 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED)
- 	{
- 		TQString szRetVal;
--		szRetVal.setNum(m_pProcess->exitqStatus());
-+		szRetVal.setNum(m_pProcess->exiStatus());
- 		trigger(EventTerminated,szRetVal);
- 	}
- 	
-diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp
-index c9c4f4f..d77919d 100644
---- a/src/kvirc/kvs/kvi_kvs_script.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_script.cpp
-@@ -293,22 +293,22 @@ int KviKvsScript::executeInternal(KviKvsRunTimeContext * pContext)
- 	// lock this script
- 	m_pData->m_uLock++;
- 	
--	int iRuntqStatus = Success;
-+	int iRunStatus = Success;
- 
- 	if(!m_pData->m_pTree->execute(pContext))
- 	{
--		if(pContext->error())iRuntqStatus = Error;
-+		if(pContext->error())iRunStatus = Error;
- 		else {
- 			// else just a halt, return or sth like that
- 			if(pContext->haltCalled())
--				iRuntqStatus |= HaltEncountered;
-+				iRunStatus |= HaltEncountered;
- 		}
- 	}
- 	
- 	// we can't block any longer: unlock
- 	m_pData->m_uLock--;
- 
--	return iRuntqStatus;
-+	return iRunStatus;
- }
- 
- int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVariant * pRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData)
-@@ -343,13 +343,13 @@ int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVar
- 	if(iRunFlags & Quiet)
- 		ctx.disableReporting();
- 	
--	int iRuntqStatus = executeInternal(&ctx);
-+	int iRunStatus = executeInternal(&ctx);
- 	
- 	// don't forget to delete the params
- 	if(bDeleteParams)delete pParams;
- 	if(bDeleteRetVal)delete pRetVal;
-     pParams = 0; pRetVal = 0;
--	return iRuntqStatus;
-+	return iRunStatus;
- }
- 
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h
-index 2bfd6b8..60e96a0 100644
---- a/src/kvirc/kvs/kvi_kvs_script.h
-+++ b/src/kvirc/kvs/kvi_kvs_script.h
-@@ -52,7 +52,7 @@ class KVIRC_API KviKvsScript : public KviHeapObject
- 	friend class KviKvsParser;
- 	friend class KviKvsRunTimeContext;
- public:
--	enum RuntqStatus {
-+	enum RunStatus {
- 		// the script returned an error
- 		Error = 0,
- 		// the script ran succesfully
-@@ -97,7 +97,7 @@ public:
- 		Quiet = 8
- 	};
- 	// returns 0 (KviKvsScript::RunFailure) on error
--	// returns a nonzero combination of RuntqStatus flags on success
-+	// returns a nonzero combination of RunStatus flags on success
- 	int run(KviWindow * pWnd,                                // window that the command has to be bound to
- 				KviKvsVariantList * pParams = 0,              // parameter list (0 if you don't pass params) ownership transferred if PreserverParams is not used
- 				KviKvsVariant * pRetVal = 0,                  // return value buffer (0 if you ignore it)
-@@ -105,7 +105,7 @@ public:
- 				KviKvsExtendedRunTimeData * pExtData = 0);    // extended data (usually 0) (if you need to pass extended scope variables or alias switch lists...)
- 
- 	// returns 0 (KviKvsScript::RunFailure) on error
--	// returns a nonzero combination of RuntqStatus flags on success
-+	// returns a nonzero combination of RunStatus flags on success
- 	// this is probably used only in /eval
- 	int run(KviKvsRunTimeContext * pContext,int iRunFlags = 0);
- 
-@@ -118,12 +118,12 @@ public:
- 				KviKvsExtendedRunTimeData * pExtData = 0);
- 
- 	// static helpers for quick running
--	// returns a combination of RuntqStatus flags (nonzero on no error)
-+	// returns a combination of RunStatus flags (nonzero on no error)
- 	// does NOT take params ownership
- 	static int run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0);
- 	
- 	// static helper for quick evaluating parameters
--	// returns a combination of RuntqStatus flags (nonzero on no error)
-+	// returns a combination of RunStatus flags (nonzero on no error)
- 	// does NOT take params ownership
- 	// pRetVal CAN'T be zero here since we're evaluating stuff here
- 	static int evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal);
-@@ -137,14 +137,14 @@ protected:
- 	bool parse(KviWindow * pOutput = 0,
- 				int iRunFlags = 0);
- 	// returns 0 (KviKvsScript::RunFailure) on error
--	// returns a nonzero combination of RuntqStatus flags on success
-+	// returns a nonzero combination of RunStatus flags on success
- 	int execute(KviWindow * pWnd,
- 				KviKvsVariantList * pParams = 0,
- 				KviKvsVariant * pRetVal = 0,
- 				int iRunFlags = 0,
- 				KviKvsExtendedRunTimeData * pExtData = 0);
- 	// returns 0 (KviKvsScript::RunFailure) on error
--	// returns a nonzero combination of RuntqStatus flags on success
-+	// returns a nonzero combination of RunStatus flags on success
- 	int executeInternal(KviKvsRunTimeContext * pContext);
- 	const TQChar * buffer() const;
- 	// detaches this script from any other shallow copies
-diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-index b92afd9..86e129d 100644
---- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
-+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-@@ -1331,7 +1331,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg)
- 	{
- 		if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime))
- 		{
--			replyCtcp(msg,TQDateTime::tqcurrentDateTime().toString());
-+			replyCtcp(msg,TQDateTime::currentDateTime().toString());
- 		} else msg->bIgnored = true;
- 	}
- 
-@@ -1491,9 +1491,9 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
- 	if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpAvatar))
- 	{
- 		TQString szGenderTag=" ";
--		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){
-+		if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){
- 			szGenderTag.append("M");
--		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){
-+		} else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){
- 			szGenderTag.append("F");
- 		} else {
- 			szGenderTag.append("?");
-diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
-index 155a734..18ab099 100644
---- a/src/kvirc/sparser/kvi_sp_literal.cpp
-+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
-@@ -1402,7 +1402,7 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
- 
- 	chan->topicWidget()->setTopic(szTopic);
- 	chan->topicWidget()->setTopicSetBy(szNick);
--	TQString tmp = TQDateTime::tqcurrentDateTime().toString();
-+	TQString tmp = TQDateTime::currentDateTime().toString();
- 	chan->topicWidget()->setTopicSetAt(tmp);
- 
- 	chan->userAction(szNick,szUser,szHost,KVI_USERACTION_TOPIC);
-@@ -1800,7 +1800,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
- #define CHANNEL_MODE(__modefl,__evmeset,__evmeunset,__evset,__evunset,__icomeset,__icomeunset,__icoset,__icounset) \
- 			case __modefl: \
- 				aParam = msg->connection()->decodeText(msg->safeParam(curParam++)); \
--				chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),TQDateTime::tqcurrentDateTime().toTime_t()); \
-+				chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),TQDateTime::currentDateTime().toTime_t()); \
- 				auxMask = new KviIrcMask(aParam); \
- 				bIsMe = auxMask->matchesFixed( \
- 							msg->connection()->userInfo()->nickName(), \
-diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
-index b9e2f2b..c35b1fe 100644
---- a/src/kvirc/ui/kvi_channel.cpp
-+++ b/src/kvirc/ui/kvi_channel.cpp
-@@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
- 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging();
- 
- 	applyOptions();
--	m_joinTime = TQDateTime::tqcurrentDateTime();
-+	m_joinTime = TQDateTime::currentDateTime();
- 	m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t();
- 	
- 
-@@ -547,23 +547,23 @@ void KviChannel::resizeEvent(TQResizeEvent *e)
- {
- #ifdef COMPILE_USE_QT4
- 	int hght = m_pInput->heightHint();
--	int hght2 = m_pTopicWidget->tqsizeHint().height();
-+	int hght2 = m_pTopicWidget->sizeHint().height();
- 	m_pButtonBox->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- #else
- 	int hght = m_pInput->heightHint();
--	int hght2 = m_pButtonBox->tqsizeHint().height();
-+	int hght2 = m_pButtonBox->sizeHint().height();
- 	m_pButtonBox->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- #endif
- }
- 
--TQSize KviChannel::tqsizeHint() const
-+TQSize KviChannel::sizeHint() const
- {
--	TQSize ret(m_pSplitter->tqsizeHint().width(),
--		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height());
-+	TQSize ret(m_pSplitter->sizeHint().width(),
-+		m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height());
- 	return ret;
- }
- 
-@@ -655,7 +655,7 @@ void KviChannel::setAliveChan()
- 	m_iStateFlags = 0;
- 	setType(KVI_WINDOW_TYPE_CHANNEL);
- 	m_pUserListView->setUserDataBase(connection()->userDataBase());
--	m_joinTime = TQDateTime::tqcurrentDateTime();
-+	m_joinTime = TQDateTime::currentDateTime();
- 	context()->unregisterDeadChannel(this);
- 	connection()->registerChannel(this);
- 	// Update log file name
-@@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA
- 	
- 		if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
- 		{
--			if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
-+			if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
- 			{
- 				// we can't exactly estimate
- 				if(dSpan < 60.0)dSpan = 60.0;
-@@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
- 
- 	if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
- 	{
--		if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
-+		if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
- 		{
- 			// we can't exactly estimate
- 			s->bStatsInaccurate = true;
-diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
-index 45a4801..3c86b6a 100644
---- a/src/kvirc/ui/kvi_channel.h
-+++ b/src/kvirc/ui/kvi_channel.h
-@@ -233,7 +233,7 @@ public:
- 	void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); };
- 	char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); };
- 	bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); };
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); };
- 	KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0)
- 		{ return m_pUserListView->join(nick,user,host,iFlags); };
-diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
-index fdce502..b2a19f4 100644
---- a/src/kvirc/ui/kvi_console.cpp
-+++ b/src/kvirc/ui/kvi_console.cpp
-@@ -1087,15 +1087,15 @@ void KviConsole::applyOptions()
- void KviConsole::resizeEvent(TQResizeEvent *e)
- {
- 	int hght = m_pInput->heightHint();
--	int hght2 = m_pButtonBox->tqsizeHint().height();
-+	int hght2 = m_pButtonBox->sizeHint().height();
- 	m_pButtonBox->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- }
- 
--TQSize KviConsole::tqsizeHint() const
-+TQSize KviConsole::sizeHint() const
- {
--	TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
-+	TQSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
- 	return ret;
- }
- 
-diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
-index 18c02ee..a32ae7f 100644
---- a/src/kvirc/ui/kvi_console.h
-+++ b/src/kvirc/ui/kvi_console.h
-@@ -101,7 +101,7 @@ protected:
- 	virtual void getBaseLogFileName(TQString &buffer);
- 	virtual void getTaskBarTipText(TQString &buffer);
- 	virtual void fillContextPopup(KviTalPopupMenu * p);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual void applyOptions();
- 	virtual void triggerCreationEvents();
- 	void fillStatusString();
-@@ -181,7 +181,7 @@ public:
- 
- 	void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0);
- 
--	// tqStatus string (usermode + nick) (connection related too)
-+	// Status string (usermode + nick) (connection related too)
- 	const TQString & statusString(){ return m_szStatusString; };
- 	
- 	// forwarders from KviIrcConnection
-diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
-index 83ac72e..1af4c18 100644
---- a/src/kvirc/ui/kvi_cryptcontroller.cpp
-+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
-@@ -107,9 +107,9 @@
- 		m_pDescriptionLabel = new TQLabel(this);
- 		m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel);
- #ifdef COMPILE_USE_QT4
--		m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
-+		m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
- #else
--		m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
-+		m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
- #endif
- 		g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3);
- 
-diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
-index da82146..8a151e6 100644
---- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
-+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
-@@ -103,7 +103,7 @@ void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,co
- 	TQLabel * l = new TQLabel(this);
- 	l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
- 	//l->setMaximumWidth(600);
--	TQString date = TQDateTime::tqcurrentDateTime().toString();
-+	TQString date = TQDateTime::currentDateTime().toString();
- 
- 	TQString tmp = "<center>";
- 	tmp += __tr2qs("You have been paged by");
-diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
-index 828eb02..e6b234e 100644
---- a/src/kvirc/ui/kvi_customtoolbar.cpp
-+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
-@@ -62,17 +62,17 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c
- 	m_pToolBar = pParent;
- 	setBackgroundMode(pParent->backgroundMode());
- 	setBackgroundOrigin(ParentOrigin);
--	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
-+	setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
- }
- 
--TQSize KviCustomToolBarSeparator::tqsizeHint() const
-+TQSize KviCustomToolBarSeparator::sizeHint() const
- {
- #ifdef COMPILE_USE_QT4
- 	TQStyleOption opt;
- 	opt.initFrom(this);
--	int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
-+	int extent = tqstyle()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
- #else
--	int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
-+	int extent = tqstyle().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
- #endif
- 	if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0);
- 	else return TQSize(0,extent);
-@@ -88,7 +88,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *)
- #else
- 	TQStyle::SFlags flags = TQStyle::Style_Default;
- 	if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal;
--	tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags);
-+	tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
- #endif
- }
- 
-@@ -293,7 +293,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e)
- 				boxLayout()->insertWidget(idx,m_pDraggedChild);
- #ifdef COMPILE_KDE_SUPPORT
- 				// bleah ://///
--				insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx);
-+				insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx);
- #endif
- #endif
- 				TQEvent ev(TQEvent::LayoutHint);
-diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
-index ec6483b..d02ad59 100644
---- a/src/kvirc/ui/kvi_customtoolbar.h
-+++ b/src/kvirc/ui/kvi_customtoolbar.h
-@@ -41,7 +41,7 @@ class KviCustomToolBarSeparator : public TQWidget
-   TQ_OBJECT
- public:
- 	KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name);
--	TQSize tqsizeHint() const;
-+	TQSize sizeHint() const;
- protected:
- 	KviCustomToolBar * m_pToolBar;
- protected:
-diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
-index 8110967..dcbb49d 100644
---- a/src/kvirc/ui/kvi_debugwindow.cpp
-+++ b/src/kvirc/ui/kvi_debugwindow.cpp
-@@ -124,9 +124,9 @@ void KviDebugWindow::resizeEvent(TQResizeEvent *e)
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- }
- 
--TQSize KviDebugWindow::tqsizeHint() const
-+TQSize KviDebugWindow::sizeHint() const
- {
--	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
-+	TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
- 	return ret;
- }
- 
-diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h
-index 616752a..1eab1ee 100644
---- a/src/kvirc/ui/kvi_debugwindow.h
-+++ b/src/kvirc/ui/kvi_debugwindow.h
-@@ -49,7 +49,7 @@ protected:
- 	virtual void loadProperties(KviConfig * cfg);
- 	virtual void saveProperties(KviConfig * cfg);
- 	virtual void getBaseLogFileName(TQString &buffer);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- };
- 
- #endif //_KVI_DEBUGWINDOW_H_
-diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
-index db5efa8..96c63e6 100644
---- a/src/kvirc/ui/kvi_frame.cpp
-+++ b/src/kvirc/ui/kvi_frame.cpp
-@@ -879,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd)
- 	if(wnd->isMaximized() && wnd->mdiParent())updateCaption();
- 	m_pTaskBar->setActiveItem(wnd->taskBarItem());
- 
--	//wnd->gainedActiveWindowtqStatus(); // <-- atm unused
-+	//wnd->gainedActiveWindowStatus(); // <-- atm unused
- 	
- 	if(g_pActiveWindow->view())
- 		g_pActiveWindow->view()->clearUnreaded();
-@@ -1165,7 +1165,7 @@ void KviFrame::toolbarsPopupSelected(int id)
- bool KviFrame::focusNextPrevChild(bool next)
- {
- 	//debug("FOCUS NEXT PREV CHILD");
--	TQWidget * w = tqfocusWidget();
-+	TQWidget * w = focusWidget();
- 	if(w)
- 	{
- #ifdef COMPILE_USE_QT4
-diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
-index a4c89ad..03eeeee 100644
---- a/src/kvirc/ui/kvi_imagedialog.cpp
-+++ b/src/kvirc/ui/kvi_imagedialog.cpp
-@@ -67,7 +67,7 @@ void KviImageDialogItem::paint(TQPainter * p)
- 		p->drawRect(3,3,pm->width() + 4,pm->height() + 4);
- 	}
- 
--	TQRect daRect(listBox()->tqitemRect(this));
-+	TQRect daRect(listBox()->itemRect(this));
- 
- 	p->setPen(TQt::black);
- 	p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2);
-@@ -361,7 +361,7 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
- {
- 	KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt);
- 	if(!it)return;
--	TQRect r = m_pListBox->tqitemRect(it);
-+	TQRect r = m_pListBox->itemRect(it);
- 	KviImageDialogItem * i = (KviImageDialogItem *)it;
- 	m_pTip->tip(r,i->tipText());
- }
-diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
-index 5258577..5445738 100644
---- a/src/kvirc/ui/kvi_input.cpp
-+++ b/src/kvirc/ui/kvi_input.cpp
-@@ -299,10 +299,10 @@ void KviInputEditor::dropEvent(TQDropEvent *e)
- 
- int  KviInputEditor::heightHint() const
- {
--	return tqsizeHint().height();
-+	return sizeHint().height();
- }
- 
--TQSize KviInputEditor::tqsizeHint() const
-+TQSize KviInputEditor::sizeHint() const
- {
- 	//grabbed from qlineedit.cpp
- 	constPolish();
-@@ -2335,7 +2335,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
- 	m_pButtonContainer->setSpacing(0);
- 
- #ifdef COMPILE_USE_QT4
--	m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
-+	m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
- //	if(m_pButtonContainer->tqlayout())
- //		m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize);
- #endif
-@@ -2396,9 +2396,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
- 	m_pInputEditor = new KviInputEditor(this,par,view);
- 	connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed()));
- #ifdef COMPILE_USE_QT4
--	m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored));
-+	m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored));
- #else
--	m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored));
-+	m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored));
- #endif
- 	
- 
-diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
-index 777fb41..6e2d5c9 100644
---- a/src/kvirc/ui/kvi_input.h
-+++ b/src/kvirc/ui/kvi_input.h
-@@ -144,7 +144,7 @@ protected:
- 	bool			 m_bReadOnly;
- public:
- 	int  heightHint() const;
--	virtual TQSize  tqsizeHint() const;
-+	virtual TQSize  sizeHint() const;
- 	void setText(const TQString text);
- 	TQString text() { return m_szTextBuffer; };
- 	void insertChar(TQChar c);
-diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
-index 0e12d2d..df15e02 100644
---- a/src/kvirc/ui/kvi_ipeditor.cpp
-+++ b/src/kvirc/ui/kvi_ipeditor.cpp
-@@ -208,7 +208,7 @@ void KviIpEditor::recreateChildren()
- 			m_pEdit[i] = new TQLineEdit(this);
- 			m_pEdit[i]->installEventFilter(this);
- 			m_pEdit[i]->setFrame(false);
--			m_pEdit[i]->tqsetAlignment(TQt::AlignCenter);
-+			m_pEdit[i]->setAlignment(TQt::AlignCenter);
- 		}
- 		//m_pEdit[i]->setMinimumWidth(minWidth);
- 		m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4);
-@@ -243,8 +243,8 @@ void KviIpEditor::recreateChildren()
- 			}
- 		}
- 	}
--	//setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width()));
--	setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4);
-+	//setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width()));
-+	setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4);
- 	resizeEvent(0);
- }
- 
-@@ -395,7 +395,7 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e)
- 	if(m_pEdit[0])
- 	{
- 		int maxW = (m_addrType == IpV4) ? 4 : 8;
--		int labHint = m_pLabel[0]->tqsizeHint().width();
-+		int labHint = m_pLabel[0]->sizeHint().width();
- 		int hghHint = height() - 4;
- 		int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW;
- 		int curX = 2;
-@@ -413,16 +413,16 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e)
- 	if(e)TQFrame::resizeEvent(e);
- }
- 
--TQSize KviIpEditor::tqsizeHint()
-+TQSize KviIpEditor::sizeHint()
- {
- 	if(m_pEdit[0])
- 	{
--		int labHint = m_pLabel[0]->tqsizeHint().width();
--		int hghHint = m_pEdit[0]->tqsizeHint().height();
--		int ediHint = m_pEdit[0]->tqsizeHint().width();
-+		int labHint = m_pLabel[0]->sizeHint().width();
-+		int hghHint = m_pEdit[0]->sizeHint().height();
-+		int ediHint = m_pEdit[0]->sizeHint().width();
- 		if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4);
- 		else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4);
--	} else return TQFrame::tqsizeHint();
-+	} else return TQFrame::sizeHint();
- }
- 
- 
-diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
-index 19e2a3c..625f164 100644
---- a/src/kvirc/ui/kvi_ipeditor.h
-+++ b/src/kvirc/ui/kvi_ipeditor.h
-@@ -55,7 +55,7 @@ public:
- protected:
- 	virtual bool eventFilter(TQObject * o,TQEvent *e);
- 	virtual void resizeEvent(TQResizeEvent *e);
--	virtual TQSize tqsizeHint();
-+	virtual TQSize sizeHint();
- private:
- 	void recreateChildren();
- };
-diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
-index e551771..2f2a237 100644
---- a/src/kvirc/ui/kvi_irctoolbar.cpp
-+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
-@@ -77,7 +77,7 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char *
- 	setMouseTracking(true);
- 	m_bResizeMode = false;
- 
--	m_tqsizeHint = TQSize(180,32);
-+	m_sizeHint = TQSize(180,32);
- 	m_bSizeLoaded = false;
- }
- 
-@@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth)
- 
- void KviToolBarGraphicalApplet::setupSizeHint()
- {
--	m_tqsizeHint = TQSize(loadAppletWidth(),22);
-+	m_sizeHint = TQSize(loadAppletWidth(),22);
- 	m_bSizeLoaded = true;
- }
- 
--TQSize KviToolBarGraphicalApplet::tqsizeHint() const
-+TQSize KviToolBarGraphicalApplet::sizeHint() const
- {
- 	// forget constness :(
- 	KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this;
- 	if(!m_bSizeLoaded)that->setupSizeHint();
--	return m_tqsizeHint;
-+	return m_sizeHint;
- }
- 
- /*
-@@ -127,7 +127,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e)
- 			int w = e->pos().x();
- 			if(w < 32)w = 32;
- 			if(w > 480)w = 480;
--			m_tqsizeHint = TQSize(w,22);
-+			m_sizeHint = TQSize(w,22);
- 			resize(w,height());
- 			g_pApp->postEvent(parentWidget(),new TQEvent(TQEvent::LayoutHint));
- 		}
-@@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e)
- 
- KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet()
- {
--	saveAppletWidth(m_tqsizeHint.width());
-+	saveAppletWidth(m_sizeHint.width());
- 	g_pToolBarGraphicalAppletList->removeRef(this);
- 	if(g_pToolBarGraphicalAppletList->isEmpty())
- 	{
-@@ -208,10 +208,10 @@ void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e)
- 	drawContents(&pa);
- 
- 	//Need to draw the sunken rect around the view now...
--	pa.setPen(tqcolorGroup().dark());
-+	pa.setPen(colorGroup().dark());
- 	pa.drawLine(0,0,width(),0);
- 	pa.drawLine(0,0,0,width());
--	pa.setPen(tqcolorGroup().light());
-+	pa.setPen(colorGroup().light());
- 	pa.drawLine(1,height() - 1,width() - 1,height() - 1);
- 	pa.drawLine(width() - 1,1,width() - 1,height());
- 
-@@ -332,7 +332,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &)
- 
- 
- /*
--TQSize KviIrcContextDisplay::tqsizeHint() const
-+TQSize KviIrcContextDisplay::sizeHint() const
- {
- 	return TQSize(160,22);
- }
-@@ -416,7 +416,7 @@ void KviIrcContextDisplay::drawContents(TQPainter * p)
- 	
- 		p->setClipping(false);
- 
--		TQColor base = tqcolorGroup().background();
-+		TQColor base = colorGroup().background();
- 		TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS);
- 		base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1,
- 			(base.blue() + cntx.blue()) >> 1);
-diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
-index dd6c93e..1b1d94e 100644
---- a/src/kvirc/ui/kvi_irctoolbar.h
-+++ b/src/kvirc/ui/kvi_irctoolbar.h
-@@ -55,7 +55,7 @@ public:
- private:
- 	bool m_bResizeMode;
- 	bool m_bSizeLoaded;
--	TQSize m_tqsizeHint;
-+	TQSize m_sizeHint;
- private:
- 	void resizeMemBuffer();
- protected:
-@@ -63,7 +63,7 @@ protected:
- 
- 	virtual unsigned int loadAppletWidth();
- 	virtual void saveAppletWidth(unsigned int uWidth);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual void mouseMoveEvent(TQMouseEvent *e);
- 	virtual void mousePressEvent(TQMouseEvent *e);
- 	virtual void mouseReleaseEvent(TQMouseEvent *e);
-diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
-index a500c46..9d469f7 100644
---- a/src/kvirc/ui/kvi_ircview.cpp
-+++ b/src/kvirc/ui/kvi_ircview.cpp
-@@ -165,7 +165,7 @@
- 
- #define KVI_DEF_BACK 200
- 
--// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)"
-+// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)"
- 
- //
- // FIXME: PgUp and PgDn scrolls a fixed number of lines!
-@@ -532,7 +532,7 @@ void KviIrcView::stopLogging()
- 	if(m_pLogFile)
- 	{
- 		TQString szLogEnd;
--		szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data());
-+		szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data());
- 		
- 		add2Log(szLogEnd);	
- 		m_pLogFile->close();
-@@ -706,7 +706,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer)
- 	}
- 
- 	TQString szLogStart;
--	szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data());
-+	szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data());
- 	add2Log(szLogStart);
- 	if(bPrependCurBuffer)
- 	{
-@@ -803,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint)
- 
- void KviIrcView::checkLogDate()
- {
--	TQDate::tqcurrentDate();
-+	TQDate::currentDate();
- }
- 
- void KviIrcView::clearUnreaded()
-@@ -1264,7 +1264,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags)
- 		{
- 			TQString szBuffer;
- 			kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr));
--			szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] "));
-+			szBuffer.prepend(TQDateTime::currentDateTime().toString("[h:mm:ss] "));
- 			if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled())
- 			{
- 				add2Log(szBuffer,iMsgType);
-@@ -1923,7 +1923,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType,
- 	if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp))
- 	{
- 		TQString szTimestamp;
--		szTimestamp=TQDateTime::tqcurrentDateTime ( 
-+		szTimestamp=TQDateTime::currentDateTime ( 
- 				KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString(
- 					KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) );
- 		szTimestamp.append(' ');
-@@ -3428,10 +3428,10 @@ no_selection_paint:
- 	}
- 	
- 	//Need to draw the sunken rect around the view now...
--	pa.setPen(tqcolorGroup().dark());
-+	pa.setPen(colorGroup().dark());
- 	pa.drawLine(0,0,widgetWidth,0);
- 	pa.drawLine(0,0,0,widgetHeight);
--	pa.setPen(tqcolorGroup().light());
-+	pa.setPen(colorGroup().light());
- 	widgetWidth--;
- 	pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1);
- 	pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight);
-@@ -3858,7 +3858,7 @@ void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &f
- 
- void KviIrcView::resizeEvent(TQResizeEvent *)
- {
--	int iScr = m_pScrollBar->tqsizeHint().width();
-+	int iScr = m_pScrollBar->sizeHint().width();
- 	int iLeft = width()-iScr;
- 	m_pToolsButton->setGeometry(iLeft,0,iScr,iScr);
- 	m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr);
-@@ -3873,7 +3873,7 @@ void KviIrcView::resizeEvent(TQResizeEvent *)
- 	}
- }
- 
--TQSize KviIrcView::tqsizeHint() const
-+TQSize KviIrcView::sizeHint() const
- {
- 	TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT);
- 	return ret;
-@@ -3900,7 +3900,7 @@ void KviIrcView::showToolsPopup()
- 	m_pToolsPopup->insertSeparator();
- 	m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer()));
- 	
--	TQSize s = m_pToolsPopup->tqsizeHint();
-+	TQSize s = m_pToolsPopup->sizeHint();
- 
- 	m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height())));
- }
-@@ -3959,7 +3959,7 @@ void KviIrcView::toggleToolWidget()
- 
- 	} else {
- 		m_pToolWidget = new KviIrcViewToolWidget(this);
--		int w = m_pToolWidget->tqsizeHint().width();
-+		int w = m_pToolWidget->sizeHint().width();
- 		m_pToolWidget->move(width() - (w + 40),10);
- 		m_pToolWidget->show();
- 	}
-diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
-index 092d5ed..84b485f 100644
---- a/src/kvirc/ui/kvi_ircview.h
-+++ b/src/kvirc/ui/kvi_ircview.h
-@@ -197,7 +197,7 @@ public:
- 	void nextLine();
- 	void nextPage();
- 	void prevPage();
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	const TQString & lastLineOfText();
- 	const TQString & lastMessageText();
- 	virtual void setFont(const TQFont &f);
-diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
-index f1d47c9..7f57350 100644
---- a/src/kvirc/ui/kvi_mdicaption.cpp
-+++ b/src/kvirc/ui/kvi_mdicaption.cpp
-@@ -81,11 +81,11 @@ void KviMdiCaptionButton::drawButton(TQPainter *p)
- #ifdef COMPILE_USE_QT4
- 	TQBrush b(parentWidget()->palette().window());
- #else
--	TQBrush b(parentWidget()->tqcolorGroup().background());
-+	TQBrush b(parentWidget()->colorGroup().background());
- #endif
- 	
- 	if(isDown())
--		qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b);
-+		qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b);
- 	else
- 		p->fillRect(0,0,width(),height(),b);
- 
-@@ -229,7 +229,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e)
- 	TQPainter p(this);
- 	p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive));
- 	TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
--	rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup());
-+	rt.draw(&p,height() + 2,-1,rect(),colorGroup());
- }
- 
- void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *)
-@@ -278,7 +278,7 @@ KviMenuBarToolButton::~KviMenuBarToolButton()
- {
- }
- 
--TQSize KviMenuBarToolButton::tqsizeHint() const
-+TQSize KviMenuBarToolButton::sizeHint() const
- {
- 	return TQSize(20,20);
- }
-diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h
-index c46572a..d214d9a 100644
---- a/src/kvirc/ui/kvi_mdicaption.h
-+++ b/src/kvirc/ui/kvi_mdicaption.h
-@@ -57,7 +57,7 @@ public:
- 	KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name);
- 	~KviMenuBarToolButton();
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- };
- 
- 
-diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
-index 2bf0130..248a2a1 100644
---- a/src/kvirc/ui/kvi_mdichild.cpp
-+++ b/src/kvirc/ui/kvi_mdichild.cpp
-@@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &
- void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight)
- {
- 	if(m_pClient){
--		minWidth  = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1);
--		minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+
-+		minWidth  = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1);
-+		minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+
- 					m_pCaption->heightHint() + KVI_MDICHILD_SPACING;
- 	}
- 	if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH;
-@@ -508,10 +508,10 @@ void KviMdiChild::setClient(TQWidget *w)
- */
- 	//linkChildren(w);
- 
--	if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && 
--		m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){
--		setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1));
--		setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) +
-+	if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && 
-+		m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){
-+		setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1));
-+		setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) +
- 					m_pCaption->heightHint() + KVI_MDICHILD_SPACING);
- 	}
- 
-@@ -561,16 +561,16 @@ void KviMdiChild::focusInEvent(TQFocusEvent *)
- #endif
- }
- 
--TQSize KviMdiChild::tqsizeHint()
-+TQSize KviMdiChild::sizeHint()
- {
- 	if(m_pClient)
- 	{
--		TQSize s = m_pClient->tqsizeHint();
-+		TQSize s = m_pClient->sizeHint();
- 		TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1),
- 				s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint());
- 		return ret;
- 	}
--	return TQFrame::tqsizeHint();
-+	return TQFrame::sizeHint();
- }
- 
- 
-diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
-index feac48b..6d7b879 100644
---- a/src/kvirc/ui/kvi_mdichild.h
-+++ b/src/kvirc/ui/kvi_mdichild.h
-@@ -77,7 +77,7 @@ public:
- 	const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; };
- 	const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; };
- 	void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive);
--	virtual TQSize tqsizeHint();
-+	virtual TQSize sizeHint();
- 	void setIcon(const TQPixmap &pix);
- 	const TQPixmap * icon();
- 	void enableClose(bool bEnable);
-diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
-index 9163595..59f5850 100644
---- a/src/kvirc/ui/kvi_mdimanager.cpp
-+++ b/src/kvirc/ui/kvi_mdimanager.cpp
-@@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
- 		{
- 			lpC->setFocus();
- 			/*
--			if(tqtopLevelWidget()->isActiveWindow())
-+			if(topLevelWidget()->isActiveWindow())
- 			{
- 				
- 			}
-@@ -284,8 +284,8 @@ TQPoint KviMdiManager::getCascadePoint(int indexOfWindow)
- 	if(indexOfWindow==0)return pnt;
- 	KviMdiChild *lpC=m_pZ->first();
- 	int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20);
--	int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT);
--	int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH);
-+	int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT);
-+	int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH);
- 	int ax=0;
- 	int ay=0;
- 	for(int i=0;i<indexOfWindow;i++)
-@@ -814,7 +814,7 @@ void KviMdiManager::cascadeWindows()
- 		{
- 			TQPoint p = getCascadePoint(idx);
- 			moveChild(lpC,p.x(),p.y());
--			lpC->resize(lpC->tqsizeHint());
-+			lpC->resize(lpC->sizeHint());
- 			idx++;
- 		}
- 		list.removeFirst();
-@@ -844,8 +844,8 @@ void KviMdiManager::cascadeMaximized()
- 			TQPoint pnt(getCascadePoint(idx));
- 			moveChild(lpC,pnt.x(),pnt.y());
- 			TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y());
--			if((lpC->tqminimumSize().width() > curSize.width()) ||
--				(lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize());
-+			if((lpC->minimumSize().width() > curSize.width()) ||
-+				(lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize());
- 			else lpC->resize(curSize);
- 			idx++;
- 		}
-@@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal)
- 
- 	int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible);
- 	int xQuantum=viewport()->width()/pColstable[numToHandle-1];
--	if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){
-+	if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){
- 		if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space");
- 		else tileAllInternal(pColrecall[numToHandle-1],bHorizontal);
- 		return;
- 	}
- 	int yQuantum=viewport()->height()/pRowstable[numToHandle-1];
--	if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){
-+	if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){
- 		if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space");
- 		else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal);
- 		return;
-diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
-index 8b959a7..d0dae63 100644
---- a/src/kvirc/ui/kvi_optionswidget.cpp
-+++ b/src/kvirc/ui/kvi_optionswidget.cpp
-@@ -676,7 +676,7 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n
- 
- void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2)
- {
--	TQWidget * w = tqtopLevelWidget();
-+	TQWidget * w = topLevelWidget();
- 	if(!w)return;
- 	if(!w->inherits("KviGeneralOptionsDialog"))return;
- 
-diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
-index ce26661..a5455bb 100644
---- a/src/kvirc/ui/kvi_query.cpp
-+++ b/src/kvirc/ui/kvi_query.cpp
-@@ -559,15 +559,15 @@ TQPixmap * KviQuery::myIconPtr()
- void KviQuery::resizeEvent(TQResizeEvent *e)
- {
- 	int hght = m_pInput->heightHint();
--	int hght2 = m_pButtonBox->tqsizeHint().height();
-+	int hght2 = m_pButtonBox->sizeHint().height();
- 	m_pButtonBox->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- }
- 
--TQSize KviQuery::tqsizeHint() const
-+TQSize KviQuery::sizeHint() const
- {
--	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
-+	TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
- 	return ret;
- }
- 
-diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
-index 3b1a81b..d0a12e5 100644
---- a/src/kvirc/ui/kvi_query.h
-+++ b/src/kvirc/ui/kvi_query.h
-@@ -66,7 +66,7 @@ public:
- 	void setDeadQuery();
- 	void setAliveQuery();
- 	bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; };
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual const TQString & target(){ return windowName(); };
- 	virtual void applyOptions();
- 	KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host);
-diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
-index c3e5473..f63392e 100644
---- a/src/kvirc/ui/kvi_selectors.cpp
-+++ b/src/kvirc/ui/kvi_selectors.cpp
-@@ -513,7 +513,7 @@ KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor *
- 
- void KviColorSelector::setButtonPalette(TQColor * pOption)
- {
--	TQPalette pal(*pOption,tqcolorGroup().background());
-+	TQPalette pal(*pOption,colorGroup().background());
- 	m_memColor = *pOption;
- 	m_pButton->setPalette(pal);
- 
-diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
-index 861facd..1985217 100644
---- a/src/kvirc/ui/kvi_statusbar.cpp
-+++ b/src/kvirc/ui/kvi_statusbar.cpp
-@@ -106,9 +106,9 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
- 	m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel");
- 	m_pMessageLabel->setMargin(1);
- #ifdef COMPILE_USE_QT4
--	m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft);
-+	m_pMessageLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft);
- #else
--	m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft);
-+	m_pMessageLabel->setAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft);
- #endif
- 	m_pMessageLabel->setMinimumWidth(350);
- 	
-@@ -210,7 +210,7 @@ void KviStatusBar::layoutChildren()
- 	int h = height() - (VMARGIN * 2);
- 	for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev())
- 	{
--		int w = a->tqsizeHint().width();
-+		int w = a->sizeHint().width();
- 		x -= w;
- 		a->setGeometry(x,VMARGIN,w,h);
- 		x -= SPACING;
-@@ -237,11 +237,11 @@ bool KviStatusBar::event(TQEvent * e)
- void KviStatusBar::recalcMinimumHeight()
- {
- 	int s = 18;
--	int h = m_pMessageLabel->tqsizeHint().height();
-+	int h = m_pMessageLabel->sizeHint().height();
- 	if(h > s)s = h;
- 	for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev())
- 	{
--		h = a->tqsizeHint().height();
-+		h = a->sizeHint().height();
- 		if(h > s)s = h;
- 	}
- 	s += (VMARGIN * 2) + RICHTEXTLABELTRICK;
-@@ -467,9 +467,9 @@ void KviStatusBar::paintEvent(TQPaintEvent * e)
- {
- 	// avoid the ugly rectangle around the widgets painted by TQStatusBar
- //	TQPainter p(this);
--//	style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1));
-+//	style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),colorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1));
- 	//TQStatusBar::paintEvent(e);
--	//qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0);
-+	//qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0);
- }
- 
- void KviStatusBar::mousePressEvent(TQMouseEvent * e)
-diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
-index 629fae9..e67cef1 100644
---- a/src/kvirc/ui/kvi_styled_controls.cpp
-+++ b/src/kvirc/ui/kvi_styled_controls.cpp
-@@ -279,7 +279,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event)
- 		
- 		pDoubleBufferPixmap->fill(
- 			bActive ? TQColor(206,215,223) :
--			tqcolorGroup().background()
-+			colorGroup().background()
- 			);
- 		
- 		
-diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
-index ad47661..952501f 100644
---- a/src/kvirc/ui/kvi_taskbar.cpp
-+++ b/src/kvirc/ui/kvi_taskbar.cpp
-@@ -290,7 +290,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
- 	if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator))
- 	{
- 		iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT;
--		TQColor base = tqcolorGroup().background();
-+		TQColor base = colorGroup().background();
- 		if(m_pWindow->console())
- 		{
- 			TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS);
-@@ -298,7 +298,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
- 				(base.blue() + cntx.blue()) >> 1);
- 			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base);
- 		} else {
--			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background));
-+			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(TQColorGroup::Background));
- 		}
- 	}
- 
-@@ -394,7 +394,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
- 	{
- 		pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height());
- 		TQColor base = pPainter->pen().color();
--		TQColor bg   = tqcolorGroup().color(TQColorGroup::Background);
-+		TQColor bg   = colorGroup().color(TQColorGroup::Background);
- 		base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2);
- 		pPainter->setPen(base);
- 		cRect.setWidth(cRect.width() + 10);
-@@ -907,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
- #ifdef COMPILE_PSEUDO_TRANSPARENCY
- 			if(g_pShadedChildGlobalDesktopBackground)
- 			{
--				TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy())));
-+				TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
- 				p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
- 			} else {
- #endif
-@@ -918,7 +918,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
- 			TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap();
- 			if(pix)
- 			{
--				TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy())));
-+				TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
- 				//p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y());
- //				debug("%i %i",pnt.x(),pnt.y());
- 				p.translate(-pnt.x(),-pnt.y());
-@@ -1192,7 +1192,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct)
- #ifdef COMPILE_PSEUDO_TRANSPARENCY
- 	if(g_pShadedChildGlobalDesktopBackground)
- 	{
--		TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy())));
-+		TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy())));
- 		p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
- 	} else {
- #endif
-@@ -1204,7 +1204,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct)
- 	TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap();
- 	if(pix)
- 	{
--		TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy())));
-+		TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy())));
- 		//p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y());
- 		KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y());
- 	}
-@@ -1235,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar()
- 	// FIXME: this code is useless ?
- 	if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48)
- 		KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48;
--	int iMin = m_pListView->tqminimumSize().width() + 4;
-+	int iMin = m_pListView->minimumSize().width() + 4;
- 	if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth))
- 		iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth);
-     setMinimumWidth(iMin);
-@@ -1305,7 +1305,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
- 		{
- 			TQString szText;
- 			((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText);
--			m_pToolTip->tip(m_pListView->tqitemRect(it),szText);
-+			m_pToolTip->tip(m_pListView->itemRect(it),szText);
- 		}
- 	}
- }
-diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
-index 1f57db0..ef54460 100644
---- a/src/kvirc/ui/kvi_themedlabel.cpp
-+++ b/src/kvirc/ui/kvi_themedlabel.cpp
-@@ -44,9 +44,9 @@ KviThemedLabel::~KviThemedLabel()
- {
- }
- 
--/*TQSize KviThemedLabel::tqsizeHint()
-+/*TQSize KviThemedLabel::sizeHint()
- {
--	TQSize size=TQFrame::tqsizeHint();
-+	TQSize size=TQFrame::sizeHint();
- 	int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
- 	size.setHeight(iHeight);
- 	return size;
-diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h
-index a307149..f704310 100644
---- a/src/kvirc/ui/kvi_themedlabel.h
-+++ b/src/kvirc/ui/kvi_themedlabel.h
-@@ -55,7 +55,7 @@ public:
- 	void setAutoHeight(bool value) { m_bAutoHeight=value; };
- 	void applyOptions();
- 	
--//	TQSize tqsizeHint();
-+//	TQSize sizeHint();
- signals:
- 	void doubleClicked();
- };
-diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
-index 65c6dec..b45f7be 100644
---- a/src/kvirc/ui/kvi_toolwindows_container.cpp
-+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
-@@ -94,7 +94,7 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const T
- 	setToggleButton(true);
- 	setOn(bOn);
- 
--//	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored));
-+//	setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored));
- }
- 
- KviWindowToolPageButton::~KviWindowToolPageButton()
-@@ -106,9 +106,9 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
- {
- 	TQPixmap pixmap( height(), width() );
- 	if(isOn())
--		pixmap.fill(tqcolorGroup().mid());
-+		pixmap.fill(colorGroup().mid());
- 	else
--    		pixmap.fill(tqcolorGroup().button()); 
-+    		pixmap.fill(colorGroup().button()); 
-     	TQPainter painter( &pixmap );
-     	
- 	TQPixmap icon;
-@@ -118,7 +118,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
- 		icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off);
- 		
- 	// Draw the frame
--	//painter.setPen( tqcolorGroup().mid() );
-+	//painter.setPen( colorGroup().mid() );
- 	//if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 );
- 	//painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 );
- 	
-@@ -127,7 +127,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
- 	TQString str = text();
- 	str.remove("&");
- 	const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2;
--	painter.setPen( tqcolorGroup().buttonText() );
-+	painter.setPen( colorGroup().buttonText() );
- 	const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() );
- 	painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str );
- 	
-diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
-index fe9011e..63fd4e6 100644
---- a/src/kvirc/ui/kvi_topicw.cpp
-+++ b/src/kvirc/ui/kvi_topicw.cpp
-@@ -74,7 +74,7 @@ int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const
- 
- void KviListBoxTopicItem::paint ( TQPainter * p )
- {
--	KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox()));
-+	KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox()));
- }
- 
- 
-@@ -438,11 +438,11 @@ void KviTopicWidget::drawContents(TQPainter *p)
- #ifdef COMPILE_PSEUDO_TRANSPARENCY
- 	}
- #endif
--	TQColorGroup tqcolorGroup;
--	//tqcolorGroup()
--	tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
--	tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
--	paintColoredText(p,m_szTopic,tqcolorGroup);
-+	TQColorGroup colorGroup;
-+	//colorGroup()
-+	colorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
-+	colorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
-+	paintColoredText(p,m_szTopic,colorGroup);
- }
- 
- void KviTopicWidget::setTopic(const TQString & topic)
-@@ -541,7 +541,7 @@ void KviTopicWidget::updateToolTip()
- 	KviTalToolTip::add(this,txt);
- }
- 
--TQSize KviTopicWidget::tqsizeHint() const
-+TQSize KviTopicWidget::sizeHint() const
- {
- 	TQFontMetrics fm(font());
- 	int hght = fm.lineSpacing() + (frameWidth() << 1) + 4;
-diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
-index 5a59ced..89e4901 100644
---- a/src/kvirc/ui/kvi_topicw.h
-+++ b/src/kvirc/ui/kvi_topicw.h
-@@ -102,7 +102,7 @@ public:
- 	const TQString & topic(){ return m_szTopic; };
- 	const TQString & topicSetBy(){ return m_szSetBy; };
- 	const TQString & topicSetAt(){ return m_szSetAt; };
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	void applyOptions();
- 	
- 	static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1);
-diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
-index d504915..cc3d866 100644
---- a/src/kvirc/ui/kvi_userlistview.cpp
-+++ b/src/kvirc/ui/kvi_userlistview.cpp
-@@ -1141,7 +1141,7 @@ void KviUserListView::resizeEvent(TQResizeEvent *)
- 	int hght;
- 	if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N  2005
- 	{
--		hght = m_pUsersLabel->tqsizeHint().height();
-+		hght = m_pUsersLabel->sizeHint().height();
- 		if(hght < 16)hght = 16; // at least
- 		m_pUsersLabel->setGeometry(0,0,width(),hght);
- 	}
-@@ -1531,9 +1531,9 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
- 							p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/));
- 							if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID))
- 								p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY);
--							p.setPen(tqcolorGroup().shadow());
-+							p.setPen(colorGroup().shadow());
- 							p.drawLine(0,bottom - 1,wdth,bottom - 1);
--							p.setPen(tqcolorGroup().light());
-+							p.setPen(colorGroup().light());
- 							p.drawLine(0,theY,wdth,theY);
- 							theY--;
- 						}
-@@ -1725,10 +1725,10 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
- 	//we really do not need any self-draw borders. 
- 	//if we will need it, we will draw a better one with system style
- 
--	//p.setPen(tqcolorGroup().dark());
-+	//p.setPen(colorGroup().dark());
- 	//p.drawLine(0,0,wdth,0);
- 	//p.drawLine(0,0,0,height());
--	//p.setPen(tqcolorGroup().light());
-+	//p.setPen(colorGroup().light());
- 	//p.drawLine(1,height()-1,wdth,height()-1);
- 	//p.drawLine(wdth - 1,1,wdth - 1,height());
- 
-@@ -1742,7 +1742,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
- 
- void KviUserListViewArea::resizeEvent(TQResizeEvent *)
- {
--	int iScr = m_pScrollBar->tqsizeHint().width();
-+	int iScr = m_pScrollBar->sizeHint().width();
- 	m_pScrollBar->setGeometry(width() - iScr,0,iScr,height());
- 	m_pScrollBar->setPageStep(height());
- 	m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1);
-diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
-index 6c959e7..e0c8621 100644
---- a/src/kvirc/ui/kvi_window.cpp
-+++ b/src/kvirc/ui/kvi_window.cpp
-@@ -285,7 +285,7 @@ void KviWindow::demandAttention()
- 
- bool KviWindow::focusNextPrevChild(bool next)
- {
--	TQWidget * w = tqfocusWidget();
-+	TQWidget * w = focusWidget();
- 	if(w)
- 	{
- #ifdef COMPILE_USE_QT4
-@@ -299,9 +299,9 @@ bool KviWindow::focusNextPrevChild(bool next)
- 		if(w->parent())
- 		{
- #ifdef COMPILE_USE_QT4
--			if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
-+			if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
- #else
--			if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
-+			if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
- #endif
- 				return false; // Do NOT change the focus widget!
- 		}
-@@ -586,7 +586,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer)
- {
- 	// FIXME: #warning "Make it configurable ?"
- 	TQString date;
--	TQDate dt(TQDate::tqcurrentDate());
-+	TQDate dt(TQDate::currentDate());
- 	date=dt.toString("yyyy.MM.dd");
- 	TQString base;
- 	getBaseLogFileName(base);
-@@ -1224,7 +1224,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
- 	for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it)
- 	{
- 		TQObject * child = *it;
--		if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){
-+		if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){
- 		//	if (child->isWidgetType())
- 			((TQWidget *)child)->update();
- 		}
-@@ -1239,7 +1239,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
- 		{
- 			TQObject * child = list.at(i);
- 			// FIXME: check if this code can work with qt < 3.0.0 too
--			if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1)
-+			if(child->metaObject()->findProperty("TransparencyCapable",true) != -1)
- 				((TQWidget *)child)->update();
- 
- 			updateBackgrounds(child);
-diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
-index 47f18ad..52651e2 100644
---- a/src/modules/about/aboutdialog.cpp
-+++ b/src/modules/about/aboutdialog.cpp
-@@ -86,7 +86,7 @@ KviAboutDialog::KviAboutDialog()
- 	TQLabel * l = new TQLabel(w);
- 	l->setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- 	l->setBackgroundColor(TQt::black);
--	l->tqsetAlignment(TQt::AlignCenter);
-+	l->setAlignment(TQt::AlignCenter);
- 	l->setPixmap(pix);
- 
- 	g->addWidget(l,0,0);
-@@ -99,7 +99,7 @@ KviAboutDialog::KviAboutDialog()
- 	aboutString += KVI_SOURCES_DATE;
- 
- 	l = new TQLabel(aboutString,w);
--	l->tqsetAlignment(TQt::AlignCenter);
-+	l->setAlignment(TQt::AlignCenter);
- 	g->addWidget(l,1,0);
- 
- 	addTab(w,__tr2qs_ctx("About","about"));
-diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
-index 5957d90..a0ac665 100644
---- a/src/modules/actioneditor/actioneditor.cpp
-+++ b/src/modules/actioneditor/actioneditor.cpp
-@@ -980,7 +980,7 @@ TQPixmap * KviActionEditorWindow::myIconPtr()
- 
- void KviActionEditorWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pBase->tqsizeHint().height();
-+	int hght = m_pBase->sizeHint().height();
- 	m_pEditor->setGeometry(0,0,width(),height()- hght);
- 	m_pBase->setGeometry(0,height() - hght,width(),hght);
- }
-diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
-index 24c539f..8b08c54 100644
---- a/src/modules/addon/managementdialog.cpp
-+++ b/src/modules/addon/managementdialog.cpp
-@@ -213,7 +213,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p)
- 		lb->setFixedWidth(pix->width());
- 	}
- 	lb->setBackgroundColor(TQt::black);
--	lb->tqsetAlignment(TQt::AlignBottom | TQt::AlignRight);
-+	lb->setAlignment(TQt::AlignBottom | TQt::AlignRight);
- 	*/
- 	m_pListView = new KviScriptAddonListView(this);
- 	g->addMultiCellWidget(m_pListView,0,10,1,1);
-diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
-index e7bd5d7..0f1201e 100644
---- a/src/modules/aliaseditor/aliaseditor.cpp
-+++ b/src/modules/aliaseditor/aliaseditor.cpp
-@@ -1383,7 +1383,7 @@ TQPixmap * KviAliasEditorWindow::myIconPtr()
- 
- void KviAliasEditorWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pBase->tqsizeHint().height();
-+	int hght = m_pBase->sizeHint().height();
- 	m_pEditor->setGeometry(0,0,width(),height()- hght);
- 	m_pBase->setGeometry(0,height() - hght,width(),hght);
- }
-diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp
-index 1b73121..b1682bc 100644
---- a/src/modules/clock/libkviclock.cpp
-+++ b/src/modules/clock/libkviclock.cpp
-@@ -169,7 +169,7 @@ void KviClockDisplay::drawContents(TQPainter *p)
- 
- }
- 
--TQSize KviClockDisplay::tqsizeHint() const
-+TQSize KviClockDisplay::sizeHint() const
- {
- 	return TQSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT);
- }
-diff --git a/src/modules/clock/libkviclock.h b/src/modules/clock/libkviclock.h
-index 7c960df..a841047 100644
---- a/src/modules/clock/libkviclock.h
-+++ b/src/modules/clock/libkviclock.h
-@@ -38,7 +38,7 @@ protected:
- 	unsigned char m_uDigit[6];
- protected:
- 	virtual void drawContents(TQPainter * p);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual void timerEvent(TQTimerEvent *e);
- };
- 
-diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
-index 4110c21..f472817 100644
---- a/src/modules/dcc/broker.cpp
-+++ b/src/modules/dcc/broker.cpp
-@@ -81,7 +81,7 @@ KviDccZeroPortTag * KviDccBroker::addZeroPortTag()
- 	static unsigned int g_uNextZeroPortTag = 0;
- 	g_uNextZeroPortTag++;
- 	KviDccZeroPortTag * t = new KviDccZeroPortTag;
--	t->m_tTimestamp = TQDateTime::tqcurrentDateTime();
-+	t->m_tTimestamp = TQDateTime::currentDateTime();
- 	t->m_szTag.setNum(g_uNextZeroPortTag);
- 	//t->m_szTag.prepend("mIrc-zero-port-");
- 	t->m_uResumePosition = 0;
-@@ -94,7 +94,7 @@ KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const TQString &szTag)
- {
- 	KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag);
- 	if(!t)return 0;
--	if(t->m_tTimestamp.secsTo(TQDateTime::tqcurrentDateTime()) > 180)
-+	if(t->m_tTimestamp.secsTo(TQDateTime::currentDateTime()) > 180)
- 	{
- 		// too late man...
- 		m_pZeroPortTags->remove(szTag);
-diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
-index 6b5f687..cea1b91 100644
---- a/src/modules/dcc/canvas.cpp
-+++ b/src/modules/dcc/canvas.cpp
-@@ -258,16 +258,16 @@ bool KviDccCanvas::event(TQEvent *e)
- void KviDccCanvas::resizeEvent(TQResizeEvent *e)
- {
- 	int hght = m_pInput->heightHint();
--//	int hght2 = m_pTopSplitter->tqsizeHint().height();
-+//	int hght2 = m_pTopSplitter->sizeHint().height();
- //	m_pTopSplitter->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,0,width(),height() - hght);
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- }
- 
--TQSize KviDccCanvas::tqsizeHint() const
-+TQSize KviDccCanvas::sizeHint() const
- {
--	TQSize ret(m_pIrcView->tqsizeHint().width(),
--		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
-+	TQSize ret(m_pIrcView->sizeHint().width(),
-+		m_pIrcView->sizeHint().height() + m_pInput->heightHint());
- 	return ret;
- }
- 
-diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
-index 38349ca..6c48125 100644
---- a/src/modules/dcc/canvas.h
-+++ b/src/modules/dcc/canvas.h
-@@ -61,7 +61,7 @@ protected:
- 	virtual void getBaseLogFileName(KviStr &buffer);
- 	virtual TQPixmap * myIconPtr();
- 	virtual void resizeEvent(TQResizeEvent *e);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual bool event(TQEvent *e);
- 	virtual void ownMessage(const char *text);
- 	virtual void ownAction(const char *text);
-diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
-index e007a3c..47bacf5 100644
---- a/src/modules/dcc/canvaswidget.cpp
-+++ b/src/modules/dcc/canvaswidget.cpp
-@@ -1540,9 +1540,9 @@ KviCanvasWidget::~KviCanvasWidget()
- 
- void KviCanvasWidget::resizeEvent(TQResizeEvent *)
- {
--	int h = m_pMenuBar->tqsizeHint().height();
-+	int h = m_pMenuBar->sizeHint().height();
- 	m_pMenuBar->setGeometry(0,0,width(),h);
--	int h2 = m_pStatusLabel->tqsizeHint().height();
-+	int h2 = m_pStatusLabel->sizeHint().height();
- 	m_pStatusLabel->setGeometry(0,height() - h2,width(),h2);
- 	m_pSplitter->setGeometry(0,h,width(),height() - (h + h2));
- }
-diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
-index 7e41034..660191f 100644
---- a/src/modules/dcc/chat.cpp
-+++ b/src/modules/dcc/chat.cpp
-@@ -473,16 +473,16 @@ bool KviDccChat::event(TQEvent *e)
- void KviDccChat::resizeEvent(TQResizeEvent *e)
- {
- 	int hght = m_pInput->heightHint();
--	int hght2 = m_pTopSplitter->tqsizeHint().height();
-+	int hght2 = m_pTopSplitter->sizeHint().height();
- 	m_pTopSplitter->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
- 	m_pInput->setGeometry(0,height() - hght,width(),hght);
- }
- 
--TQSize KviDccChat::tqsizeHint() const
-+TQSize KviDccChat::sizeHint() const
- {
--	TQSize ret(m_pIrcView->tqsizeHint().width(),
--		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
-+	TQSize ret(m_pIrcView->sizeHint().width(),
-+		m_pIrcView->sizeHint().height() + m_pInput->heightHint());
- 	return ret;
- }
- 
-diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
-index c278591..bf492b3 100644
---- a/src/modules/dcc/chat.h
-+++ b/src/modules/dcc/chat.h
-@@ -81,7 +81,7 @@ protected:
- 	virtual void getBaseLogFileName(KviStr &buffer);
- 	virtual TQPixmap * myIconPtr();
- 	virtual void resizeEvent(TQResizeEvent *e);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual const TQString & localNick();
- 	virtual bool event(TQEvent *e);
- 	virtual void ownMessage(const TQString &text);
-diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
-index ce6949f..56f28b3 100644
---- a/src/modules/dcc/libkvidcc.cpp
-+++ b/src/modules/dcc/libkvidcc.cpp
-@@ -2369,16 +2369,16 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
- 
- 
- /*
--	@doc: dcc.transfertqStatus
-+	@doc: dcc.transferStatus
- 	@type:
- 		function
- 	@title:
--		$dcc.transfertqStatus
-+		$dcc.transferStatus
- 	@short:
- 		Returns the current status of a dcc file transfer
- 	@syntax:
--		<string> $dcc.transfertqStatus
--		<string> $dcc.transfertqStatus(<dcc_id:uint>)
-+		<string> $dcc.transferStatus
-+		<string> $dcc.transferStatus(<dcc_id:uint>)
- 	@description:
- 		Returns the status in the specified DCC session.[br]
- 		The status is one of the strings "connecting", "transferring", "success" and "failure".
-@@ -2393,7 +2393,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
- 		See the [module:dcc]dcc module[/module] documentation for more informations.[br]
- */
- 
--static bool dcc_kvs_fnc_transfertqStatus(KviKvsModuleFunctionCall * c)
-+static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c)
- {
- 	kvs_uint_t uDccId;
- 	KVSM_PARAMETERS_BEGIN(c)
-@@ -2669,7 +2669,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
- 		[fnc]$dcc.sessionList[/fnc][br]
- 		[fnc]$dcc.protocol[/fnc][br]
- 		[fnc]$dcc.connectionType[/fnc][br]
--		[fnc]$dcc.transfertqStatus[/fnc][br]
-+		[fnc]$dcc.transferStatus[/fnc][br]
- 		[fnc]$dcc.isFileTransfer[/fnc][br]
- 		[fnc]$dcc.isFileUpload[/fnc][br]
- 		[fnc]$dcc.isFileDownload[/fnc][br]
-@@ -2708,7 +2708,7 @@ static bool dcc_module_init(KviModule * m)
- 
- 	// FIXME: file upload / download state ?
- 
--	KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transfertqStatus);
-+	KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transferStatus);
- 	KVSM_REGISTER_FUNCTION(m,"protocol",dcc_kvs_fnc_protocol);
- 	KVSM_REGISTER_FUNCTION(m,"connectionType",dcc_kvs_fnc_connectionType);
- 	KVSM_REGISTER_FUNCTION(m,"isFileTransfer",dcc_kvs_fnc_isFileTransfer);
-diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
-index a7485ca..969a54a 100644
---- a/src/modules/dcc/send.cpp
-+++ b/src/modules/dcc/send.cpp
-@@ -753,7 +753,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
- 	m_tTransferEndTime = 0;
- 
- 	m_szStatusString = __tr2qs_ctx("Setting up the connection","dcc");
--	m_eGeneraltqStatus = Connecting;
-+	m_eGeneralStatus = Connecting;
- 
- 	bool bOk;
- 	m_uTotalFileSize = dcc->bRecvFile ? dcc->szFileSize.toUInt(&bOk) :  dcc->szLocalFileSize.toUInt(&bOk);
-@@ -919,7 +919,7 @@ void KviDccFileTransfer::abort()
- 	else if(m_pSlaveSendThread)tmp.setNum(m_pSlaveSendThread->sentBytes());
- 	else tmp = '0';
- 
--	m_eGeneraltqStatus = Failure;
-+	m_eGeneralStatus = Failure;
- 	m_tTransferEndTime = kvi_unixTime();
- 	m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
- 	m_szStatusString += __tr2qs_ctx("Aborted","dcc");
-@@ -988,7 +988,7 @@ void KviDccFileTransfer::retryRevDCC()
- 
- void KviDccFileTransfer::fillStatusString(TQString &szBuffer)
- {
--	switch(m_eGeneraltqStatus)
-+	switch(m_eGeneralStatus)
- 	{
- 		case Connecting:
- 			szBuffer = "connecting";
-@@ -1010,7 +1010,7 @@ void KviDccFileTransfer::fillStatusString(TQString &szBuffer)
- 
- bool KviDccFileTransfer::active()
- {
--	return ((m_eGeneraltqStatus == Connecting) || (m_eGeneraltqStatus == Transferring));
-+	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Transferring));
- }
- 
- int KviDccFileTransfer::bandwidthLimit()
-@@ -1108,7 +1108,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei
- {
- 
- 	TQString txt;
--	bool bIsTerminated = ((m_eGeneraltqStatus == Success) || (m_eGeneraltqStatus == Failure));
-+	bool bIsTerminated = ((m_eGeneralStatus == Success) || (m_eGeneralStatus == Failure));
- 
- 	switch(column)
- 	{
-@@ -1117,7 +1117,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei
- 			int xoffset = 0;
- 			int yoffset = 0;
- 			if(m_pDescriptor->bRecvFile)yoffset = 64;
--			switch(m_eGeneraltqStatus)
-+			switch(m_eGeneralStatus)
- 			{
- 				case Connecting: xoffset = 0; break;
- 				case Transferring: xoffset = 48; break;
-@@ -1396,7 +1396,7 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons
- 		if(t->localFileName() == szLocalFileName)
- #endif
- 		{
--			if(t->m_eGeneraltqStatus != Failure)
-+			if(t->m_eGeneralStatus != Failure)
- 				return t;
- 		}
- 	}
-@@ -1456,7 +1456,7 @@ void KviDccFileTransfer::outputAndLog(int msgtype,const TQString &s)
- 
- void KviDccFileTransfer::addToTransferLog(const TQString &s)
- {
--	TQDateTime dt = TQDateTime::tqcurrentDateTime();
-+	TQDateTime dt = TQDateTime::currentDateTime();
- 	TQString ts;
- 	ts.sprintf("[%4d.%2d.%2d %2d:%2d:%2d] ",dt.date().year(),dt.date().month(),dt.date().day(),dt.time().hour(),dt.time().minute(),dt.time().second());
- 	m_szTransferLog += ts+s;
-@@ -1602,7 +1602,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
- 
- 				m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
- 				m_szStatusString += szErrorString;
--				m_eGeneraltqStatus = Failure;
-+				m_eGeneralStatus = Failure;
- 				m_tTransferEndTime = kvi_unixTime();
- 
- 				KVS_TRIGGER_EVENT_3(KviEvent_OnDCCFileTransferFailed,
-@@ -1642,7 +1642,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
- 				if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data());
- 				m_szStatusString = __tr2qs_ctx("Transfer completed","dcc");
- 				outputAndLog(m_szStatusString);
--				m_eGeneraltqStatus = Success;
-+				m_eGeneralStatus = Success;
- 				m_tTransferEndTime = kvi_unixTime();
- 
- 				KVS_TRIGGER_EVENT_2(KviEvent_OnDCCFileTransferSuccess,
-@@ -1677,7 +1677,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
- void KviDccFileTransfer::handleMarshalError(int err)
- {
- 	TQString szErr = KviError::getDescription(err);
--	m_eGeneraltqStatus = Failure;
-+	m_eGeneralStatus = Failure;
- 	m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
- 	m_szStatusString += szErr;
- 	outputAndLog(m_szStatusString);
-@@ -1731,7 +1731,7 @@ void KviDccFileTransfer::connected()
- 		m_pSlaveSendThread->start();
- 	}
- 
--	m_eGeneraltqStatus = Transferring;
-+	m_eGeneralStatus = Transferring;
- 	m_szStatusString = __tr2qs_ctx("Transferring data","dcc");
- 
- 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCFileTransferBegin,eventWindow(),m_pDescriptor->idString());
-diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
-index a5e80be..8b03306 100644
---- a/src/modules/dcc/send.h
-+++ b/src/modules/dcc/send.h
-@@ -173,7 +173,7 @@ class KviTalPopupMenu;
- 
- class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
- {
--	enum GeneraltqStatus { Connecting , Transferring , Success , Failure };
-+	enum GeneralStatus { Connecting , Transferring , Success , Failure };
- 	Q_OBJECT
-   TQ_OBJECT
- public:
-@@ -190,7 +190,7 @@ private:
- 	TQString                  m_szTransferIdString;
- 
- 	TQString                  m_szStatusString;
--	GeneraltqStatus            m_eGeneraltqStatus;
-+	GeneralStatus            m_eGeneralStatus;
- 
- 	TQString                  m_szTransferLog; // html
- 
-diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
-index e9d8a2a..deec445 100644
---- a/src/modules/dcc/voice.cpp
-+++ b/src/modules/dcc/voice.cpp
-@@ -886,16 +886,16 @@ void KviDccVoice::updateInfo()
- 
- void KviDccVoice::resizeEvent(TQResizeEvent *e)
- {
--	int hght2 = m_pHBox->tqsizeHint().height();
-+	int hght2 = m_pHBox->sizeHint().height();
- 	m_pHBox->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
- }
- 
--TQSize KviDccVoice::tqsizeHint() const
-+TQSize KviDccVoice::sizeHint() const
- {
--	int w = m_pIrcView->tqsizeHint().width();
--	int w2 = m_pHBox->tqsizeHint().width();
--	TQSize ret(w > w2 ? w : w2, m_pIrcView->tqsizeHint().height() + m_pHBox->tqsizeHint().height());
-+	int w = m_pIrcView->sizeHint().width();
-+	int w2 = m_pHBox->sizeHint().width();
-+	TQSize ret(w > w2 ? w : w2, m_pIrcView->sizeHint().height() + m_pHBox->sizeHint().height());
- 	return ret;
- }
- 
-diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
-index c241f4a..4989960 100644
---- a/src/modules/dcc/voice.h
-+++ b/src/modules/dcc/voice.h
-@@ -124,7 +124,7 @@ protected:
- 	virtual void fillCaptionBuffers();
- 	virtual TQPixmap * myIconPtr();
- 	virtual void resizeEvent(TQResizeEvent *e);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual bool event(TQEvent *e);
- 	virtual void getBaseLogFileName(KviStr &buffer);
- 	void startTalking();
-diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
-index 7e3149f..4080479 100644
---- a/src/modules/dialog/libkvidialog.cpp
-+++ b/src/modules/dialog/libkvidialog.cpp
-@@ -222,7 +222,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
- 	{
- 		TQLabel * il = new TQLabel(this);
- 		il->setPixmap(*pix);
--		il->tqsetAlignment(TQt::AlignCenter);
-+		il->setAlignment(TQt::AlignCenter);
- 		g->addWidget(il,0,0);
- 		TQLabel * tl = new TQLabel(szLabel,this);
- 		g->addWidget(tl,0,1);
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-index 771db15..6978ce0 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-@@ -308,7 +308,7 @@ static const char * idlemsgs[NIDLEMSGS]=
- void KviDockWidget::enterEvent( TQEvent* )
- {
- #ifdef COMPILE_KDE_SUPPORT
--	if(!g_pApp->tqfocusWidget())
-+	if(!g_pApp->focusWidget())
- 	{
- 		XEvent ev;
- 		kvi_memset(&ev, 0, sizeof(ev));
-@@ -475,7 +475,7 @@ void KviDockWidget::fillContextPopup()
- 
- void KviDockWidget::toggleParentFrame()
- {
--	TQWidget *top_widget = m_pFrm->tqtopLevelWidget();
-+	TQWidget *top_widget = m_pFrm->topLevelWidget();
- 
- 	if(m_pFrm->isVisible()) {
- 		m_pFrm->hide();
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-index 00fd009..d1f4eff 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-@@ -307,7 +307,7 @@ void KviDockWidget::fillContextPopup()
- 
- void KviDockWidget::toggleParentFrame()
- {
--	TQWidget *top_widget = m_pFrm->tqtopLevelWidget();
-+	TQWidget *top_widget = m_pFrm->topLevelWidget();
- 
- 	if(m_pFrm->isVisible()) {
- 		m_pFrm->hide();
-diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
-index 25508d6..525acfd 100644
---- a/src/modules/editor/scripteditor.cpp
-+++ b/src/modules/editor/scripteditor.cpp
-@@ -1128,7 +1128,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
-  
- 	m_pFindlineedit = new TQLineEdit( this, "findlineedit" );
- #ifndef COMPILE_USE_QT4
--	m_pFindlineedit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_pFindlineedit->sizePolicy().hasHeightForWidth() ) );
-+	m_pFindlineedit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_pFindlineedit->sizePolicy().hasHeightForWidth() ) );
- 	m_pFindlineedit->setFrameShape( TQLineEdit::LineEditPanel );
- 	m_pFindlineedit->setFrameShadow( TQLineEdit::Sunken );
- #endif
-diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
-index fc7a4d4..3a6b6b2 100644
---- a/src/modules/eventeditor/eventeditor.cpp
-+++ b/src/modules/eventeditor/eventeditor.cpp
-@@ -476,7 +476,7 @@ TQPixmap * KviEventEditorWindow::myIconPtr()
- 
- void KviEventEditorWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pBase->tqsizeHint().height();
-+	int hght = m_pBase->sizeHint().height();
- 	m_pEditor->setGeometry(0,0,width(),height()- hght);
- 	m_pBase->setGeometry(0,height() - hght,width(),hght);
- }
-diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
-index f606837..3fcf59d 100644
---- a/src/modules/filetransferwindow/filetransferwindow.cpp
-+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
-@@ -233,7 +233,7 @@ void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const TQPoint &pn
- 	KviFileTransferItem * it = (KviFileTransferItem *)m_pListView->itemAt(pnt);
- 	if(!it)return;
- 	TQString txt = it->transfer()->tipText();
--	tip->tip(m_pListView->tqitemRect(it),txt);
-+	tip->tip(m_pListView->itemRect(it),txt);
- }
- 
- void KviFileTransferWindow::fillTransferView()
-@@ -701,9 +701,9 @@ void KviFileTransferWindow::resizeEvent(TQResizeEvent *e)
- 	m_pInput->setGeometry(0,height() - h,width(),h);
- }
- 
--TQSize KviFileTransferWindow::tqsizeHint() const
-+TQSize KviFileTransferWindow::sizeHint() const
- {
--	return m_pSplitter->tqsizeHint();
-+	return m_pSplitter->sizeHint();
- }
- 
- void KviFileTransferWindow::fillCaptionBuffers()
-diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
-index 963c12e..b213f6b 100644
---- a/src/modules/filetransferwindow/filetransferwindow.h
-+++ b/src/modules/filetransferwindow/filetransferwindow.h
-@@ -88,7 +88,7 @@ protected:
- 	virtual void fontChange(const TQFont &oldFont);
- 	bool eventFilter( TQObject *obj, TQEvent *ev );
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	int lineSpacing(){ return m_iLineSpacing; };
- protected slots:
- 	void transferRegistered(KviFileTransfer *t);
-diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
-index 67ee30b..c0f7f1c 100644
---- a/src/modules/help/helpwidget.cpp
-+++ b/src/modules/help/helpwidget.cpp
-@@ -108,7 +108,7 @@ void KviHelpWidget::showIndex()
- 
- void KviHelpWidget::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pToolBar->tqsizeHint().height();
-+	int hght = m_pToolBar->sizeHint().height();
- 	if(hght < 40)hght = 40;
- 	m_pToolBar->setGeometry(0,0,width(),hght);
- 	m_pTextBrowser->setGeometry(0,hght,width(),height() - hght);
-@@ -128,11 +128,11 @@ void KviHelpWidget::suicide()
- 	delete this;
- }
- 
--TQSize KviHelpWidget::tqsizeHint() const
-+TQSize KviHelpWidget::sizeHint() const
- {
--	int wdth = m_pTextBrowser->tqsizeHint().width();
--	if(m_pToolBar->tqsizeHint().width() > wdth)wdth = m_pToolBar->tqsizeHint().width();
--	TQSize s(wdth,m_pTextBrowser->tqsizeHint().height() + m_pToolBar->tqsizeHint().height());
-+	int wdth = m_pTextBrowser->sizeHint().width();
-+	if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width();
-+	TQSize s(wdth,m_pTextBrowser->sizeHint().height() + m_pToolBar->sizeHint().height());
- 	return s;
- }
- 
-diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
-index 9e2c1c4..48019e7 100644
---- a/src/modules/help/helpwidget.h
-+++ b/src/modules/help/helpwidget.h
-@@ -54,7 +54,7 @@ protected slots:
- 	void showIndex();
- 	void suicide();
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	TQTextBrowser * textBrowser() { return m_pTextBrowser; }
- };
- 
-diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
-index 8200348..1be7f5e 100644
---- a/src/modules/help/helpwindow.cpp
-+++ b/src/modules/help/helpwindow.cpp
-@@ -303,9 +303,9 @@ void KviHelpWindow::resizeEvent(TQResizeEvent *e)
- 	m_pSplitter->setGeometry(0,0,width(),height());
- }
- 
--TQSize KviHelpWindow::tqsizeHint() const
-+TQSize KviHelpWindow::sizeHint() const
- {
--	return m_pHelpWidget->tqsizeHint();
-+	return m_pHelpWidget->sizeHint();
- }
- void KviHelpWindow::fillCaptionBuffers()
- {
-diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
-index 300116f..1f24353 100644
---- a/src/modules/help/helpwindow.h
-+++ b/src/modules/help/helpwindow.h
-@@ -62,7 +62,7 @@ protected:
- 	virtual void saveProperties(KviConfig * cfg);
- 	virtual void loadProperties(KviConfig * cfg);
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	TQTextBrowser * textBrowser();
- public slots:
- 	void indexSelected ( int );
-diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
-index 789b7a1..cfe9087 100644
---- a/src/modules/http/httpfiletransfer.cpp
-+++ b/src/modules/http/httpfiletransfer.cpp
-@@ -67,7 +67,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
- 	connect(m_pHttpRequest,TQT_SIGNAL(receivedResponse(const TQString &)),this,TQT_SLOT(receivedResponse(const TQString &)));
- 	connect(m_pHttpRequest,TQT_SIGNAL(connectionEstabilished()),this,TQT_SLOT(connectionEstabilished()));
- 	
--	m_eGeneraltqStatus = Initializing;
-+	m_eGeneralStatus = Initializing;
- 	m_szStatusString = __tr2qs_ctx("Initializing","http");
- }
- 
-@@ -110,20 +110,20 @@ void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
- 
- bool KviHttpFileTransfer::active()
- {
--	return ((m_eGeneraltqStatus == Connecting) || (m_eGeneraltqStatus == Downloading));
-+	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Downloading));
- }
- 
- void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int height)
- {
- 	TQString txt;
--	bool bIsTerminated = ((m_eGeneraltqStatus == Success) || (m_eGeneraltqStatus == Failure));
-+	bool bIsTerminated = ((m_eGeneralStatus == Success) || (m_eGeneralStatus == Failure));
- 
- 	switch(column)
- 	{
- 		case COLUMN_TRANSFERTYPE:
- 		{
- 			int offset = 0;
--			switch(m_eGeneraltqStatus)
-+			switch(m_eGeneralStatus)
- 			{
- 				case Initializing: offset = 0; break;
- 				case Connecting: offset = 0; break;
-@@ -406,7 +406,7 @@ void KviHttpFileTransfer::receivedResponse(const TQString &response)
- 	m_lHeaders.append(response);
- 	m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").tqarg(response);
- 	m_tTransferStartTime = kvi_unixTime();
--	m_eGeneraltqStatus = Downloading;
-+	m_eGeneralStatus = Downloading;
- 	displayUpdate();
- }
- 
-@@ -439,7 +439,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
- 	if(bSuccess)
- 	{
- 		m_szStatusString = __tr2qs_ctx("Transfer completed","http");
--		m_eGeneraltqStatus = Success;
-+		m_eGeneralStatus = Success;
- 		displayUpdate();
- 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id());
- 		g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),TQString(),TQString(),!m_bNotifyCompletion);
-@@ -447,7 +447,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
- 		m_szStatusString = __tr2qs_ctx("Transfer failed","http");
- 		m_szStatusString += ": ";
- 		m_szStatusString += m_pHttpRequest->lastError();
--		m_eGeneraltqStatus = Failure;
-+		m_eGeneralStatus = Failure;
- 		displayUpdate();
- 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError()));
- 		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),TQString(),m_pHttpRequest->lastError(),!m_bNotifyCompletion);
-@@ -482,7 +482,7 @@ void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviSt
- 
- bool KviHttpFileTransfer::startDownload()
- {
--	m_eGeneraltqStatus = Connecting;
-+	m_eGeneralStatus = Connecting;
- 	return m_pHttpRequest->start();
- }
- 
-diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
-index 792205b..cfba891 100644
---- a/src/modules/http/httpfiletransfer.h
-+++ b/src/modules/http/httpfiletransfer.h
-@@ -38,7 +38,7 @@ class KviTalPopupMenu;
- 
- class KviHttpFileTransfer : public KviFileTransfer
- {
--	enum GeneraltqStatus { Initializing, Connecting, Downloading, Success, Failure };
-+	enum GeneralStatus { Initializing, Connecting, Downloading, Success, Failure };
- 	Q_OBJECT
-   TQ_OBJECT
- public:
-@@ -46,7 +46,7 @@ public:
- 	~KviHttpFileTransfer();
- private:
- 	KviHttpRequest * m_pHttpRequest;
--	GeneraltqStatus    m_eGeneraltqStatus;
-+	GeneralStatus    m_eGeneralStatus;
- 	TQString          m_szStatusString;
- 
- 	TQStringList      m_lHeaders;
-diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
-index f6398f0..745937f 100644
---- a/src/modules/iograph/libkviiograph.cpp
-+++ b/src/modules/iograph/libkviiograph.cpp
-@@ -199,7 +199,7 @@ void KviIOGraphDisplay::drawContents(TQPainter * p)
- 	}
- }
- 
--TQSize KviIOGraphDisplay::tqsizeHint() const
-+TQSize KviIOGraphDisplay::sizeHint() const
- {
- 	return TQSize(KVI_IRCTOOLBARAPPLET_MAXIMUM_WIDTH,KVI_IRCTOOLBARAPPLET_MAXIMUM_HEIGHT);
- }
-diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
-index 3c3d8f1..5ff83a9 100644
---- a/src/modules/iograph/libkviiograph.h
-+++ b/src/modules/iograph/libkviiograph.h
-@@ -47,7 +47,7 @@ protected:
- 	bool m_bShowRecvGraph;
- protected:
- 	virtual void drawContents(TQPainter *p);
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual void timerEvent(TQTimerEvent *e);
- };
- 
-diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
-index e01b316..51ebce1 100644
---- a/src/modules/links/linkswindow.cpp
-+++ b/src/modules/links/linkswindow.cpp
-@@ -136,15 +136,15 @@ TQPixmap * KviLinksWindow::myIconPtr()
- 
- void KviLinksWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght2 = m_pTopSplitter->tqsizeHint().height();
-+	int hght2 = m_pTopSplitter->sizeHint().height();
- 	m_pTopSplitter->setGeometry(0,0,width(),hght2);
- 	m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
- }
- 
--TQSize KviLinksWindow::tqsizeHint() const
-+TQSize KviLinksWindow::sizeHint() const
- {
--	TQSize ret(m_pSplitter->tqsizeHint().width(),
--		m_pSplitter->tqsizeHint().height() + m_pTopSplitter->tqsizeHint().height());
-+	TQSize ret(m_pSplitter->sizeHint().width(),
-+		m_pSplitter->sizeHint().height() + m_pTopSplitter->sizeHint().height());
- 	return ret;
- }
- 
-diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
-index d0af9eb..cf676d7 100644
---- a/src/modules/links/linkswindow.h
-+++ b/src/modules/links/linkswindow.h
-@@ -79,7 +79,7 @@ protected slots:
- 	void requestLinks();
- 	void connectionStateChange();
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- private:
- 	void reset();
- 	void endOfLinks();
-diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
-index c9d56e3..acc6fd1 100644
---- a/src/modules/list/listwindow.cpp
-+++ b/src/modules/list/listwindow.cpp
-@@ -301,14 +301,14 @@ TQPixmap * KviListWindow::myIconPtr()
- 
- void KviListWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pTopSplitter->tqsizeHint().height();
-+	int hght = m_pTopSplitter->sizeHint().height();
- 	m_pTopSplitter->setGeometry(0,0,width(),hght);
- 	m_pSplitter->setGeometry(0,hght,width(),height() - hght);
- }
- 
--TQSize KviListWindow::tqsizeHint() const
-+TQSize KviListWindow::sizeHint() const
- {
--	return m_pSplitter->tqsizeHint();
-+	return m_pSplitter->sizeHint();
- }
- 
- void KviListWindow::fillCaptionBuffers()
-@@ -346,7 +346,7 @@ void KviListWindow::exportList()
- 	TQString szFile;
- 	if(connection())
- 	{
--		TQString szDate = TQDateTime::tqcurrentDateTime().toString("d MMM yyyy hh-mm");
-+		TQString szDate = TQDateTime::currentDateTime().toString("d MMM yyyy hh-mm");
- 		KviTQString::sprintf(szFile,__tr2qs("Channel list for %Q - %Q"),
- 			&(connection()->networkName()),&(szDate));
- 	} else {
-diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
-index c010351..51f5bce 100644
---- a/src/modules/list/listwindow.h
-+++ b/src/modules/list/listwindow.h
-@@ -113,7 +113,7 @@ protected slots:
- 	void exportList();
- 	void importList();
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- private:
- 	void reset();
- 	void endOfList();
-diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
-index 97d5035..bab0a96 100644
---- a/src/modules/logview/logviewmdiwindow.cpp
-+++ b/src/modules/logview/logviewmdiwindow.cpp
-@@ -130,7 +130,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
- 
- 	m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
- 	m_pFromDateEdit = new TQDateEdit(m_pSearchTab);
--	m_pFromDateEdit->setDate(TQDate::tqcurrentDate());
-+	m_pFromDateEdit->setDate(TQDate::currentDate());
- 	tqlayout->addWidget(m_pEnableFromFilter,8,0);
- 	tqlayout->addWidget(m_pFromDateEdit,8,1);
- 	connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool)));
-@@ -138,7 +138,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
- 
- 	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
- 	m_pToDateEdit = new TQDateEdit(m_pSearchTab);
--	m_pToDateEdit->setDate(TQDate::tqcurrentDate());
-+	m_pToDateEdit->setDate(TQDate::currentDate());
- 	tqlayout->addWidget(m_pEnableToFilter,9,0);
- 	tqlayout->addWidget(m_pToDateEdit,9,1);
- 	connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool)));
-@@ -149,7 +149,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
- 	tqlayout->addWidget(pb,10,1);
- 
- 	TQWidget *w = new TQWidget(m_pSearchTab);
--	w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
-+	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
- 	tqlayout->addWidget(w,11,1);
- 
- 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
-@@ -216,9 +216,9 @@ void KviLogViewMDIWindow::die()
- 	close();
- }
- 
--TQSize KviLogViewMDIWindow::tqsizeHint() const
-+TQSize KviLogViewMDIWindow::sizeHint() const
- {
--	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height());
-+	TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height());
- 	return ret;
- }
- 
-diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
-index 96546e7..d2a7e67 100644
---- a/src/modules/logview/logviewmdiwindow.h
-+++ b/src/modules/logview/logviewmdiwindow.h
-@@ -114,7 +114,7 @@ protected:
- 	virtual void resizeEvent(TQResizeEvent *e);
- 	virtual void fillCaptionBuffers();
- 	virtual void die();
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- protected slots:
- 	void rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int );
- 	void itemSelected(KviTalListViewItem * it);
-diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
-index 91badb3..5c04bdc 100644
---- a/src/modules/mediaplayer/libkvimediaplayer.cpp
-+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
-@@ -1401,7 +1401,7 @@ MP_KVS_FUNCTION(localFile)
- 	MP_KVS_FAIL_ON_NO_INTERFACE
- 	TQString szRet = g_pMPInterface->mrl();
- 	if(szRet.isEmpty())return true;
--	if(szRet.tqstartsWith("file://",false))
-+	if(szRet.startsWith("file://",false))
- 	{
- 		szRet.remove(0,7);
- 		c->returnValue()->setString(szRet);
-@@ -1453,7 +1453,7 @@ MP_KVS_FUNCTION(status)
- 	KVSM_PARAMETERS_END(c)
- 
- 	MP_KVS_FAIL_ON_NO_INTERFACE
--	KviMediaPlayerInterface::PlayertqStatus eStat = g_pMPInterface->status();
-+	KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status();
- 	switch(eStat)
- 	{
- 		case KviMediaPlayerInterface::Stopped:
-diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
-index 699bc74..7bbfa92 100644
---- a/src/modules/mediaplayer/mp_amarokinterface.cpp
-+++ b/src/modules/mediaplayer/mp_amarokinterface.cpp
-@@ -143,7 +143,7 @@ bool KviAmarokInterface::setShuffle(bool &bVal)
- 	return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal);
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviAmarokInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()
- {
- 	int ret;
- 	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
-diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h
-index f0169bb..6dcfec6 100644
---- a/src/modules/mediaplayer/mp_amarokinterface.h
-+++ b/src/modules/mediaplayer/mp_amarokinterface.h
-@@ -62,7 +62,7 @@
- 		//virtual int bitRate(); unsupported
- 		virtual int sampleRate();
- 		virtual bool playMrl(const TQString &mrl);
--		virtual KviMediaPlayerInterface::PlayertqStatus status();
-+		virtual KviMediaPlayerInterface::PlayerStatus status();
- 		virtual bool getRepeat();
- 		virtual bool getShuffle();
- 		virtual bool setRepeat(bool &bVal);
-diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp
-index 3a363ed..29fc347 100644
---- a/src/modules/mediaplayer/mp_amipinterface.cpp
-+++ b/src/modules/mediaplayer/mp_amipinterface.cpp
-@@ -189,7 +189,7 @@ int KviAmipInterface::channels()
-   return ret;
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviAmipInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status()
- {
-   int ret = eval_int("var_stat");
-   switch(ret)
-diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h
-index 392d854..5d49f69 100644
---- a/src/modules/mediaplayer/mp_amipinterface.h
-+++ b/src/modules/mediaplayer/mp_amipinterface.h
-@@ -48,7 +48,7 @@
-     virtual bool setShuffle(bool &bVal);
-     virtual bool amipExec(const TQString &cmd);
-     virtual TQString amipEval(const TQString &cmd);
--    virtual KviMediaPlayerInterface::PlayertqStatus status();
-+    virtual KviMediaPlayerInterface::PlayerStatus status();
-   };
-   
-   MP_DECLARE_DESCRIPTOR(KviAmipInterface)
-diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
-index 0c0a97a..283f551 100644
---- a/src/modules/mediaplayer/mp_interface.cpp
-+++ b/src/modules/mediaplayer/mp_interface.cpp
-@@ -82,7 +82,7 @@ TQString KviMediaPlayerInterface::getLocalFile()
- {
- 	TQString ret = mrl();
- 	if(ret.isEmpty())return ret;
--	if(ret.tqstartsWith("file://",false))
-+	if(ret.startsWith("file://",false))
- 	{
- 		ret.remove(0,7);
- 		return ret;
-@@ -183,7 +183,7 @@ bool KviMediaPlayerInterface::jumpTo(int &iPos)
- 	return false;
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviMediaPlayerInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status()
- {
- 	notImplemented();
- 	return KviMediaPlayerInterface::Unknown;
-@@ -265,12 +265,12 @@ bool KviMediaPlayerInterface::setShuffle(bool &bVal)
- TQString KviMediaPlayerInterface::mediaType()
- {
- 	TQString ret = mrl();
--	if(ret.tqendsWith(".mp3",false))ret = "MPEG Layer 3";
--	else if(ret.tqendsWith(".ogg",false))ret = "OGG Vorbis";
--	else if(ret.tqendsWith(".avi",false))ret = "Audio Video Interleave";
--	else if(ret.tqendsWith(".mpeg",false))ret = "MPEG Video";
--	else if(ret.tqendsWith(".mpg",false))ret = "MPEG Video";
--	else if(ret.tqstartsWith("http://",false))ret = "HTTP Audio Stream";
-+	if(ret.endsWith(".mp3",false))ret = "MPEG Layer 3";
-+	else if(ret.endsWith(".ogg",false))ret = "OGG Vorbis";
-+	else if(ret.endsWith(".avi",false))ret = "Audio Video Interleave";
-+	else if(ret.endsWith(".mpeg",false))ret = "MPEG Video";
-+	else if(ret.endsWith(".mpg",false))ret = "MPEG Video";
-+	else if(ret.startsWith("http://",false))ret = "HTTP Audio Stream";
- 	else ret = TQString();
- 	return ret;
- }
-diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h
-index 593a249..f1a5479 100644
---- a/src/modules/mediaplayer/mp_interface.h
-+++ b/src/modules/mediaplayer/mp_interface.h
-@@ -108,8 +108,8 @@ public:
- 	// return false only on communication failure
- 	virtual bool quit();
- 	// return the current player status
--	enum PlayertqStatus { Unknown, Stopped, Playing, Paused };
--	virtual KviMediaPlayerInterface::PlayertqStatus status();
-+	enum PlayerStatus { Unknown, Stopped, Playing, Paused };
-+	virtual KviMediaPlayerInterface::PlayerStatus status();
- 	// current position in the media (msecs)
- 	// 0 if the player isn't playing anything and -1 if unknown
- 	virtual int position();
-diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp
-index 5b50a04..0be694c 100644
---- a/src/modules/mediaplayer/mp_jukinterface.cpp
-+++ b/src/modules/mediaplayer/mp_jukinterface.cpp
-@@ -140,7 +140,7 @@ int KviJukInterface::position()
- 	return ret * 1000;
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviJukInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviJukInterface::status()
- {
- 	int ret;
- 	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
-diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h
-index c2b7fd1..cde06ee 100644
---- a/src/modules/mediaplayer/mp_jukinterface.h
-+++ b/src/modules/mediaplayer/mp_jukinterface.h
-@@ -67,7 +67,7 @@
- 		virtual bool setShuffle(bool &bVal);
- 
- 		virtual bool playMrl(const TQString &mrl);
--		virtual KviMediaPlayerInterface::PlayertqStatus status();
-+		virtual KviMediaPlayerInterface::PlayerStatus status();
- 	};
- 	
- 	MP_DECLARE_DESCRIPTOR(KviJukInterface)
-diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
-index 6bc3e24..7820dbb 100644
---- a/src/modules/mediaplayer/mp_winampinterface.cpp
-+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
-@@ -280,7 +280,7 @@ int KviWinampInterface::channels()
- 	return ret;
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviWinampInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
- {
- 	HWND hWinamp = find_winamp(this);
- 	int ret = 1000;
-diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h
-index 3f2a62c..f1b3cf5 100644
---- a/src/modules/mediaplayer/mp_winampinterface.h
-+++ b/src/modules/mediaplayer/mp_winampinterface.h
-@@ -66,7 +66,7 @@
- 		virtual bool getShuffle();
- 		virtual bool setRepeat(bool &bVal);
- 		virtual bool setShuffle(bool &bVal);
--		virtual KviMediaPlayerInterface::PlayertqStatus status();
-+		virtual KviMediaPlayerInterface::PlayerStatus status();
- 	};
- 	
- 	MP_DECLARE_DESCRIPTOR(KviWinampInterface)
-diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
-index 730b4fe..60820f0 100644
---- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
-+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
-@@ -256,7 +256,7 @@ bool KviXmmsInterface::setShuffle(bool &bVal)
- 	return true;
- }
- 
--KviMediaPlayerInterface::PlayertqStatus KviXmmsInterface::status()
-+KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
- {
- 	bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused");
- 	if(sym1)
-diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h
-index e2b2c38..0b3f62b 100644
---- a/src/modules/mediaplayer/mp_xmmsinterface.h
-+++ b/src/modules/mediaplayer/mp_xmmsinterface.h
-@@ -52,7 +52,7 @@
- 		virtual bool jumpTo(kvs_int_t &iPos);
- 		virtual bool setVol(kvs_int_t &iVol);
- 		virtual int getVol();
--		virtual KviMediaPlayerInterface::PlayertqStatus status();
-+		virtual KviMediaPlayerInterface::PlayerStatus status();
- 		virtual TQString nowPlaying();
- 		virtual bool playMrl(const TQString &mrl);
- 		virtual TQString mrl();
-diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp
-index daa5c20..0917aec 100644
---- a/src/modules/my/idle.cpp
-+++ b/src/modules/my/idle.cpp
-@@ -72,12 +72,12 @@ bool Idle::usingPlatform() const
- 
- void Idle::start()
- {
--	d->startTime = TQDateTime::tqcurrentDateTime();
-+	d->startTime = TQDateTime::currentDateTime();
- 
- 	if(!platform) {
- 		// generic idle
- 		d->lastMousePos = TQCursor::pos();
--		d->idleSince = TQDateTime::tqcurrentDateTime();
-+		d->idleSince = TQDateTime::currentDateTime();
- 	}
- 
- 	// poll every second (use a lower value if you need more accuracy)
-@@ -96,7 +96,7 @@ int Idle::secondsIdle()
- 		i = platform->secondsIdle();
- 	else {
- 		TQPoint curMousePos = TQCursor::pos();
--		TQDateTime curDateTime = TQDateTime::tqcurrentDateTime();
-+		TQDateTime curDateTime = TQDateTime::currentDateTime();
- 		if(d->lastMousePos != curMousePos) {
- 			d->lastMousePos = curMousePos;
- 			d->idleSince = curDateTime;
-@@ -105,7 +105,7 @@ int Idle::secondsIdle()
- 	}
- 
- 	// set 'beginIdle' to the beginning of the idle time (by backtracking 'i' seconds from now)
--	TQDateTime beginIdle = TQDateTime::tqcurrentDateTime().addSecs(-i);
-+	TQDateTime beginIdle = TQDateTime::currentDateTime().addSecs(-i);
- 
- 	// set 't' to hold the number of seconds between 'beginIdle' and 'startTime'
- 	int t = beginIdle.secsTo(d->startTime);
-@@ -121,7 +121,7 @@ int Idle::secondsIdle()
- 	}
- 
- 	// how long have we been idle?
--	int idleTime = d->startTime.secsTo(TQDateTime::tqcurrentDateTime());
-+	int idleTime = d->startTime.secsTo(TQDateTime::currentDateTime());
- 	return idleTime;
- }
- 
-diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp
-index 4e116fa..92de564 100644
---- a/src/modules/my/idle_mac.cpp
-+++ b/src/modules/my/idle_mac.cpp
-@@ -24,8 +24,8 @@
- #include <Carbon/Carbon.h>
- 
- // Why does Apple have to make this so complicated?
--static OStqStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
--	OStqStatus  err;
-+static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) {
-+	OSStatus  err;
- 	FSRef   frameworksFolderRef;
- 	CFURLRef baseURL;
- 	CFURLRef bundleURL;
-@@ -117,7 +117,7 @@ IdlePlatform::~IdlePlatform() {
- 
- 
- // Typedef for the function we're getting back from CFBundleGetFunctionPointerForName.
--typedef OStqStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
-+typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop,
- 																 EventTimerInterval   inFireDelay,
- 																 EventTimerInterval   inInterval,
- 																 EventLoopIdleTimerUPP    inTimerProc,
-diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
-index e0f080a..3a7568b 100644
---- a/src/modules/notifier/notifierwindow.cpp
-+++ b/src/modules/notifier/notifierwindow.cpp
-@@ -727,7 +727,7 @@ void KviNotifierWindow::redrawText()
- 
- 	if(m_pLineEdit->isVisible())y -= (m_pLineEdit->height() + 4);
- 
--	TQColorGroup grp = tqcolorGroup();
-+	TQColorGroup grp = colorGroup();
- 
- 	int idx = iIdx;
- 	KviNotifierMessage * m = cur;
-diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
-index 07f73be..d0ecae0 100644
---- a/src/modules/objects/class_groupbox.cpp
-+++ b/src/modules/objects/class_groupbox.cpp
-@@ -29,7 +29,7 @@
- #include "kvi_locale.h"
- #include "kvi_iconmanager.h"
- 
--// Tables used in $tqsetAlignment , $tqalignment and in $setOrientation & $orientation
-+// Tables used in $setAlignment , $tqalignment and in $setOrientation & $orientation
- 
- const char * const align_tbl[] = {
- 			"Left",
-@@ -91,7 +91,7 @@ const int align_cod[] = {
- 		Adds an empty cell at the next free position.
- 		!fn: <string> $tqalignment()
- 		Returns the tqalignment of the group box title.
--		!fn: $tqsetAlignment(<tqalignment:string>)
-+		!fn: $setAlignment(<tqalignment:string>)
- 		Set the tqalignment of the groupbox;  Valid values are Left,Right,HCenter.
- 		!fn: $setOrientation<orientation:string>
- 		Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical.
-@@ -108,7 +108,7 @@ const int align_cod[] = {
- 		#then the groupbox [br]
- 		%gb=$new(groupbox,%widget)[br]
- 		%gb->$setTitle(Login)[br]
--		%gb->$tqsetAlignment("Left")[br]
-+		%gb->$setAlignment("Left")[br]
- 		[br]
- 		#now we create the labels and lineedits.[br]
- 		%labeluser=$new(label,%gb)[br]
-@@ -166,7 +166,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"columns", functionColumns)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"addSpace", functionAddSpace)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqalignment", functionAlignment)
--	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqsetAlignment", functionSetAlignment)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setAlignment", functionSetAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setOrientation", functionSetOrientation)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"isChecked", functionIsChecked)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setChecked", functionSetChecked)
-@@ -317,7 +317,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
- 	{
- 		if(KviTQString::equalCI(szAlign, align_tbl[i]))
- 		{
--			((KviTalGroupBox *)widget())->tqsetAlignment(align_cod[i]);
-+			((KviTalGroupBox *)widget())->setAlignment(align_cod[i]);
- 			return true;
- 		}
- 	}
-diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
-index ce2c536..580f93b 100644
---- a/src/modules/objects/class_label.cpp
-+++ b/src/modules/objects/class_label.cpp
-@@ -34,7 +34,7 @@
- 
- 
- 
--// Tables used in $tqsetAlignment & $tqalignment
-+// Tables used in $setAlignment & $tqalignment
- const char * const align_tbl[] = {
- 			"Left", 
- 			"Right",
-@@ -149,9 +149,9 @@ const int frame_cod[] = {
- 		this label. The flags are separated by commas. An example output
- 		could look like this:[br]
- 		[pre]Bottom, Right[/pre][br]
--		See [classfnc]$tqsetAlignment[/classfnc]() for explanation of all
-+		See [classfnc]$setAlignment[/classfnc]() for explanation of all
- 		tqalignment flags.
--		!fn: $tqsetAlignment(<flag1:string>, <flag2:string>, ...)
-+		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
- 		This function sets tqalignment flags, given as parameters, for 
- 		this label. Valid flags are:
- 		[pre]
-@@ -217,7 +217,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqalignment", functionAlignment)
--	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqsetAlignment", functionSetAlignment)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setFrameStyle", functionSetFrameStyle)
-@@ -321,7 +321,7 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
- 				c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it));
- 			
- 		}
--	((TQLabel *)widget())->tqsetAlignment(sum);
-+	((TQLabel *)widget())->setAlignment(sum);
- 	return true;
- }
- bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c)
-diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
-index b2842a8..4381416 100644
---- a/src/modules/objects/class_layout.cpp
-+++ b/src/modules/objects/class_layout.cpp
-@@ -83,8 +83,8 @@
- 		Sets the resize mode of the parent widget in relation to this tqlayout.
- 		<mode> can be one of:[br]
- 		-Auto: this is the default[br]
--		-Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
--		-Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-+		-Fixed: the parent widget of this tqlayout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
-+		-Minimum: the minimum size of the parent widget of this tqlayout is set to minimumSize() and it cannot be smaller[br]
- 		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
- */
- 
-diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
-index 241c385..c85a4c0 100644
---- a/src/modules/objects/class_listbox.cpp
-+++ b/src/modules/objects/class_listbox.cpp
-@@ -100,7 +100,7 @@
- 		This function is called by KVIrc when the current item changes.
- 		!fn: <index:integer> $onItemEvent()
- 		This function is called by KVIrc when the current item pointed by the mouse changes and gives in $0 the item index.
--		!fn: <array:x,y,width,height> $tqitemRect(<item:index>)
-+		!fn: <array:x,y,width,height> $itemRect(<item:index>)
- 		Returns the rectangle on the screen that item occupies, or an invalid rectangle if item is 0 or is not currently visible. 
- 
- 		@signals:
-@@ -122,7 +122,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listbox,"listbox","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"currentItem", functioncurrentItem)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"textAt", functiontextAt);
- 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemAt", functionitemAt);
--	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"tqitemRect", functiontqitemRect);
-+	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemRect", functionitemRect);
- 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"setCurrentItem", functionsetCurrentItem);
- 
- 
-@@ -367,7 +367,7 @@ void KviKvsObject_listbox::onItem(KviTalListBoxItem *item)
- }
- 
- 
--bool KviKvsObject_listbox::functiontqitemRect(KviKvsObjectFunctionCall *c)
-+bool KviKvsObject_listbox::functionitemRect(KviKvsObjectFunctionCall *c)
- {
- kvs_uint_t uIndex;
- 	KVSO_PARAMETERS_BEGIN(c)
-@@ -375,7 +375,7 @@ kvs_uint_t uIndex;
- 	KVSO_PARAMETERS_END(c)
- 	if(widget())
- 	{
--		TQRect rect=((KviTalListBox *)widget())->tqitemRect(((KviTalListBox *)widget())->item(uIndex));
-+		TQRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(uIndex));
- 		KviKvsArray * a = new KviKvsArray();
- 		a->set(0,new KviKvsVariant((kvs_int_t)rect.left()));
- 		a->set(1,new KviKvsVariant((kvs_int_t)rect.top()));
-diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h
-index b7d00cb..911f784 100644
---- a/src/modules/objects/class_listbox.h
-+++ b/src/modules/objects/class_listbox.h
-@@ -60,7 +60,7 @@ protected:
- 	bool functiononItemEvent(KviKvsObjectFunctionCall *c);
- 
- 	bool functionitemAt(KviKvsObjectFunctionCall *c);
--	bool functiontqitemRect(KviKvsObjectFunctionCall *c);
-+	bool functionitemRect(KviKvsObjectFunctionCall *c);
- protected slots:
- 	void selectionChanged();
- 	void currentItemChanged(KviTalListBoxItem *);
-diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
-index a4beed4..70d5086 100644
---- a/src/modules/objects/class_multilineedit.cpp
-+++ b/src/modules/objects/class_multilineedit.cpp
-@@ -226,7 +226,7 @@ static int mod_cod[] =	{
- 		Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE).
- 		!fn: <boolean> $isRedoAvailable ()
- 		Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE).
--		!fn: $tqsetAlignment(<tqalignment:string>)
-+		!fn: $setAlignment(<tqalignment:string>)
- 		Sets the tqalignment of the current paragraph to <tqalignment>. Valid values are:[br]
- 		- AlignAuto - Aligns according to the language.[br]
- 		- TQt::AlignLeft - Aligns with the left edge.[br]
-@@ -323,7 +323,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_mledit,"multilineedit","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setParagraphBackgroundColor", functionsetParagraphBackgroundColor)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"clearParagraphBackgroundColor", functionsetParagraphBackgroundColor)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"loadFile" , functionloadFile); // let's fantasy
--	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"tqsetAlignment" , functiontqsetAlignment)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAlignment" , functionsetAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAutoFormatting" , functionsetAutoFormatting)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setVerticalAlignment" , functionsetVerticalAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setWrapPolicy" , functionsetWrapPolicy)
-@@ -1090,7 +1090,7 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c)
- 	return true;
- }
- 
--bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c)
-+bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c)
- 
- {
- 	TQString szAlignment;
-@@ -1099,13 +1099,13 @@ bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c)
- 	KVSO_PARAMETERS_END(c)
- 	if(!widget()) return true;
- 	if(KviTQString::equalCI(szAlignment,"Left"))
--		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignLeft);
-+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignLeft);
- 	else if(KviTQString::equalCI(szAlignment,"Right"))
--		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignRight);
-+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignRight);
- 	else if(KviTQString::equalCI(szAlignment,"Center"))
--		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignCenter);
-+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignCenter);
- 	else if(KviTQString::equalCI(szAlignment,"Justify"))
--		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignJustify);
-+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignJustify);
- 	else c->warning(__tr2qs("Unknown tqalignment '%Q'"),&szAlignment);
- 	return true;
- }
-diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h
-index 5f531ed..a1b1c8e 100644
---- a/src/modules/objects/class_multilineedit.h
-+++ b/src/modules/objects/class_multilineedit.h
-@@ -95,7 +95,7 @@ protected:
- 	bool functionsetParagraphBackgroundColor(KviKvsObjectFunctionCall *c);
- 	bool functionclearParagraphBackground(KviKvsObjectFunctionCall *c);
- 	bool functionloadFile(KviKvsObjectFunctionCall *c);
--	bool functiontqsetAlignment(KviKvsObjectFunctionCall *c);
-+	bool functionsetAlignment(KviKvsObjectFunctionCall *c);
- 	bool functionsetAutoFormatting(KviKvsObjectFunctionCall *c);
- 	bool functionsetVerticalAlignment(KviKvsObjectFunctionCall *c);
- 	bool functionsetWrapPolicy(KviKvsObjectFunctionCall *c);
-diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
-index 394c39a..8f1afd7 100644
---- a/src/modules/objects/class_popupmenu.cpp
-+++ b/src/modules/objects/class_popupmenu.cpp
-@@ -110,7 +110,7 @@
- 				#we create the label widget wich will be used as popup's title[br]
- 				$$->%Popuptitle=$new(label)[br]
- 				$$->%Popuptitle->$settext(<B><U>"Windows Options"</B></U>)[br]
--				$$->%Popuptitle->$tqsetAlignment(Center)[br]
-+				$$->%Popuptitle->$setAlignment(Center)[br]
- 				#and we add it.[br]
- 				%A=$$->%Popuptitle[br]
- 				$$->%Popupmenu->$insertwidget(%A)[br]
-diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
-index 5b9103b..5b52ad4 100644
---- a/src/modules/objects/class_socket.cpp
-+++ b/src/modules/objects/class_socket.cpp
-@@ -57,7 +57,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip
- {
- 	m_uConnectionId = 0;
- 	m_sock = KVI_INVALID_SOCKET;
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
- 	m_uRemotePort = 0;
- 	m_uSecondaryPort = 0;
- 	m_pSn = 0;
-@@ -128,7 +128,7 @@ void KviScriptSocketObject::reset()
- 	m_pOutBuffer = new KviDataBuffer();
- 	m_uInBufferLen = 0;
- 	m_uInDataLen = 0;
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
- 	m_uRemotePort = 0;
- 	m_szRemoteIp.clear();
- 	m_uLocalPort = 0;
-@@ -366,7 +366,7 @@ void KviScriptSocketObject::reset()
- 
- KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object")
- 
--	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functiontqStatus)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functionStatus)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remotePort",functionRemotePort)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remoteIp",functionRemoteIp)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"localIp",functionLocalIp)
-@@ -398,7 +398,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
- 	m_bUdp = false;
- 	m_uConnectionId = 0;
- 	m_sock = KVI_INVALID_SOCKET;
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
- 	m_uRemotePort = 0;
- 	m_uSecondaryPort = 0;
- 	m_pSn = 0;
-@@ -430,15 +430,15 @@ KVSO_END_DESTRUCTOR(KviKvsObject_socket)
- //----------------------
- 
- 
--bool KviKvsObject_socket::functiontqStatus(KviKvsObjectFunctionCall *c)
-+bool KviKvsObject_socket::functionStatus(KviKvsObjectFunctionCall *c)
- {
--	c->returnValue()->setInteger(m_itqStatus);
-+	c->returnValue()->setInteger(m_iStatus);
- 	return true;
- }
- 
- bool KviKvsObject_socket::functionClose(KviKvsObjectFunctionCall *c)
- {
--	if((m_pOutBuffer->size() != 0) && (m_itqStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED))
-+	if((m_pOutBuffer->size() != 0) && (m_iStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED))
- 		tryFlush();
- 
- 	reset();
-@@ -591,7 +591,7 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
- 		c->warning(__tr2qs("Value %d for port is out of range (values allowed are from 0 to 65535"),m_uRemotePort);
- 		return true;
- 	}
--	if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
-+	if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
- 	{
- 		c->warning(__tr2qs("Another connection in progress"));
- 		c->returnValue()->setBoolean(true);
-@@ -608,11 +608,11 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
- 		debug ("ok connecting");
- 		debug ("connectinhg on ip %s ",m_szRemoteIp.latin1());
- 		debug ("non so ip");
--		m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
-+		m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
- 		delayedConnect();
- 	} else {
- 		debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort);
--		m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
-+		m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
- 		delayedLookupRemoteIp();
- 	}
- 	c->returnValue()->setBoolean(true);
-@@ -626,7 +626,7 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
- 
- bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
- {
--	if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
-+	if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
- 	{
- 		c->warning(__tr2qs("Another connection in progress"));
- 		c->returnValue()->setBoolean(false);
-@@ -770,7 +770,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
- 	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(incomingConnection(int)));
- 	m_pSn->setEnabled(true);
- 
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING;
- 
- 	c->returnValue()->setBoolean(true);
- 	return true;
-@@ -846,7 +846,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
- 		sareal.getStringAddress(m_szLocalIp);
- 	}
- 
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
- 
- 	m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
- 	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int)));
-@@ -1070,7 +1070,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
- 		KviKvsVariantList *params=0;
- 		callFunction(this,"connectEvent",params);
- 		if(m_uConnectionId == uOldConnectionId)
--			m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
-+			m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
- 		// else the connection has been already changed!
- 	}
- }
-@@ -1256,7 +1256,7 @@ void KviKvsObject_socket::reset()
- 	m_pOutBuffer = new KviDataBuffer();
- 	m_uInBufferLen = 0;
- 	m_uInDataLen = 0;
--	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
-+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
- 	m_uRemotePort = 0;
- 	m_szRemoteIp="";
- 	m_uLocalPort = 0;
-diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
-index 84771ca..f80d749 100644
---- a/src/modules/objects/class_socket.h
-+++ b/src/modules/objects/class_socket.h
-@@ -47,7 +47,7 @@ public:
- 	virtual ~KviScriptSocketObject();
- protected:
- 	kvi_socket_t       m_sock;
--	int                m_itqStatus;
-+	int                m_iStatus;
- 	KviStr             m_szRemoteIp;
- 	unsigned short int m_uRemotePort;
- 	KviStr             m_szLocalIp;
-@@ -69,7 +69,7 @@ protected:
- 	unsigned short int m_uSecondaryPort;
- 	KviStr             m_szSecondaryIp;
- protected:
--	bool functiontqStatus(KviCommand *c,KviParameterList * params,KviStr &buffer);
-+	bool functionStatus(KviCommand *c,KviParameterList * params,KviStr &buffer);
- 	bool functionRemotePort(KviCommand *c,KviParameterList * params,KviStr &buffer);
- 	bool functionRemoteIp(KviCommand *c,KviParameterList * params,KviStr &buffer);
- 	bool functionLocalPort(KviCommand *c,KviParameterList * params,KviStr &buffer);
-@@ -122,7 +122,7 @@ public:
- protected:
- 	bool               m_bUdp;  
- 	kvi_socket_t       m_sock;
--	int                m_itqStatus;
-+	int                m_iStatus;
- 	TQString             m_szRemoteIp;
- //	unsigned short int m_uRemotePort;
- 	TQString             m_szLocalIp;
-@@ -144,7 +144,7 @@ protected:
- 	kvi_u32_t          m_uSecondaryPort;
- 	TQString             m_szSecondaryIp;
- protected:
--	bool functiontqStatus(KviKvsObjectFunctionCall *c);
-+	bool functionStatus(KviKvsObjectFunctionCall *c);
- 	bool functionRemotePort(KviKvsObjectFunctionCall *c);
- 	bool functionRemoteIp(KviKvsObjectFunctionCall *c);
- 	bool functionLocalPort(KviKvsObjectFunctionCall *c);
-diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp
-index 8b98923..639b311 100644
---- a/src/modules/objects/class_urllabel.cpp
-+++ b/src/modules/objects/class_urllabel.cpp
-@@ -287,7 +287,7 @@ bool KviKvsObject_urlabel::functionsetText(KviKvsObjectFunctionCall *c)
- 	KVSO_PARAMETERS_END(c)
- 	if(!widget()) return true;
- 	((TQLabel *)widget())->setText(szText);
--	((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->tqsizeHint());
-+	((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->sizeHint());
- 	return true;
- }
- bool KviKvsObject_urlabel::functionaction(KviKvsObjectFunctionCall *c)
-diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
-index 4ff98d6..fec3925 100644
---- a/src/modules/objects/class_widget.cpp
-+++ b/src/modules/objects/class_widget.cpp
-@@ -587,7 +587,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumWidth",function_setMaximumWidth)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumHeight",function_setMaximumHeight)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"move",function_move)
--	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqsizeHint",function_tqsizeHint)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"sizeHint",function_sizeHint)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"resize",function_resize)
- 
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFocusPolicy",function_setFocusPolicy)
-@@ -1450,10 +1450,10 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c)
- 	widget()->move(TQPoint(iX,iY));
- 	return true;
- }
--bool KviKvsObject_widget::function_tqsizeHint(KviKvsObjectFunctionCall *c)
-+bool KviKvsObject_widget::function_sizeHint(KviKvsObjectFunctionCall *c)
- {
- 	if(!widget())return true;
--	TQSize sizehint = widget()->tqsizeHint();
-+	TQSize sizehint = widget()->sizeHint();
- 	KviKvsArray * a = new KviKvsArray();
- 	a->set(0,new KviKvsVariant((kvs_int_t)sizehint.width()));
- 	a->set(1,new KviKvsVariant((kvs_int_t)sizehint.height()));
-diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
-index 807d50a..edbe610 100644
---- a/src/modules/objects/class_widget.h
-+++ b/src/modules/objects/class_widget.h
-@@ -96,7 +96,7 @@ protected:
- 	bool function_setGeometry(KviKvsObjectFunctionCall *c);
- 	bool function_setWFlags(KviKvsObjectFunctionCall *c);
- 	bool function_show(KviKvsObjectFunctionCall *c);
--	bool function_tqsizeHint(KviKvsObjectFunctionCall *c);
-+	bool function_sizeHint(KviKvsObjectFunctionCall *c);
- 	bool function_width(KviKvsObjectFunctionCall *);
- 	bool function_x(KviKvsObjectFunctionCall *);
- 	bool function_y(KviKvsObjectFunctionCall *);
-diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
-index ca1333f..928ddaf 100644
---- a/src/modules/objects/class_wrapper.cpp
-+++ b/src/modules/objects/class_wrapper.cpp
-@@ -183,7 +183,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
- TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, const TQString szName)
- {
- #ifdef COMPILE_USE_QT4
--	TQWidgetList list = g_pApp->tqtopLevelWidgets();
-+	TQWidgetList list = g_pApp->topLevelWidgets();
- 	if( !list.count() ) return 0;
- 	for(int idx=0;idx<list.count();idx++)
- 	{
-@@ -205,7 +205,7 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass,
- 	return 0;
- #else
- 	
--	TQWidgetList *list = g_pApp->tqtopLevelWidgets();
-+	TQWidgetList *list = g_pApp->topLevelWidgets();
- 	if( !list ) return 0;
- 
- 	TQWidgetListIt it(*list);
-diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
-index 977c8c9..3a939ff 100644
---- a/src/modules/objects/libkviobjects.cpp
-+++ b/src/modules/objects/libkviobjects.cpp
-@@ -827,7 +827,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
- 	KVSO_PARAMETERS_END(cmd)
- 	if (bFlag) cmd->window()->output(80, "Objects dump:");
- 	#ifdef COMPILE_USE_QT4
--	TQWidgetList list = g_pApp->tqtopLevelWidgets();
-+	TQWidgetList list = g_pApp->topLevelWidgets();
- 	
- 	KviStr spacing = ">";
- 	TQString  szTemp;
-@@ -865,7 +865,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
- 	}
- 
- #else
--	TQWidgetList *l = g_pApp->tqtopLevelWidgets();
-+	TQWidgetList *l = g_pApp->topLevelWidgets();
- 	l->setAutoDelete(false);
- 	TQWidgetListIt it(*l);
- 	KviStr spacing = ">";
-diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
-index c0b7bf8..a11dfaa 100644
---- a/src/modules/options/container.cpp
-+++ b/src/modules/options/container.cpp
-@@ -59,7 +59,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
- 
- 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this);
- 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
--	//b->setMinimumWidth(m_pCancel->tqsizeHint().width());
-+	//b->setMinimumWidth(m_pCancel->sizeHint().width());
- 	g->addWidget(b,1,1);
- 	b->setDefault(true);
- 	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
-diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
-index b00eba6..107c597 100644
---- a/src/modules/options/dialog.cpp
-+++ b/src/modules/options/dialog.cpp
-@@ -69,7 +69,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
- #ifdef COMPILE_USE_QT4
- 	l->setWordWrap(true);
- #endif
--	l->tqsetAlignment(TQt::AlignTop);
-+	l->setAlignment(TQt::AlignTop);
- 	tqlayout()->addWidget(l,0,0);
- }
- 
-diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
-index 175f119..568499a 100644
---- a/src/modules/options/optw_messages.cpp
-+++ b/src/modules/options/optw_messages.cpp
-@@ -261,14 +261,14 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in
- #ifdef COMPILE_PSEUDO_TRANSPARENCY
- 	if(g_pShadedChildGlobalDesktopBackground)
- 	{
--		TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy())));
-+		TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy())));
- 		p->drawTiledPixmap(0,0,w,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
- 	} else {
- #endif
- 		TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap();
- 		if(pix)
- 		{
--			TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy())));
-+			TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy())));
- 			p->fillRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
- 			p->drawTiledPixmap(0,0,w,height(),*pix,pnt.x(),pnt.y());
- 		} else {
-@@ -335,7 +335,7 @@ void KviMessageColorListBoxItem::paint(TQPainter * p)
- 		clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : TQt::gray;
- 		p->fillRect(0,0,width(lb),height(lb),clr);
- 	} else {
--		clr = listBox()->tqcolorGroup().background();
-+		clr = listBox()->colorGroup().background();
- 		KviTalListBoxText::paint(p);
- 	}
- 	if(isSelected())
-diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
-index 319f5be..309344c 100644
---- a/src/modules/options/optw_servers.cpp
-+++ b/src/modules/options/optw_servers.cpp
-@@ -102,7 +102,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
- 
- 	TQLabel * l = new TQLabel(szTmp,this);
- 	l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
--	l->tqsetAlignment(TQt::AlignCenter);
-+	l->setAlignment(TQt::AlignCenter);
- 	l->setMargin(10);
- 	g->addMultiCellWidget(l,0,0,0,3);
- 	l->setMinimumWidth(200);
-@@ -451,7 +451,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
- 
- 	m_pHeaderLabel = new TQLabel("",this); // the text will be set later
- 	m_pHeaderLabel->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
--	m_pHeaderLabel->tqsetAlignment(TQt::AlignCenter);
-+	m_pHeaderLabel->setAlignment(TQt::AlignCenter);
- 	m_pHeaderLabel->setMargin(10);
- 	g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3);
- 	m_pHeaderLabel->setMinimumWidth(200);
-diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
-index 3d6e01b..7f86182 100644
---- a/src/modules/options/optw_texticons.cpp
-+++ b/src/modules/options/optw_texticons.cpp
-@@ -37,7 +37,7 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc
- {
- 	m_pIconButton=new TQToolButton(this);
- 	m_pBrowseButton=new TQToolButton(this);
--	m_pBrowseButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum));
-+	m_pBrowseButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum));
- 	m_pBrowseButton->setText("...");
- 	m_pIcon = icon;
- 	m_pPopup = 0;
-diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
-index db3479e..dd1cf24 100644
---- a/src/modules/popupeditor/popupeditor.cpp
-+++ b/src/modules/popupeditor/popupeditor.cpp
-@@ -1372,7 +1372,7 @@ TQPixmap * KviPopupEditorWindow::myIconPtr()
- 
- void KviPopupEditorWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pBase->tqsizeHint().height();
-+	int hght = m_pBase->sizeHint().height();
- 	m_pEditor->setGeometry(0,0,width(),height()- hght);
- 	m_pBase->setGeometry(0,height() - hght,width(),hght);
- }
-diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
-index b710cb4..123675b 100644
---- a/src/modules/raweditor/raweditor.cpp
-+++ b/src/modules/raweditor/raweditor.cpp
-@@ -502,7 +502,7 @@ TQPixmap * KviRawEditorWindow::myIconPtr()
- 
- void KviRawEditorWindow::resizeEvent(TQResizeEvent *e)
- {
--	int hght = m_pBase->tqsizeHint().height();
-+	int hght = m_pBase->sizeHint().height();
- 	m_pEditor->setGeometry(0,0,width(),height()- hght);
- 	m_pBase->setGeometry(0,height() - hght,width(),hght);
- }
-diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
-index 648fdfb..59fc732 100644
---- a/src/modules/reguser/dialog.cpp
-+++ b/src/modules/reguser/dialog.cpp
-@@ -329,7 +329,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
- 	{
- 		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)it;
- 	
--		TQRect r = m_pListView->tqitemRect(i);
-+		TQRect r = m_pListView->itemRect(i);
- 		int daw = m_pListView->columnWidth(0);
- 	
- 		TQPoint ppp = m_pListView->mapFromGlobal(pnt);
-diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
-index 646261a..9fb7f61 100644
---- a/src/modules/reguser/edituser.cpp
-+++ b/src/modules/reguser/edituser.cpp
-@@ -217,7 +217,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
- 	TQGridLayout * g = new TQGridLayout(this,3,2,4,4);
- 
- 	TQLabel * l = new TQLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);
--	//l->tqsetAlignment(TQt::AlignCenter);
-+	//l->setAlignment(TQt::AlignCenter);
- 	g->addMultiCellWidget(l,0,0,0,1);
- 
- 	KviTalHBox * b = new KviTalHBox(this);
-@@ -225,29 +225,29 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
- 
- 	m_pNickEdit = new TQLineEdit(b);
- 	//m_pNickEdit->setMinimumWidth(120);
--	m_pNickEdit->tqsetAlignment(TQt::AlignRight);
-+	m_pNickEdit->setAlignment(TQt::AlignRight);
- #ifdef COMPILE_INFO_TIPS
- 	TQToolTip::add(m_pNickEdit,__tr2qs("<center>This the <b>nickname</b> that will match this user, default value is the registered name.</center>"));
- #endif
- 
- 	l = new TQLabel("<center><b>!</b></center>",b);
--	l->tqsetAlignment(TQt::AlignCenter);
-+	l->setAlignment(TQt::AlignCenter);
- 	//l->setMinimumWidth(40);
- 
- 	m_pUserEdit = new TQLineEdit(b);
- 	//m_pUserEdit->setMinimumWidth(120);
--	m_pUserEdit->tqsetAlignment(TQt::AlignCenter);
-+	m_pUserEdit->setAlignment(TQt::AlignCenter);
- #ifdef COMPILE_INFO_TIPS
- 	TQToolTip::add(m_pUserEdit,__tr2qs("<center>This the <b>username</b> that will match this user. <b>*</b> will match any username.</center>"));
- #endif
- 
- 	l = new TQLabel("<center><b>@</b></center>",b);
--	l->tqsetAlignment(TQt::AlignCenter);
-+	l->setAlignment(TQt::AlignCenter);
- 	//l->setMinimumWidth(40);
- 
- 	m_pHostEdit = new TQLineEdit(b);
- 	//m_pHostEdit->setMinimumWidth(120);
--	m_pHostEdit->tqsetAlignment(TQt::AlignLeft);
-+	m_pHostEdit->setAlignment(TQt::AlignLeft);
- #ifdef COMPILE_INFO_TIPS
- 	TQToolTip::add(m_pHostEdit,__tr2qs("<center>This the <b>hostname</b> that will match this user. <b>*</b> will match any hostname.</center>"));
- #endif
-@@ -481,7 +481,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
- 	tqlayout->addWidget(m_pIgnoreDcc);
- 
- 	TQWidget *w = new TQWidget(vb);
--	w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
-+	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
- 
- 	addTab(vb,__tr2qs("Ignore"));
- 
-diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
-index e42b3c3..d93fcf6 100644
---- a/src/modules/reguser/wizard.cpp
-+++ b/src/modules/reguser/wizard.cpp
-@@ -91,7 +91,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
-     m_pPage1Layout->addWidget(m_pLabel1, 0, 0);
- 
-     m_pEditRealName = new TQLineEdit(m_pPage1);
--    //m_pEditRealName->tqsetAlignment(int(TQLineEdit::AlignHCenter));
-+    //m_pEditRealName->setAlignment(int(TQLineEdit::AlignHCenter));
- 
-     m_pPage1Layout->addWidget(m_pEditRealName,1,0);
-     addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
-@@ -120,13 +120,13 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
- 	//KviIrcMask masktempl(szMask.ptr());
- 
-     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
--    m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
-+    m_pNicknameEdit1->setAlignment(TQt::AlignRight);
- 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
- 	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
-     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
- 
-     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
--    m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter);
-+    m_pUsernameEdit1->setAlignment(TQt::AlignHCenter);
- 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
- 	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
-     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
-@@ -137,11 +137,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
- 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
- 
-     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
--    m_pNicknameEdit2->tqsetAlignment(TQt::AlignRight);
-+    m_pNicknameEdit2->setAlignment(TQt::AlignRight);
-     m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0);
- 
-     m_pUsernameEdit2 = new TQLineEdit(m_pPage2);
--    m_pUsernameEdit2->tqsetAlignment(TQt::AlignHCenter);
-+    m_pUsernameEdit2->setAlignment(TQt::AlignHCenter);
-     m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2);
- 
-     m_pHostEdit2 = new TQLineEdit(m_pPage2);
-@@ -149,22 +149,22 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
- 
-     TextLabel10_2 = new TQLabel(m_pPage2);
-     TextLabel10_2->setText("<center><b>!</b></center>");
--    TextLabel10_2->tqsetAlignment(int(TQt::AlignCenter));
-+    TextLabel10_2->setAlignment(int(TQt::AlignCenter));
-     m_pPage2Layout->addWidget(TextLabel10_2,2,1);
- 
-     TextLabel10 = new TQLabel(m_pPage2);
-     TextLabel10->setText("<center><b>!</b></center>");
--    TextLabel10->tqsetAlignment(int(TQt::AlignCenter));
-+    TextLabel10->setAlignment(int(TQt::AlignCenter));
-     m_pPage2Layout->addWidget(TextLabel10,1,1);
- 
-     TextLabel10_3 = new TQLabel(m_pPage2);
-     TextLabel10_3->setText("<center><b>@</b></center>");
--    TextLabel10_3->tqsetAlignment(int(TQt::AlignCenter));
-+    TextLabel10_3->setAlignment(int(TQt::AlignCenter));
-     m_pPage2Layout->addWidget(TextLabel10_3,1,3);
- 
-     TextLabel10_3_2 = new TQLabel(m_pPage2);
-     TextLabel10_3_2->setText("<center><b>@</b></center>");
--    TextLabel10_3_2->tqsetAlignment(int(TQt::AlignCenter));
-+    TextLabel10_3_2->setAlignment(int(TQt::AlignCenter));
-     m_pPage2Layout->addWidget(TextLabel10_3_2,2,3);
- 
-     addPage(m_pPage2,__tr2qs("Step 2: Mask Selection"));
-diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
-index 858bad6..b0c72cf 100644
---- a/src/modules/setup/setupwizard.cpp
-+++ b/src/modules/setup/setupwizard.cpp
-@@ -103,7 +103,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
- 	m_pVBox = new KviTalVBox(this);
- 	m_pVBox->setSpacing(4);
- 	m_pVBox->setMargin(0);
--	//m_pVBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding));
-+	//m_pVBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding));
- 	//m_pVBox->setBackgroundColor(TQColor(0,80,0));
- 	//m_pVBox->setMaximumHeight(450);
- 	g->addWidget(m_pVBox,0,1);
-@@ -111,7 +111,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
- 	g->setColStretch(1,1);
- 
- 	TQLabel * l = new TQLabel(m_pVBox);
--	l->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
-+	l->setAlignment(TQt::AlignAuto | TQt::AlignTop);
- 	/*
- 	TQString szHeader = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" style=\"margin:0px;padding:0px;\" width=\"100%\"><tr><td bgcolor=\"#303030\">" \
- 			"<h1><font color=\"#FFFFFF\">KVIrc " KVI_VERSION "</font></h1>" \
-@@ -120,7 +120,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
- 	TQString szHeader = "<h1><font color=\"#FFFFFF\">&nbsp;KVIrc " KVI_VERSION "</font></h1>";
- 	l->setText(szHeader);
- 	l->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel);
--	l->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-+	l->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
- 	l->setMargin(0);
- 	l->setBackgroundColor(TQColor(48,48,48));
- 
-@@ -128,7 +128,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
- #ifdef COMPILE_USE_QT4
- 	m_pTextLabel->setWordWrap(true);
- #endif
--	m_pTextLabel->tqsetAlignment(TQt::AlignJustify | TQt::AlignTop);
-+	m_pTextLabel->setAlignment(TQt::AlignJustify | TQt::AlignTop);
- 	m_pVBox->setStretchFactor(m_pTextLabel,1);
- }
- 
-@@ -673,7 +673,7 @@ void KviSetupWizard::showEvent(TQShowEvent *e)
- 		if(ww < 770)ww = 770;
- 	}
- 	
--	//wh = tqsizeHint().height();
-+	//wh = sizeHint().height();
- 	
- 	setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh);
- 
-diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-index 157e375..c8aa9e4 100644
---- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
-+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-@@ -115,7 +115,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
- 		m_pExpireDateTimeEdit->setEnabled(f->expires());
- 	} else {
- 		m_pExpireCheckBox->setChecked(false);
--		m_pExpireDateTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime());
-+		m_pExpireDateTimeEdit->setDateTime(TQDateTime::currentDateTime());
- 		m_pExpireDateTimeEdit->setEnabled(false);
- 	}
- 	
-@@ -151,7 +151,7 @@ void KviSharedFileEditDialog::okClicked()
- 	TQString szPath = m_pFilePathEdit->text();
- 	TQDateTime dt = m_pExpireDateTimeEdit->dateTime();
- 	bool bExpires = m_pExpireCheckBox->isChecked();
--	if(bExpires && (dt <= TQDateTime::tqcurrentDateTime()))
-+	if(bExpires && (dt <= TQDateTime::currentDateTime()))
- 	{
- 		TQMessageBox::warning(this,__tr2qs_ctx("Invalid expire time","sharedfileswindow"),
- 			__tr2qs_ctx("The expire date/time is in the past: please either remove the \"expires\"" \
-@@ -336,7 +336,7 @@ void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const TQPoint &pnt
- 	KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->itemAt(pnt);
- 	if(!it)return;
- 	TQString txt = it->transfer()->tipText();
--	tip->tip(m_pListView->tqitemRect(it),txt);
-+	tip->tip(m_pListView->itemRect(it),txt);
- 
- }
- */
-@@ -679,9 +679,9 @@ void KviSharedFilesWindow::resizeEvent(TQResizeEvent *e)
- 	//m_pInput->setGeometry(0,height() - h,width(),h);
- }
- 
--TQSize KviSharedFilesWindow::tqsizeHint() const
-+TQSize KviSharedFilesWindow::sizeHint() const
- {
--	return m_pSplitter->tqsizeHint();
-+	return m_pSplitter->sizeHint();
- }
- 
- void KviSharedFilesWindow::fillCaptionBuffers()
-diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
-index 4832dc8..2f7f027 100644
---- a/src/modules/sharedfileswindow/sharedfileswindow.h
-+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
-@@ -102,7 +102,7 @@ protected:
- 	virtual void resizeEvent(TQResizeEvent *e);
- 	virtual void getBaseLogFileName(KviStr &buffer);
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- protected slots:
- 	void fillFileView();
- 	void sharedFileAdded(KviSharedFile * f);
-diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
-index 6ab0154..a5ee44e 100644
---- a/src/modules/socketspy/socketspywindow.cpp
-+++ b/src/modules/socketspy/socketspywindow.cpp
-@@ -67,9 +67,9 @@ void KviSocketSpyWindow::resizeEvent(TQResizeEvent *e)
- 	m_pSplitter->setGeometry(0,0,width(),height());
- }
- 
--TQSize KviSocketSpyWindow::tqsizeHint() const
-+TQSize KviSocketSpyWindow::sizeHint() const
- {
--	return m_pIrcView->tqsizeHint();
-+	return m_pIrcView->sizeHint();
- }
- 
- void KviSocketSpyWindow::getBaseLogFileName(KviStr &buffer)
-diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
-index b210ce0..7c2e924 100644
---- a/src/modules/socketspy/socketspywindow.h
-+++ b/src/modules/socketspy/socketspywindow.h
-@@ -42,7 +42,7 @@ protected:
- 	virtual void getBaseLogFileName(KviStr &buffer);
- 	virtual void applyOptions();
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	virtual void incomingMessage(const char * message);
- 	// message is NOT null terminated! For proxy connections it might spit out binary data!
- 	virtual void outgoingMessage(const char * message,int len);
-diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
-index d261846..8b581c2 100644
---- a/src/modules/term/termwidget.cpp
-+++ b/src/modules/term/termwidget.cpp
-@@ -117,7 +117,7 @@ void KviTermWidget::resizeEvent(TQResizeEvent *e)
- 	int hght = 0;
- 	if(m_bIsStandalone)
- 	{
--		hght = m_pCloseButton->tqsizeHint().height();
-+		hght = m_pCloseButton->sizeHint().height();
- 		m_pHBox->setGeometry(1,1,width() - 2,hght + 1);
- 
- 	}
-@@ -157,18 +157,18 @@ void KviTermWidget::changeColumns(int)
- {
- }
- 
--TQSize KviTermWidget::tqsizeHint() const
-+TQSize KviTermWidget::sizeHint() const
- {
- 	int hght = 0;
- 	int wdth = 0;
- 	if(m_pKonsoleWidget)
- 	{
--		hght += m_pKonsoleWidget->tqsizeHint().height();
--		wdth = m_pKonsoleWidget->tqsizeHint().width();
-+		hght += m_pKonsoleWidget->sizeHint().height();
-+		wdth = m_pKonsoleWidget->sizeHint().width();
- 	}
- 	if(m_pCloseButton)
- 	{
--		hght += m_pCloseButton->tqsizeHint().height();
-+		hght += m_pCloseButton->sizeHint().height();
- 	}
- 	
- 	return TQSize(wdth + 2,hght + 2);
-diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
-index 7573967..eb79836 100644
---- a/src/modules/term/termwidget.h
-+++ b/src/modules/term/termwidget.h
-@@ -60,7 +60,7 @@ protected slots:
- 	void changeColumns(int);
- public:
- 	TQWidget * konsoleWidget(){ return m_pKonsoleWidget ? m_pKonsoleWidget : this; };
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- 	int dummy() const { return 0; };
- protected slots:
- 	void konsoleDestroyed();
-diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
-index 700328f..0610a60 100644
---- a/src/modules/term/termwindow.cpp
-+++ b/src/modules/term/termwindow.cpp
-@@ -60,9 +60,9 @@ void KviTermWindow::resizeEvent(TQResizeEvent *e)
- 	if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height());
- }
- 
--TQSize KviTermWindow::tqsizeHint() const
-+TQSize KviTermWindow::sizeHint() const
- {
--	return m_pTermWidget ? m_pTermWidget->tqsizeHint() : KviWindow::tqsizeHint();
-+	return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint();
- }
- 
- void KviTermWindow::fillCaptionBuffers()
-diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
-index 340e743..1ac5a12 100644
---- a/src/modules/term/termwindow.h
-+++ b/src/modules/term/termwindow.h
-@@ -46,7 +46,7 @@ protected:
- 	virtual void fillCaptionBuffers();
- 	virtual void resizeEvent(TQResizeEvent *e);
- public:
--	virtual TQSize tqsizeHint() const;
-+	virtual TQSize sizeHint() const;
- };
- 
- 
-diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
-index 816917a..839f0f7 100644
---- a/src/modules/theme/managementdialog.cpp
-+++ b/src/modules/theme/managementdialog.cpp
-@@ -128,7 +128,7 @@ void KviThemeListBoxItem::paint(TQPainter * p)
- 	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;
- 	int www = p->window().width() - (afterIcon + LVI_BORDER);
- 	m_pText->setWidth(www);
--	m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->tqcolorGroup());
-+	m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->colorGroup());
- }
- 
- int KviThemeListBoxItem::height(const KviTalListBox * lb) const 
-@@ -198,7 +198,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
- 	connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreThemes()));
- 
- 	TQWidget *w= new TQWidget(hb);
--	w->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum);
-+	w->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum);
- 
- 	m_pListBox = new KviTalListBox(this);
- 	m_pListBox->setMinimumHeight(400);
-@@ -455,5 +455,5 @@ void KviThemeManagementDialog::tipRequest(KviDynamicToolTip *pTip,const TQPoint
- 		0
- 	);
- 
--	pTip->tip(m_pListBox->tqitemRect(it),szThemeDescription);
-+	pTip->tip(m_pListBox->itemRect(it),szThemeDescription);
- }
-diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
-index d29c632..6f2e24c 100644
---- a/src/modules/theme/packthemedialog.cpp
-+++ b/src/modules/theme/packthemedialog.cpp
-@@ -271,7 +271,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem
- 	m_pImageLabel = new TQLabel(pPage);
- 	m_pImageLabel->setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
- 	m_pImageLabel->setMinimumSize(300,225);
--	m_pImageLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter);
-+	m_pImageLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter);
- 	pLayout->addWidget(m_pImageLabel,1,0);
- 
- 	TQString szFilter = "*.png *.jpg *.xpm";
-@@ -393,7 +393,7 @@ bool KviPackThemeDialog::packTheme()
- 
- 	KviPackageWriter f;
- 
--	TQString szTmp = TQDateTime::tqcurrentDateTime().toString();
-+	TQString szTmp = TQDateTime::currentDateTime().toString();
- 
- 	f.addInfoField("PackageType","ThemePack");
- 	f.addInfoField("ThemePackVersion","1");
-diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
-index a38f33e..b6a93a0 100644
---- a/src/modules/theme/savethemedialog.cpp
-+++ b/src/modules/theme/savethemedialog.cpp
-@@ -158,7 +158,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(TQWidget * pParent)
- 	m_pImageLabel = new TQLabel(pPage);
- 	m_pImageLabel->setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
- 	m_pImageLabel->setMinimumSize(300,225);
--	m_pImageLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter);
-+	m_pImageLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter);
- 	pLayout->addWidget(m_pImageLabel,1,0);
- 
- 	TQString szFilter = "*.png *.jpg *.xpm";
-@@ -247,7 +247,7 @@ bool KviSaveThemeDialog::saveTheme()
- 
- 	sto.setAuthor(m_pAuthorNameEdit->text());
- 	sto.setDescription(m_pThemeDescriptionEdit->text());
--	sto.setDate(TQDateTime::tqcurrentDateTime().toString());
-+	sto.setDate(TQDateTime::currentDateTime().toString());
- 	sto.setVersion(m_pThemeVersionEdit->text());
- 	sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);
- 
-diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
-index 9fa3cc7..bcf2403 100644
---- a/src/modules/tip/libkvitip.cpp
-+++ b/src/modules/tip/libkvitip.cpp
-@@ -99,7 +99,7 @@ void KviTipFrame::drawContents(TQPainter *p)
- 
- 	TQRegion reg(0,0,1000,20000);
- 
--	doc.draw(p,70,10,reg,tqcolorGroup());
-+	doc.draw(p,70,10,reg,colorGroup());
- }
- 
- KviTipWindow::KviTipWindow()
-diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
-index 34b0689..927fbf7 100644
---- a/src/modules/toolbareditor/toolbareditor.cpp
-+++ b/src/modules/toolbareditor/toolbareditor.cpp
-@@ -61,7 +61,7 @@ KviTrashcanLabel::KviTrashcanLabel(TQWidget * p)
- 	TQToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them"));
- 	setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel);
- 	setAcceptDrops(true);
--	tqsetAlignment(TQt::AlignCenter);
-+	setAlignment(TQt::AlignCenter);
- 	setMinimumSize(40,40);
- 	m_uFlashCount = 0;
- 	m_pFlashTimer = 0;
-diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
-index 4bb7675..b3edd19 100644
---- a/src/modules/url/libkviurl.cpp
-+++ b/src/modules/url/libkviurl.cpp
-@@ -753,7 +753,7 @@ bool urllist_module_event_onUrl(KviKvsModuleEventCall * c)
- 
- 		KviUrl *tmp = new KviUrl;
- 		KviStr tmpTimestamp;
--		TQDate d = TQDate::tqcurrentDate();
-+		TQDate d = TQDate::currentDate();
- 		KviStr date(KviStr::Format,"%d-%d%d-%d%d",d.year(),d.month() / 10,d.month() % 10,d.day() / 10,d.day() % 10);
- 		tmpTimestamp = "["+date+"]"+" [";
- 		tmpTimestamp += TQTime::currentTime().toString()+"]";
diff --git a/redhat/applications/kvirc/bp001-f9114981.diff b/redhat/applications/kvirc/bp001-f9114981.diff
deleted file mode 100644
index f4ad562ea..000000000
--- a/redhat/applications/kvirc/bp001-f9114981.diff
+++ /dev/null
@@ -1,3358 +0,0 @@
-commit f91149819be7e7f45e68f22876f3c0062a11d4b9
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324316404 -0600
-
-    Remove additional unneeded tq method conversions
-
-diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
-index 3b564c1..b02e308 100644
---- a/src/kvilib/core/kvi_qstring.cpp
-+++ b/src/kvilib/core/kvi_qstring.cpp
-@@ -165,24 +165,24 @@ namespace KviTQString
- 	{
- 		double size = bytes;
- 		if(size<900)
--			return TQString(__tr2qs("%1 bytes")).tqarg(size,0,'f',3);
-+			return TQString(__tr2qs("%1 bytes")).arg(size,0,'f',3);
- 
- 		size/=1024;
- 		if(size<900)
--			return TQString(__tr2qs("%1 KB")).tqarg(size,0,'f',3);
-+			return TQString(__tr2qs("%1 KB")).arg(size,0,'f',3);
- 
- 		size/=1024;
- 		if(size<900)
--			return TQString(__tr2qs("%1 MB")).tqarg(size,0,'f',3);
-+			return TQString(__tr2qs("%1 MB")).arg(size,0,'f',3);
- 
- 		//Pirated DVD?;)
- 		size/=1024;
- 		if(size<900)
--			return TQString(__tr2qs("%1 GB")).tqarg(size,0,'f',3);
-+			return TQString(__tr2qs("%1 GB")).arg(size,0,'f',3);
- 
- 		//Uhm.. We are downloading a whole internet:)))
- 		size/=1024;
--		return TQString(__tr2qs("%1 TB")).tqarg(size,0,'f',3);
-+		return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3);
- 	}
- 
- 	bool equalCS(const TQString &sz1,const TQString &sz2)
-diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
-index 9d443c0..f2f39d2 100644
---- a/src/kvilib/ext/kvi_osinfo.cpp
-+++ b/src/kvilib/ext/kvi_osinfo.cpp
-@@ -350,17 +350,17 @@ static TQString queryWinInfo( QueryInfo info)
- 				TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"),
- 				0, KEY_TQUERY_VALUE, &hKey );
- 			if( lRet == ERROR_SUCCESS )
--				szVersion+= TQString("Service Pack 6a (Build %1)").tqarg( osvi.dwBuildNumber & 0xFFFF );         
-+				szVersion+= TQString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF );         
- 			else // Windows NT 4.0 prior to SP6a
- 			{
--				szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
-+				szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
- 			}
- 
- 			RegCloseKey( hKey );
- 		}
- 		else // not Windows NT 4.0 
- 		{
--			szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
-+			szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
- 		}
- 
- 		break;
-diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
-index 6b3dd91..9e87d78 100644
---- a/src/kvilib/net/kvi_http.cpp
-+++ b/src/kvilib/net/kvi_http.cpp
-@@ -164,7 +164,7 @@ bool KviHttpRequest::start()
- 	if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
- 	{
- 		resetInternalStatus();
--		m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr());
-+		m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol().ptr());
- 		return false;
- 	}
- 
-@@ -409,7 +409,7 @@ bool KviHttpRequest::openFile()
- 				TQString tmp = m_szFileName;
- 				do {
- 					i++;
--					m_szFileName = tmp + TQString(".kvirnm-%1").tqarg(i);
-+					m_szFileName = tmp + TQString(".kvirnm-%1").arg(i);
- 				} while(KviFile::exists(m_szFileName));
- 			}
- 			break;
-@@ -419,7 +419,7 @@ bool KviHttpRequest::openFile()
- 				TQString tmp;
- 				do {
- 					i++;
--					tmp = m_szFileName + TQString(".kvirnm-%1").tqarg(i);
-+					tmp = m_szFileName + TQString(".kvirnm-%1").arg(i);
- 				} while(KviFile::exists(tmp));
- 				TQDir d;
- 				if(!d.rename(m_szFileName,tmp))
-@@ -494,7 +494,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
- 	{
- 		// the response is invalid ?
- 		resetInternalStatus();
--		m_szLastError=__tr2qs("Invalid HTTP response: %s").tqarg(szResponse.ptr());
-+		m_szLastError=__tr2qs("Invalid HTTP response: %s").arg(szResponse.ptr());
- 		emit terminated(false);
- 		return false;
- 	}
-diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
-index 7bf7e34..3ee2ef8 100644
---- a/src/kvilib/system/kvi_locale.cpp
-+++ b/src/kvilib/system/kvi_locale.cpp
-@@ -957,9 +957,9 @@ namespace KviLocale
- 		// first of all try to find out the current locale
- 		g_szLang="";
- #ifdef COMPILE_USE_QT4
--		TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homePath());
-+		TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homePath());
- #else
--		TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
-+		TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath());
- #endif
- 		if(KviFileUtils::fileExists(szLangFile))
- 		{
-diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
-index 1a7f975..68e6967 100644
---- a/src/kvilib/tal/kvi_tal_listview.cpp
-+++ b/src/kvilib/tal/kvi_tal_listview.cpp
-@@ -324,7 +324,7 @@
- 	         && d->exclusive && d->exclusive->d
- 	         && d->exclusive->d->exclusive == this)
- 	        d->exclusive->turnOffChild();
--	    d->exclusive = 0; // so the tqchildren won't try to access us.
-+	    d->exclusive = 0; // so the children won't try to access us.
- 	    delete d;
- 	    d = 0;
- 	}
-@@ -403,7 +403,7 @@
- 	
- 	                        updateController(update, store);
- 	                } else {
--	                    // if there are no tqchildren we simply set the CheckBoxController and update its parent
-+	                    // if there are no children we simply set the CheckBoxController and update its parent
- 	                    setCurrentState(s);
- 	                    stateChange(state());
- 	                    if (parent() && parent()->rtti() == 1
-@@ -430,7 +430,7 @@
- 	        }
- 	        stateChange(state());
- 	    }
--	    tqrepaint();
-+	    repaint();
- 	}
- 	
- 	void KviTalCheckListItem::setCurrentState(ToggleState s)
-@@ -551,13 +551,13 @@
- 	    case CheckBox:
- 	        setCurrentState(storedState(key));
- 	        stateChange(state());
--	        tqrepaint();
-+	        repaint();
- 	        break;
- 	    case CheckBoxController: {
- 	        KviTalListViewItem *item = firstChild();
- 	        int childCount = 0;
- 	        while (item) {
--	            // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
-+	            // recursively calling restoreState for children of type CheckBox and CheckBoxController
- 	            if (item->rtti() == 1 &&
- 	                 (((KviTalCheckListItem*)item)->type() == CheckBox ||
- 	                   ((KviTalCheckListItem*)item)->type() == CheckBoxController)) {
-@@ -572,7 +572,7 @@
- 	            else
- 	                updateController(false);
- 	        } else {
--	            // if there are no tqchildren we retrieve the CheckBoxController state directly.
-+	            // if there are no children we retrieve the CheckBoxController state directly.
- 	            setState(storedState(key), true, false);
- 	        }
- 	    }
-@@ -622,7 +622,7 @@
- 	        if (update && controller) {
- 	            controller->updateController(update, store);
- 	        }
--	        tqrepaint();
-+	        repaint();
- 	    }
- 	}
- 	
-@@ -642,7 +642,7 @@
- 	        }
- 	        item = item->nextSibling();
- 	    }
--	    // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
-+	    // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
- 	    setStoredState(internalState() , key);
- 	}
- 	
-@@ -1056,7 +1056,7 @@
- 		 && d->exclusive && d->exclusive->d
- 		 && d->exclusive->d->exclusive == this )
- 		d->exclusive->turnOffChild();
--	    d->exclusive = 0; // so the tqchildren won't try to access us.
-+	    d->exclusive = 0; // so the children won't try to access us.
- 	    if ( d->statesDict )
- 		delete d->statesDict;
- 	    delete d;
-@@ -1137,7 +1137,7 @@
- 	
- 				updateController( update, store );
- 			} else {
--			    // if there are no tqchildren we simply set the CheckBoxController and update its parent
-+			    // if there are no children we simply set the CheckBoxController and update its parent
- 			    setCurrentState( s );
- 			    stateChange( state() );
- 			    if ( parent() && parent()->rtti() == 1
-@@ -1164,7 +1164,7 @@
- 		}
- 		stateChange( state() );
- 	    }
--	    tqrepaint();
-+	    repaint();
- 	}
- 	
- 	void KviTalCheckListItem::setCurrentState( ToggleState s )
-@@ -1287,13 +1287,13 @@
- 	    case CheckBox:
- 		setCurrentState( storedState( key ) );
- 		stateChange( state() );
--		tqrepaint();
-+		repaint();
- 		break;
- 	    case CheckBoxController: {
- 		KviTalListViewItem *item = firstChild();
- 		int childCount = 0;
- 		while ( item ) {
--		    // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
-+		    // recursively calling restoreState for children of type CheckBox and CheckBoxController
- 		    if ( item->rtti() == 1 &&
- 			 ( ((KviTalCheckListItem*)item)->type() == CheckBox ||
- 			   ((KviTalCheckListItem*)item)->type() == CheckBoxController ) ) {
-@@ -1308,7 +1308,7 @@
- 		    else
- 			updateController( FALSE );
- 		} else {
--		    // if there are no tqchildren we retrieve the CheckBoxController state directly.
-+		    // if there are no children we retrieve the CheckBoxController state directly.
- 		    setState( storedState( key ), TRUE, FALSE );
- 		}
- 	    }
-@@ -1358,7 +1358,7 @@
- 		if ( update && controller ) {
- 		    controller->updateController( update, store );
- 		}
--		tqrepaint();
-+		repaint();
- 	    }
- 	}
- 	
-@@ -1378,7 +1378,7 @@
- 		}
- 		item = item->nextSibling();
- 	    }
--	    // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
-+	    // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
- 	    setStoredState( internalState() , key );
- 	}
- 	
-diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
-index cf72e9f..47d23fb 100644
---- a/src/kvilib/tal/kvi_tal_listview_qt3.h
-+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
-@@ -143,7 +143,7 @@ public:
- 	KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
- 	~KviTalCheckListItem();
- 
--	void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
-+	void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int alignment );
-     virtual void paintFocus( TQPainter *, const TQColorGroup & cg,
- 			     const TQRect & r );
-     int width( const TQFontMetrics&, const KviTalListView*, int column) const;
-diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
-index 83e4686..15acac6 100644
---- a/src/kvilib/tal/kvi_tal_listview_qt4.h
-+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
-@@ -152,7 +152,7 @@ public:
-     ~KviTalCheckListItem();
- 
-     void paintCell(TQPainter *, const TQColorGroup & cg,
--                    int column, int width, int tqalignment);
-+                    int column, int width, int alignment);
-     virtual void paintFocus(TQPainter *, const TQColorGroup &cg,
-                              const TQRect & r);
-     int width(const TQFontMetrics&, const KviTalListView*, int column) const;
-diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
-index a0aee30..396aa65 100644
---- a/src/kvilib/tal/kvi_tal_wizard.cpp
-+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
-@@ -413,7 +413,7 @@ void KviTalWizard::setCurrentPage(KviTalWizardPageData * pData)
- 		szSteps = "<nobr><font color=\"";
- 		szSteps += clrMid.name();
- 		szSteps += "\"><b>[";
--		szSteps += TQString("Step %1 of %2").tqarg(pData->iVisibleIndex).tqarg(m_p->iEnabledPageCount);
-+		szSteps += TQString("Step %1 of %2").arg(pData->iVisibleIndex).arg(m_p->iEnabledPageCount);
- 		szSteps += "]</b></font></nobr>";
- 	}
- 
-diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
-index c0afdad..1f9224c 100644
---- a/src/kvirc/kernel/kvi_app.cpp
-+++ b/src/kvirc/kernel/kvi_app.cpp
-@@ -1038,7 +1038,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
- 				if(szNick.isEmpty())
- 					szMsg = __tr2qs("File download failed");
- 				else
--					szMsg = __tr2qs("File download from %1 failed").tqarg(szNick);
-+					szMsg = __tr2qs("File download from %1 failed").arg(szNick);
- 				szMsg += ": ";
- 				szMsg += szError;
- 				szMsg += " (";
-@@ -1049,7 +1049,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
- 				if(szNick.isEmpty())
- 					szMsg = __tr2qs("File download successfully complete");
- 				else
--					szMsg = __tr2qs("File download from %1 successfully complete").tqarg(szNick);
-+					szMsg = __tr2qs("File download from %1 successfully complete").arg(szNick);
- 				szMsg += " (";
- 				szMsg += szLocalFileName;
- 				szMsg += ")";
-@@ -1117,7 +1117,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
- #endif
- 			rinfo.activate();
- 
--		    TQString name = TQString("DESKTOP%1").tqarg(rinfo.currentDesktop());
-+		    TQString name = TQString("DESKTOP%1").arg(rinfo.currentDesktop());
- 
- 			g_pKdeDesktopBackground = new KSharedPixmap();
- 			connect(g_pKdeDesktopBackground,TQT_SIGNAL(done(bool)),this,TQT_SLOT(kdeRootPixmapDownloadComplete(bool)));
-@@ -1141,7 +1141,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
- 				return;
- 			}
- 
--			if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").tqarg(rinfo.currentDesktop())))
-+			if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").arg(rinfo.currentDesktop())))
- 			{
- 				debug("Can't load the KDE root background image...");
- 				delete g_pKdeDesktopBackground;
-diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
-index 4051d21..fb6fa04 100644
---- a/src/kvirc/kernel/kvi_coreactions.cpp
-+++ b/src/kvirc/kernel/kvi_coreactions.cpp
-@@ -958,7 +958,7 @@ void KviChangeUserModeAction::popupAboutToShow()
- 	{
- 		TQChar ccc = szModes[0];
- 		szModes.remove(0,1);
--		id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),TQString("+%1 Mode").tqarg(ccc));
-+		id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),TQString("+%1 Mode").arg(ccc));
- 		m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode(ccc.latin1()));
- 	}
- }
-diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
-index 3f39398..d3d4114 100644
---- a/src/kvirc/kernel/kvi_filetransfer.cpp
-+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
-@@ -186,5 +186,5 @@ int KviFileTransfer::displayHeight(int iLineSpacing)
- 
- void KviFileTransfer::displayUpdate()
- {
--	if(m_pDisplayItem)m_pDisplayItem->tqrepaint();
-+	if(m_pDisplayItem)m_pDisplayItem->repaint();
- }
-diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
-index da6246a..2487617 100644
---- a/src/kvirc/kernel/kvi_ipc.cpp
-+++ b/src/kvirc/kernel/kvi_ipc.cpp
-@@ -108,21 +108,21 @@
- 			}
- 	
- 			Window root,parent;
--			Window * tqchildren;
-+			Window * children;
- 			unsigned int nChildren;
- 	
--			if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&tqchildren,&nChildren))
-+			if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&children,&nChildren))
- 			{
--				if(tqchildren)XFree((char *)tqchildren);
-+				if(children)XFree((char *)children);
- 				return 0;
- 			}
- 	
- 			Window found = 0;
- 	
- 		    for(int i=nChildren-1;(!found) && (i >= 0);i--)
--				found = kvi_x11_findIpcSentinel(tqchildren[i]);
-+				found = kvi_x11_findIpcSentinel(children[i]);
- 	
--	 		if(tqchildren)XFree((char *)tqchildren);
-+	 		if(children)XFree((char *)children);
- 	
- 			return found;
- 		}
-diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
-index 0dafad9..f496603 100644
---- a/src/kvirc/kernel/kvi_ircurl.cpp
-+++ b/src/kvirc/kernel/kvi_ircurl.cpp
-@@ -222,7 +222,7 @@ void KviIrcUrl::join(TQString &uri, KviIrcServer* server)
- 
- 		uri.append("://");
- 		uri.append(server->hostName());
--		if(server->port()!=6667) uri.append(TQString(":%1").tqarg(server->port()));
-+		if(server->port()!=6667) uri.append(TQString(":%1").arg(server->port()));
- 		uri.append("/");
- 	}
- }
-@@ -310,7 +310,7 @@ int KviIrcUrl::run(const TQString& text,int contextSpec,KviConsole* pConsole)
- 			szCommand.append(szJoinCommand);
- 			szCommand.append("\" ");
- 		}
--		szCommand.append(TQString("%1 %2 ").tqarg(parts.szHost).tqarg(parts.iPort));
-+		szCommand.append(TQString("%1 %2 ").arg(parts.szHost).arg(parts.iPort));
- 
- 		if(pConsole->connection()) {
- 			KviIrcServer* server = pConsole->connection()->target()->server();
-diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-index 55c086d..b2fc61b 100644
---- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-@@ -254,7 +254,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
- 		@description:
- 			This event is triggered in the first console of a new frame window.
- 			A frame window is the toplevel window that contains the consoles
--			and the other MDI tqchildren windows.
-+			and the other MDI children windows.
- 		@seealso:
- 			[event:onframewindowdestroyed]OnFrameWindowDestroyed[/event]
- 	*/
-diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
-index eaae3fd..e5ff0a5 100644
---- a/src/kvirc/kvs/kvi_kvs_object.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
-@@ -69,11 +69,11 @@
- 		[big]Basic concepts[/big]
- 
- 		Objects are arranged in tree structures.
--		Each object that you create is either toplevel object or a tqchildren
-+		Each object that you create is either toplevel object or a children
- 		of another object. A toplevel object is a parentless one.
--		Obviously all objects can have tqchildren objects.[br][br]
-+		Obviously all objects can have children objects.[br][br]
- 
--		When an object is destroyed , all its tqchildren are also destroyed.
-+		When an object is destroyed , all its children are also destroyed.
- 		The toplevel objects are automatically destroyed when KVIrc quits.
- 		The objects are global to the entire application (this is different
- 		from previous KVIrc releases where the objects were local
-@@ -121,7 +121,7 @@
- 		[example]
- 			[cmd]delete[/cmd] %myobject
- 		[/example]
--		If the destroyed object has tqchildren objects , these are destroyed too.[br][br]
-+		If the destroyed object has children objects , these are destroyed too.[br][br]
- 
- 		[big]Fields : objects as pseudo-structures[/big]
- 
-@@ -196,15 +196,15 @@
- 			[cmd]delete[/cmd] %tmp
- 		[/example]
- 		Another cool function exported by the [class:object]object[/class] class is the
--		[classfnc:object]$tqchildren[/classfnc]() function.
--		It returns a comma separated list of tqchildren identifiers.[br]
-+		[classfnc:object]$children[/classfnc]() function.
-+		It returns a comma separated list of children identifiers.[br]
- 		[example]
- 			%tmp = [fnc]$new[/fnc]([class]object[/class],0,myobject)
- 			%tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child1)
- 			%tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child2)
- 			%tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child3)
--			[cmd]echo[/cmd] The object's tqchildren list is : %tmp->[classfnc:object]$tqchildren[/classfnc]()
--			# Destroy the object and the tqchildren
-+			[cmd]echo[/cmd] The object's children list is : %tmp->[classfnc:object]$children[/classfnc]()
-+			# Destroy the object and the children
- 			[cmd]delete[/cmd] %tmp
- 		[/example]
- 		There are two special functions for each objects: the "constructor" and the "destructor".
-@@ -230,25 +230,25 @@
- 			[cmd]privateimpl[/cmd](%tmp,destructor)
- 			{
- 				%count = 0;
--				[cmd]foreach[/cmd](%t,[fnc]$this[/fnc]-&gt;[classfnc:object]$tqchildren[/classfnc]())
-+				[cmd]foreach[/cmd](%t,[fnc]$this[/fnc]-&gt;[classfnc:object]$children[/classfnc]())
- 				{
- 					[cmd]echo[/cmd] Children : %t-&gt;[classfnc:object]$name[/classfnc]() with class %t-&gt;[classfnc:object]$class[/classfnc]()
- 					%count++
- 				}
--				[cmd]echo[/cmd] Just before destroying my %count tqchildren.
-+				[cmd]echo[/cmd] Just before destroying my %count children.
- 			}
--			# Destroy the object and the tqchildren
-+			# Destroy the object and the children
- 			[cmd]delete[/cmd] %tmp
- 		[/example]
- 
- 		In the example above four objects have been created.
--		A "parent" object named "myobject" , and three tqchildren objects.
-+		A "parent" object named "myobject" , and three children objects.
- 		The destructor has been reimplemented for each child object,
- 		to make it "say" its name (Please note the usage of [fnc]$this[/fnc]).
--		In the parent destructor the tqchildren have been counted and listed.[br]
-+		In the parent destructor the children have been counted and listed.[br]
- 		Then the parent object is destroyed causing to:[br]
- 		- trigger the parent destructor.[br]
--		- destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br]
-+		- destroy all the children (and conseguently trigger all the "individual" destructors).[br][br]
- 
- 		Not all the object functions must return a value:
- 		If a function does not return a meaningful value , or you just want to ignore it , you can call it in the following way:[br]
-@@ -339,7 +339,7 @@
- 
- 		The above class is named "helloworld". It inherits the [class]object[/class] class.
- 		This means that it acquires all the [class]object[/class] fuunctions: [classfnc:object]$name[/classfnc]() ,
--		[classfnc:object]$class[/class]() , [classfnc:object]$tqchildren[/classfnc]()...
-+		[classfnc:object]$class[/class]() , [classfnc:object]$children[/classfnc]()...
- 		Additionally , it has the $sayhello() function, that "echoes Hello world" to the console.
- 		Now you can create an instance of this class:
- 		[example]
-@@ -486,7 +486,7 @@
- 	@description:
- 		This is the base class for all the builtin KVirc object classes.
- 		It exports the functions to retrieve the object name, to iterate
--		through tqchildren objects and to lookup a child object by name or class.
-+		through children objects and to lookup a child object by name or class.
- 		Additionally , this class provides the builtin timer functionality.
- 		The [classfnc]$constructor[/classfnc] and [classfnc]$destructor[/classfnc]
- 		functions are empty implementations that all the other classes inherit.
-@@ -521,15 +521,15 @@
- 		Returns the first child that matches <class> and <name>.
- 		If <class> is an empty string, any class matches,
- 		if <name> is an empty string, any name matches.
--		This function traverses the entire tree of tqchildren
-+		This function traverses the entire tree of children
- 		but is NOT recursive.
- 		!fn: $childCount()
--		Returns the number of tqchildren objects
-+		Returns the number of children objects
- 		!fn: $emit(<signal_name>[,parameters])
- 		Emits the signal <signal_name> passing the optional [parameters].
- 		See the [doc:objects]objects documentation[/doc] for an overview of signals and slots.
--		!fn: $tqchildren()
--		Returns an array of tqchildren object identifiers.
-+		!fn: $children()
-+		Returns an array of children object identifiers.
- 		!fn: $signalSender()
- 		Returns the current signal sender when in a slot connected to a signal.
- 		In other contexts this function returns an empty string.
-@@ -955,7 +955,7 @@ bool KviKvsObject::function_destructor(KviKvsObjectFunctionCall * c)
- 	return true;
- }
- 
--bool KviKvsObject::function_tqchildren(KviKvsObjectFunctionCall * c)
-+bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c)
- {
- 	KviKvsArray * a = new KviKvsArray();
- 	int id=0;
-diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
-index a19bd5f..f59c098 100644
---- a/src/kvirc/kvs/kvi_kvs_object.h
-+++ b/src/kvirc/kvs/kvi_kvs_object.h
-@@ -164,7 +164,7 @@ protected:
- 	bool function_findChild(KviKvsObjectFunctionCall *c);
- 	bool function_childCount(KviKvsObjectFunctionCall *c);
- 	bool function_emit(KviKvsObjectFunctionCall *c);
--	bool function_tqchildren(KviKvsObjectFunctionCall *c);
-+	bool function_children(KviKvsObjectFunctionCall *c);
- 	bool function_signalSender(KviKvsObjectFunctionCall *c);
- 	bool function_signalName(KviKvsObjectFunctionCall *c);
- 	bool function_destructor(KviKvsObjectFunctionCall *c);
-diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
-index b2c1c8b..4739f33 100644
---- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
-@@ -73,7 +73,7 @@ void KviKvsObjectController::init()
- 	m_pObjectClass->registerFunctionHandler("findChild",KVI_PTR2MEMBER(KviKvsObject::function_findChild));
- 	m_pObjectClass->registerFunctionHandler("childCount",KVI_PTR2MEMBER(KviKvsObject::function_childCount));
- 	m_pObjectClass->registerFunctionHandler("emit",KVI_PTR2MEMBER(KviKvsObject::function_emit));
--	m_pObjectClass->registerFunctionHandler("tqchildren",KVI_PTR2MEMBER(KviKvsObject::function_tqchildren));
-+	m_pObjectClass->registerFunctionHandler("children",KVI_PTR2MEMBER(KviKvsObject::function_children));
- 	m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender));
- 	m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName));
- 	m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor));
-diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-index 2f3219c..53ac882 100644
---- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-@@ -330,7 +330,7 @@ void KviKvsProcessAsyncOperation::processExited()
- 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED)
- 	{
- 		TQString szRetVal;
--		szRetVal.setNum(m_pProcess->exiStatus());
-+		szRetVal.setNum(m_pProcess->exitStatus());
- 		trigger(EventTerminated,szRetVal);
- 	}
- 	
-diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
-index c303ceb..42338ae 100644
---- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
-@@ -34,7 +34,7 @@ KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const TQChar * pLocatio
- : KviKvsTreeNodeData(pLocation)
- {
- #ifdef DEBUGME
--	if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two tqchildren!");
-+	if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two children!");
- #endif
- 	m_pSubData = pSubData;
- 	m_pSubData->setAutoDelete(true);
-diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-index 86e129d..b7150e8 100644
---- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
-+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-@@ -1156,12 +1156,12 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg)
- 
- #ifdef COMPILE_ON_WINDOWS
- 			szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE;
--			szVersion.append(TQString(" - %1").tqarg(KviOsInfo::version()));
-+			szVersion.append(TQString(" - %1").arg(KviOsInfo::version()));
- #else
- 			szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS;
--			szVersion.append(TQString(" - %1 (%2)").tqarg(KviOsInfo::name()).tqarg(KviOsInfo::release()));
-+			szVersion.append(TQString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release()));
- #endif
--			//szVersion.append(TQString(" - QT Version: %1 - %2").tqarg(qVersion()).tqarg(__tr2qs("http://www.kvirc.net/")));
-+			//szVersion.append(TQString(" - QT Version: %1 - %2").arg(qVersion()).arg(__tr2qs("http://www.kvirc.net/")));
- 			if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
- 			{
- 				TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix);
-@@ -1460,7 +1460,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
- 
- 	if(bTargetFound)
- 	{
--		TQString szMsg = TQString("\r!n\r%1\r ").tqarg(msg->pSource->nick());
-+		TQString szMsg = TQString("\r!n\r%1\r ").arg(msg->pSource->nick());
- 		szMsg += szData;
- 		if(bIsChannel)
- 		{
-@@ -1531,7 +1531,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
- 								KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs),&(a->name()),&(a->localPath()),&szUserMask);
- 						}
- 					}
--					//if(o)szReply.append(TQString(" %1").tqarg(o->fileSize()));
-+					//if(o)szReply.append(TQString(" %1").arg(o->fileSize()));
- 				}
- 				
- 				szReply.append(szGenderTag);
-diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
-index c35b1fe..c22b36b 100644
---- a/src/kvirc/ui/kvi_channel.cpp
-+++ b/src/kvirc/ui/kvi_channel.cpp
-@@ -704,7 +704,7 @@ void KviChannel::getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPas
- 		} else {
- 			// (l.count() - 1) is > 1
- 			buffer += "</b> ";
--			buffer += __tr2qs("and other %1 users").tqarg(l.count() - 1);
-+			buffer += __tr2qs("and other %1 users").arg(l.count() - 1);
- 		}
- 		buffer += " ";
- 		buffer += bPast ? __tr2qs("were talking recently") : __tr2qs("are talking");
-@@ -1607,14 +1607,14 @@ void KviChannel::preprocessMessage(TQString & szMessage)
- 	for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) {
- 		if((*it).contains('\r')) continue;
- 		TQString tmp = KviMircCntrl::stripControlBytes(*it);
--		if( findEntry(*it) ) 	*it=TQString("\r!n\r%1\r").tqarg(*it);
-+		if( findEntry(*it) ) 	*it=TQString("\r!n\r%1\r").arg(*it);
- 		if(m_pConsole)
- 			if(m_pConsole->connection())
- 				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0]))
- 					if((*it)==tmp)
--						*it=TQString("\r!c\r%1\r").tqarg(*it);
-+						*it=TQString("\r!c\r%1\r").arg(*it);
- 					else
--						*it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it);
-+						*it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it);
- 	}
- 	szMessage=strings.join(" ");
- }
-diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
-index b2a19f4..a4eba90 100644
---- a/src/kvirc/ui/kvi_console.cpp
-+++ b/src/kvirc/ui/kvi_console.cpp
-@@ -353,7 +353,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
- #else
- 		TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap()));
- #endif
--		buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width());
-+		buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width());
- 	}
- 
- 	if(e->hasRealName())
-@@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
- 	if(e->hasServer())
- 	{
- 		buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>";
--		buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server());
-+		buffer += __tr2qs("Using server <b>%1</b>").arg(e->server());
- 
- 		if(e->hasHops())
- 		{
- 			buffer += " (";
--			buffer += __tr2qs("%1 hops").tqarg(e->hops());
-+			buffer += __tr2qs("%1 hops").arg(e->hops());
- 			buffer += ")</nobr></td></tr>";
- 		} else {
- 			buffer += "</nobr></td></tr></table>";
-@@ -445,7 +445,7 @@ void KviConsole::saveProperties(KviConfig *cfg)
- 
- void KviConsole::getBaseLogFileName(TQString &buffer)
- {
--	buffer=TQString("CONSOLE%1").tqarg(ircContextId());
-+	buffer=TQString("CONSOLE%1").arg(ircContextId());
- }
- 
- void KviConsole::showNotifyList(bool bShow)
-@@ -649,7 +649,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
- 	szSource.prepend(' ');
- 	if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection())
- 	{
--		if(szSource.find(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1)
-+		if(szSource.find(TQString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1)
- 			return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName());
- 	}
- 
-@@ -661,7 +661,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
- 			if((*it).isEmpty())
- 				continue;
- 			// FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!!
--			if(szSource.find(TQString(" %1 ").tqarg(*it),0,false) > -1)
-+			if(szSource.find(TQString(" %1 ").arg(*it),0,false) > -1)
- 			{
- 				return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it);
- 			}
-@@ -835,7 +835,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
- 						KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \
- 						KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP))));
- 				}
--				szNick.prepend(TQString("%1").tqarg(color));
-+				szNick.prepend(TQString("%1").arg(color));
- 				szNick.prepend(KVI_TEXT_COLOR);
- 				szNick.append(KVI_TEXT_COLOR);
- 			}
-diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
-index e6b234e..e974b94 100644
---- a/src/kvirc/ui/kvi_customtoolbar.cpp
-+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
-@@ -169,9 +169,9 @@ void KviCustomToolBar::beginCustomize()
- 	if(m_pFilteredChildren)delete m_pFilteredChildren;
- 	m_pFilteredChildren = new KviPointerHashTable<void *,bool>;
- 	m_pFilteredChildren->setAutoDelete(true);
--	// filter the events for all the tqchildren
-+	// filter the events for all the children
- #ifdef COMPILE_USE_QT4
--	TQList<TQObject*> l = tqchildren();
-+	TQList<TQObject*> l = children();
- 	for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it)
- 	{
- 		if((*it)->isWidgetType())
-@@ -193,7 +193,7 @@ void KviCustomToolBar::endCustomize()
- {
- 	// stop filtering events
- #ifdef COMPILE_USE_QT4
--	TQList<TQObject*> l = tqchildren();
-+	TQList<TQObject*> l = children();
- 	for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it)
- 	{
- 		if((*it)->isWidgetType())
-@@ -209,7 +209,7 @@ void KviCustomToolBar::endCustomize()
- 		++it;
- 	}
- #endif
--	// FIXME: We SHOULD MAKE SURE that the tqchildren are re-enabled...
-+	// FIXME: We SHOULD MAKE SURE that the children are re-enabled...
- 	// this could be done by calling setEnabled(isEnabled()) on each action ?
- 	if(m_pFilteredChildren)
- 	{
-@@ -238,7 +238,7 @@ void KviCustomToolBar::childEvent(TQChildEvent *e)
- {
- 	if(KviActionManager::customizingToolBars())
- 	{
--		// this is useful for droppped and dragged-out tqchildren
-+		// this is useful for droppped and dragged-out children
- 		if(e->type() == TQEvent::ChildInserted)
- 		{
- 			if(e->child()->isWidgetType())
-@@ -345,7 +345,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex
- 	if(!l)return 0;
- 	TQLayoutIterator it = l->iterator();
- 	
--	// find the tqchildren with minimum distance
-+	// find the children with minimum distance
- 	int iMinDistIdx = -1;
- 	TQWidget * pMinDistW = 0;
- 	unsigned int uMinDist = 0xffffffff;
-@@ -527,11 +527,11 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
- 	if(!KviActionManager::customizingToolBars())goto unhandled; // anything here is done when customizing only
- 	if(e->type() == TQEvent::Enter)
- 	{
--		if(m_pMovedChild)return true; // kill it while moving other tqchildren
-+		if(m_pMovedChild)return true; // kill it while moving other children
- 	}
- 	if(e->type() == TQEvent::Leave)
- 	{
--		if(m_pMovedChild)return true; // kill it while moving other tqchildren
-+		if(m_pMovedChild)return true; // kill it while moving other children
- 	}
- 	if(e->type() == TQEvent::MouseButtonPress)
- 	{
-@@ -550,7 +550,7 @@ bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e)
- 					))
- 				{
- 					m_pMovedChild = (TQWidget *)o;
--					// allow resizing of tqchildren
-+					// allow resizing of children
- 					// FIXME: do it only if the child is really resizable
- 					if(m_pMovedChild->width() > 20) // might be an applet
- 					{
-diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
-index 96c63e6..49084c3 100644
---- a/src/kvirc/ui/kvi_frame.cpp
-+++ b/src/kvirc/ui/kvi_frame.cpp
-@@ -1085,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
- 	{
- 		for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
- 		{
--			TQString label = __tr2qs("Show %1").tqarg(d->visibleName());
-+			TQString label = __tr2qs("Show %1").arg(d->visibleName());
- 			if(d->icon())id = p->insertItem(*(d->icon()),label);
- 			else id = p->insertItem(label);
- 			p->setItemChecked(id,moduleExtensionToolBar(d->id()));
-@@ -1101,7 +1101,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
- 		if(cnt > 0)p->insertSeparator();
- 		while(KviCustomToolBarDescriptor * d = it2.current())
- 		{
--			TQString label = __tr2qs("Show %1").tqarg(d->label());
-+			TQString label = __tr2qs("Show %1").arg(d->label());
- 			TQString ico = d->iconId();
- 			// use the icon only if there is no check
- 			if(d->toolBar())
-diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
-index 5f18eb4..cf5c430 100644
---- a/src/kvirc/ui/kvi_frame.h
-+++ b/src/kvirc/ui/kvi_frame.h
-@@ -110,7 +110,7 @@ protected:
- 	KviDockExtension                      * m_pDockExtension;                // the frame's dock extension: this should be prolly moved ?
- 	KviAccel                              * m_pAccel;                        // the global accelelrator
- public:
--	// the mdi manager: handles mdi tqchildren
-+	// the mdi manager: handles mdi children
- 	KviMdiManager * mdiManager(){ return m_pMdi; };
- 	// the splitter is the central widget for this frame
- 	TQSplitter * splitter(){ return m_pSplitter; };
-diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
-index 5445738..5d2e1c6 100644
---- a/src/kvirc/ui/kvi_input.cpp
-+++ b/src/kvirc/ui/kvi_input.cpp
-@@ -1325,7 +1325,7 @@ void KviInputEditor::imComposeEvent(TQIMEvent *e)
- #endif
- 
- 
--	// tqrepaint
-+	// repaint
- 	m_bUpdatesEnabled = true;
- 	repaintWithCursorOn();
- 	e->accept();
-@@ -1347,7 +1347,7 @@ void KviInputEditor::imEndEvent(TQIMEvent *e)
- 	// move cursor to after the IM result text
- 	moveCursorTo(m_iIMStart + m_iIMLength);
- 
--	// tqrepaint
-+	// repaint
- 	m_bUpdatesEnabled = true;
- 	repaintWithCursorOn();
- 
-@@ -2497,7 +2497,7 @@ void KviInput::keyPressEvent(TQKeyEvent *e)
- 												"here to prevent you from accidentally sending<br>" \
- 												"a really large message just because you didn't edit it<br>" \
- 												"properly after pasting text from the clipboard.<br><br>" \
--												"Do you want the message to be sent?").tqarg(nLines),
-+												"Do you want the message to be sent?").arg(nLines),
- 										__tr2qs("Yes, always"),
- 										__tr2qs("Yes"),
- 										__tr2qs("No"),
-@@ -2543,7 +2543,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
- 		KviScriptEditor::destroyInstance(m_pMultiLineEditor);
- 		m_pMultiLineEditor = 0;
- 		m_pInputEditor->show();
--		m_pWindow->tqchildrenTreeChanged(0);
-+		m_pWindow->childrenTreeChanged(0);
- 		m_pInputEditor->setFocus();
- 		m_pMultiEditorButton->setOn(false);
- 	} else {
-@@ -2556,7 +2556,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
- 		m_pMultiLineEditor->setFindLineeditReadOnly(true);
- 		m_pInputEditor->hide();
- 		m_pMultiLineEditor->show();
--		m_pWindow->tqchildrenTreeChanged(m_pMultiLineEditor);
-+		m_pWindow->childrenTreeChanged(m_pMultiLineEditor);
- 		m_pMultiLineEditor->setFocus();
- 		m_pMultiEditorButton->setOn(true);
- 	}
-@@ -2596,14 +2596,14 @@ void KviInput::historyButtonClicked()
- 
- void KviInput::setFocus()
- {
--	// redirect setFocus() to the right tqchildren
-+	// redirect setFocus() to the right children
- 	if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus();
- 	else m_pInputEditor->setFocus();
- }
- 
- void KviInput::focusInEvent(TQFocusEvent * e)
- {
--	// if we get a focus in event , redirect the focus to the tqchildren
-+	// if we get a focus in event , redirect the focus to the children
- 	if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus();
- 	else m_pInputEditor->setFocus();
- }
-diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
-index 9d469f7..9eb166c 100644
---- a/src/kvirc/ui/kvi_ircview.cpp
-+++ b/src/kvirc/ui/kvi_ircview.cpp
-@@ -290,7 +290,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
- #ifdef COMPILE_USE_QT4
- 	setAttribute(TQt::WA_NoSystemBackground); // This disables automatic qt double buffering
- 	setAttribute(TQt::WA_OpaquePaintEvent);
--	//setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger tqrepaint() instead of the 10 times faster paintEvent(0))
-+	//setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0))
- #endif
- 
- 	m_iFlushTimer = 0;
-@@ -346,7 +346,7 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
- 	m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>;
- 	m_pMessagesStoppedWhileSelecting->setAutoDelete(false);
- 
--	// say qt to avoid erasing on tqrepaint
-+	// say qt to avoid erasing on repaint
- #ifdef COMPILE_USE_QT4
- 	setAutoFillBackground(false);
- #else
-@@ -723,7 +723,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer)
- 
- void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType)
- {
--	TQString szToWrite=TQString("%1 %2\n").tqarg(iMsgType).tqarg(szBuffer);
-+	TQString szToWrite=TQString("%1 %2\n").arg(iMsgType).arg(szBuffer);
- 	KviTQCString szTmp = KviTQString::toUtf8(szToWrite);
- 	if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file.");
- }
-@@ -900,7 +900,7 @@ void KviIrcView::scrollBarPositionChanged(int newValue)
- 		}
- 	}
- 	if(!m_bSkipScrollBarRepaint)
--		tqrepaint();
-+		repaint();
- 		//update();
- //	if(!m_bSkipScrollBarRepaint)postUpdateEvent();
- }
-@@ -911,7 +911,7 @@ bool KviIrcView::event(TQEvent *e)
- 	{
- 		__range_valid(m_bPostedPaintEventPending);
- 		if(m_iUnprocessedPaintEventRequests)
--			tqrepaint();
-+			repaint();
- 		// else we just had a pointEvent that did the job
- 		m_bPostedPaintEventPending = false;
- 		return true;
-@@ -935,12 +935,12 @@ void KviIrcView::wheelEvent(TQWheelEvent *e)
- 
- void KviIrcView::postUpdateEvent()
- {
--	// This will post a TQEvent with a full tqrepaint request
-+	// This will post a TQEvent with a full repaint request
- 	if(!m_bPostedPaintEventPending)
- 	{
- 		m_bPostedPaintEventPending = true;
- 		TQEvent *e = new TQEvent(TQEvent::User);
--		g_pApp->postEvent(this,e); // queue a tqrepaint
-+		g_pApp->postEvent(this,e); // queue a repaint
- 	}
- 
- 	m_iUnprocessedPaintEventRequests++; // paintEvent() will set it to 0
-@@ -956,7 +956,7 @@ void KviIrcView::postUpdateEvent()
- 			fastScroll(3);
- #endif
- 		else
--			tqrepaint();
-+			repaint();
- 	}
- }
- 
-@@ -1093,7 +1093,7 @@ void KviIrcView::removeHeadLine(bool bRepaint)
- 		m_pLastLine  = 0;
- 	}
- 	if(bRepaint)
--		tqrepaint();
-+		repaint();
- }
- 
- void KviIrcView::splitMessagesTo(KviIrcView *v)
-@@ -1150,12 +1150,12 @@ void KviIrcView::splitMessagesTo(KviIrcView *v)
- 	m_pScrollBar->setRange(0,m_iNumLines);
- 	m_pScrollBar->setValue(m_iNumLines);
- 	
--	tqrepaint();
-+	repaint();
- 
- 	v->m_iLastScrollBarValue = v->m_iNumLines;
- 	v->m_pScrollBar->setRange(0,v->m_iNumLines);
- 	v->m_pScrollBar->setValue(v->m_iNumLines);
--	v->tqrepaint();
-+	v->repaint();
- 
- }
- 
-@@ -1183,7 +1183,7 @@ void KviIrcView::appendMessagesFrom(KviIrcView *v)
- 	m_pScrollBar->setRange(0,m_iNumLines);
- 	m_pScrollBar->setValue(m_iNumLines);
- 	
--	tqrepaint();
-+	repaint();
- }
- 
- void KviIrcView::joinMessagesFrom(KviIrcView *v)
-@@ -1243,7 +1243,7 @@ void KviIrcView::joinMessagesFrom(KviIrcView *v)
- 	m_pScrollBar->setRange(0,m_iNumLines);
- 	m_pScrollBar->setValue(m_iNumLines);
- 	
--	tqrepaint();
-+	repaint();
- }
- 
- void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags)
-@@ -2713,8 +2713,8 @@ void KviIrcView::fastScroll(int lines)
- 	if(!m_pFm)
- 	{
- 		// We must get the metrics from a real paint event :/
--		// must do a full tqrepaint to get them...
--		tqrepaint();
-+		// must do a full repaint to get them...
-+		repaint();
- 		return;
- 	}
- 
-@@ -2788,7 +2788,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
- 	int widgetWidth  = width() - scrollbarWidth;
- 	if(!isVisible() || (widgetWidth < 20))
- 	{
--		m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown...
-+		m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown...
- 		return; //can't show stuff here
- 	}
- 
-@@ -2800,7 +2800,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
- 		(m_pKviWindow->mdiParent() != g_pFrame->mdiManager()->topChild()) &&
- 		(m_pKviWindow->mdiParent()))
- 	{
--		m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown...
-+		m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown...
- 		return; // totally hidden behind other windows
- 	}
- 
-@@ -3955,7 +3955,7 @@ void KviIrcView::toggleToolWidget()
- 		delete m_pToolWidget;
- 		m_pToolWidget = 0;
- 		m_pCursorLine = 0;
--		tqrepaint();
-+		repaint();
- 
- 	} else {
- 		m_pToolWidget = new KviIrcViewToolWidget(this);
-@@ -3979,7 +3979,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l)
- 	if(m_pCursorLine == m_pCurLine)
- 	{
- 	
--	tqrepaint();
-+	repaint();
- 
- 		return;
- 	}
-@@ -4000,7 +4000,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l)
- 			m_iLastScrollBarValue = sc;
- 			m_pScrollBar->setValue(sc);
- 		} else {
--			tqrepaint();
-+			repaint();
- 		}
- 	} else {
- 		// The cursor line is over the current line
-@@ -4034,7 +4034,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l)
- 			m_iLastScrollBarValue = sc;
- 			m_pScrollBar->setValue(sc);
- 		} else {
--			tqrepaint();
-+			repaint();
- 		}
- 	}
- }
-@@ -4086,7 +4086,7 @@ do_pNext:
- 		} while(l != start);
- 	}
- 	m_pCursorLine = 0;
--	tqrepaint();
-+	repaint();
- 	if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found"));
- }
- 
-@@ -4140,7 +4140,7 @@ do_pPrev:
- 	}
- 	m_pCursorLine = 0;
- 
--	tqrepaint();
-+	repaint();
- 	if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found"));
- }
- 
-@@ -4302,12 +4302,12 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect
- 													szLink.append(TQChar(KVI_TEXT_COLOR));
- 													if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE)
- 													{
--														szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore)));
-+														szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore)));
- 													}
- 													if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE)
- 													{
- 														szLink.append(TQChar(','));
--														szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back)));
-+														szLink.append(TQString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back)));
- 													}
- 												break;
- 											}
-@@ -4581,7 +4581,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
- 						c->raise();
- 						c->setFocus();
- 					} else {
--						cmd = TQString("join %1").tqarg(szChan);
-+						cmd = TQString("join %1").arg(szChan);
- 					}
- 				}
- 			}
-@@ -4619,7 +4619,7 @@ void KviIrcView::mousePressEvent(TQMouseEvent *e)
- 		if(m_pToolWidget)
- 		{
- 			m_pCursorLine = getVisibleLineAt(e->pos().x(),e->pos().y());
--			tqrepaint();
-+			repaint();
- 		}
- 
- 		m_mousePressPos   = e->pos();
-@@ -4802,7 +4802,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *)
- 			m_pMessagesStoppedWhileSelecting->removeFirst();
- 			appendLine(l,false);
- 		}
--		tqrepaint();
-+		repaint();
- 	}
- }
- 
-@@ -4858,11 +4858,11 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e)
- 					int lastBottom = m_iLastLinkRectTop + m_iLastLinkRectHeight;
- 					int thisBottom = rectTop + rectHeight;
- 					TQRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top);
--					tqrepaint(r);
-+					repaint(r);
- 				} else {
- 					// no prev link
- 					TQRect r(0,rectTop,width(),rectHeight);
--					tqrepaint(r);
-+					repaint(r);
- 				}
- 				m_iLastLinkRectTop = rectTop;
- 				m_iLastLinkRectHeight = rectHeight;
-@@ -4872,7 +4872,7 @@ void KviIrcView::mouseMoveEvent(TQMouseEvent *e)
- 				{
- 					// There was a previous bottom rect
- 					TQRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight);
--					tqrepaint(r);
-+					repaint(r);
- 					m_iLastLinkRectTop = -1;
- 					m_iLastLinkRectHeight = -1;
- 				}
-@@ -5100,7 +5100,7 @@ void KviIrcView::timerEvent(TQTimerEvent *e)
- 	if(e->timerId() == m_iSelectTimer)
- 	{
- 		calculateSelectionBounds();
--		tqrepaint();
-+		repaint();
- 	}
- 	if(e->timerId() == m_iMouseTimer)
- 	{
-diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
-index c6f4138..d60ba16 100644
---- a/src/kvirc/ui/kvi_ircviewtools.cpp
-+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
-@@ -278,7 +278,7 @@ void KviIrcViewToolWidget::filterSave()
- void KviIrcViewToolWidget::forceRepaint()
- {
- 	#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) 
--		m_pIrcView->tqrepaint();
-+		m_pIrcView->repaint();
- 	#else
- 		m_pIrcView->paintEvent(0);
- 	#endif
-diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
-index c0dd4ba..168db46 100644
---- a/src/kvirc/ui/kvi_listview.cpp
-+++ b/src/kvirc/ui/kvi_listview.cpp
-@@ -190,7 +190,7 @@ void KviListView::resizeEvent(TQResizeEvent * e)
- {
- 	KviTalListView::resizeEvent(e);
- 	if(m_pBackgroundOverlayPixmap)
--	repaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here)
-+	repaintContents(); // force a full repaint (otherwise qt does not honor static background here)
- }
- 
- #ifdef COMPILE_ON_WINDOWS
-diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
-index 248a2a1..1a8dccc 100644
---- a/src/kvirc/ui/kvi_mdichild.cpp
-+++ b/src/kvirc/ui/kvi_mdichild.cpp
-@@ -112,7 +112,7 @@ TQRect KviMdiChild::restoredGeometry()
- {
- 	if(m_state == Maximized)return m_restoredGeometry;
- 	else return TQRect(x(),y(),width(),height());
--//	else return tqgeometry();
-+//	else return geometry();
- 
- }
- 
-@@ -172,7 +172,7 @@ void KviMdiChild::setCaption(const TQString & plain,const TQString & xmlActive,c
- void KviMdiChild::maximize()
- {
- 	if(m_state == Minimized)restore(); // restore first
--	if(m_state == Normal)m_restoredGeometry = tqgeometry();
-+	if(m_state == Normal)m_restoredGeometry = geometry();
- 	m_state = Maximized;
- 	manager()->maximizeChild(this);
- }
-@@ -225,7 +225,7 @@ void KviMdiChild::minimize()
- 			m_pManager->childMinimized(this,true);
- 		break;
- 		case Normal:
--			m_restoredGeometry = tqgeometry();
-+			m_restoredGeometry = geometry();
- 			hide();
- 			m_state = Minimized;
- 			m_pManager->childMinimized(this,false);
-diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
-index 59f5850..607f699 100644
---- a/src/kvirc/ui/kvi_mdimanager.cpp
-+++ b/src/kvirc/ui/kvi_mdimanager.cpp
-@@ -199,7 +199,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
- 			return; // no such child ?
- 		}
- 
--		// disable the labels of all the other tqchildren
-+		// disable the labels of all the other children
- 		//for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next())
- 		//{
- 		//	pC->captionLabel()->setActive(false);
-@@ -313,7 +313,7 @@ void KviMdiManager::childMoved(KviMdiChild *)
- 
- void KviMdiManager::maximizeChild(KviMdiChild * lpC)
- {
--	// the tqchildren must be moved once by the means of TQScrollView::moveChild()
-+	// the children must be moved once by the means of TQScrollView::moveChild()
- 	// so the TQScrollView internal structures get updated with the negative
- 	// position of the widget, otherwise, when restoring with moveChild()
- 	// it will refuse to move it back to the original position
-@@ -338,14 +338,14 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC)
- 		lpC->setFocus();
- 	}
- 	
--	// fixme: we could hide all the other tqchildren now!
-+	// fixme: we could hide all the other children now!
- }
- 
- 
- 
- void KviMdiManager::resizeEvent(TQResizeEvent *e)
- {
--	//If we have a maximized tqchildren at the top , adjust its size
-+	//If we have a maximized children at the top , adjust its size
- 	KviTalScrollView::resizeEvent(e);
- 	KviMdiChild *lpC=m_pZ->last();
- 	if(lpC)
-@@ -431,7 +431,7 @@ void KviMdiManager::focusTopChild()
- 	if(!lpC->isVisible())return;
- 	//	if(lpC->state()==KviMdiChild::Minimized)return;
- 	//	debug("Focusing top child %s",lpC->name());
--	//disable the labels of all the other tqchildren
-+	//disable the labels of all the other children
- 	for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next())
- 	{
- 		if(pC != lpC)
-diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
-index 7c817dd..9f9aba0 100755
---- a/src/kvirc/ui/kvi_modew.cpp
-+++ b/src/kvirc/ui/kvi_modew.cpp
-@@ -75,9 +75,9 @@ void KviModeWidget::refreshModes()
- {
- 	TQString szMode=m_pChannel->channelMode();
- 	if(!m_pChannel->channelKey().isEmpty())
--		szMode+=TQString(" k:%1").tqarg(m_pChannel->channelKey());
-+		szMode+=TQString(" k:%1").arg(m_pChannel->channelKey());
- 	if(!m_pChannel->channelLimit().isEmpty())
--		szMode+=TQString(" l:%1").tqarg(m_pChannel->channelLimit().ptr());
-+		szMode+=TQString(" l:%1").arg(m_pChannel->channelLimit().ptr());
- 	if(m_pLabel)
- 		m_pLabel->setText(szMode);
- }
-diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
-index a5455bb..ef70a1d 100644
---- a/src/kvirc/ui/kvi_query.cpp
-+++ b/src/kvirc/ui/kvi_query.cpp
-@@ -167,9 +167,9 @@ TQString KviQuery::getInfoLabelTipText()
- 			txt +=          "<tr><td>";
- 		
- 			if(e->hasRealName())
--				tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName()));
-+				tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
- 			else
--				tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask);
-+				tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask);
- 			
- 			tmp.replace('&',"&amp;");
- 			tmp.replace('<',"&lt;");
-@@ -183,21 +183,21 @@ TQString KviQuery::getInfoLabelTipText()
- 			{
- 				txt+="<tr><td>";
- 				if(e->hasHops())
--					txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops());
-+					txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops());
- 				else
--					txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server());
-+					txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server());
- 				txt+="</td></tr>";
- 			}
- 			
- 			if(e->isAway())
- 			{
- 				txt+="<tr><td>";
--				txt+=__tr2qs("%1 is probably away").tqarg(m_szName);
-+				txt+=__tr2qs("%1 is probably away").arg(m_szName);
- 				txt+="</td></tr>";
- 			}
- 			
- 			txt+="<tr><td>";
--			tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans);
-+			tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans);
- 			
- 			tmp.replace('&',"&amp;");
- 			tmp.replace('<',"&lt;");
-@@ -237,19 +237,19 @@ TQString KviQuery::getInfoLabelText()
- 				else 
- 					szMask+="*";
- 				if(e->hasRealName())
--					tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName()));
-+					tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
- 				else
--					tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask);
-+					tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask);
- 				if(e->hasServer())
--					tmp+=__tr2qs(", using server %1").tqarg(e->server());
-+					tmp+=__tr2qs(", using server %1").arg(e->server());
- 				if(e->hasHops())
--					tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops());
-+					tmp+=__tr2qs(" (%1 hops)").arg(e->hops());
- 				if(e->isAway())
- 					tmp+=__tr2qs(", probably away");
- 				tmp+="\n";
- 				TQString szChans;
- 				connection()->getCommonChannels(m_szName,szChans,0);
--				tmp+=__tr2qs("Common channels: %2").tqarg(szChans);
-+				tmp+=__tr2qs("Common channels: %2").arg(szChans);
- 			} else {
- 				tmp=__tr2qs("[Dead Query]");
- 			}
-diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp
-index d91be01..d3783c0 100644
---- a/src/kvirc/ui/kvi_splash.cpp
-+++ b/src/kvirc/ui/kvi_splash.cpp
-@@ -160,7 +160,7 @@ void KviSplashScreen::setProgress(int progress)
- 	painter.end();
- #endif
- 	//raise();
--	tqrepaint();
-+	repaint();
- 	g_pApp->processEvents(); //damn...
- }
- 
-diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
-index e67cef1..6f7e8e6 100644
---- a/src/kvirc/ui/kvi_styled_controls.cpp
-+++ b/src/kvirc/ui/kvi_styled_controls.cpp
-@@ -84,7 +84,7 @@ void KviStyledControlInternal::paintTimerShot ()
- 			m_pControl->m_pTimer->stop();
- 		}
- 	}
--	m_pControl->m_pWidget->tqrepaint( false );
-+	m_pControl->m_pWidget->repaint( false );
- }
- 
- KviStyledControl::KviStyledControl(TQWidget* w)
-@@ -118,7 +118,7 @@ void KviStyledControl::enterEvent ( TQEvent * )
- 		}
- 		m_bMouseEnter=1;
- 		m_iStepNumber++;
--		m_pWidget->tqrepaint( false );
-+		m_pWidget->repaint( false );
- 	}
- }
- 
-@@ -137,7 +137,7 @@ void KviStyledControl::leaveEvent ( TQEvent * )
- 		}
- 		m_bMouseEnter=0;
- 		m_iStepNumber--;
--		m_pWidget->tqrepaint( false );
-+		m_pWidget->repaint( false );
- 	}
- }
- 
-diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
-index 952501f..171e411 100644
---- a/src/kvirc/ui/kvi_taskbar.cpp
-+++ b/src/kvirc/ui/kvi_taskbar.cpp
-@@ -421,7 +421,7 @@ void KviTaskBarButton::setProgress(int progress)
- {
- 	if(progress == m_iProgress)return;
- 	m_iProgress = progress;
--	update(); // tqrepaint(false) ?
-+	update(); // repaint(false) ?
- }
- 
- void KviTaskBarButton::unhighlight()
-@@ -439,7 +439,7 @@ void KviTaskBarButton::highlight(int iLevel)
- 	m_iHighlightLevel = iLevel;
- 	if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
- 	if(m_bActive)return;
--	update(); // tqrepaint(false) ?
-+	update(); // repaint(false) ?
- }
- 
- 
-@@ -833,7 +833,7 @@ void KviTreeTaskBarItem::applyOptions()
- void KviTreeTaskBarItem::captionChanged()
- {
- 	// FIXME: can we do better ?
--	tqrepaint();
-+	repaint();
- }
- 
- void KviTreeTaskBarItem::unhighlight()
-@@ -841,7 +841,7 @@ void KviTreeTaskBarItem::unhighlight()
- 	if(m_iHighlightLevel < 1)return;
- 	m_iHighlightLevel = 0;
- 	if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
--	tqrepaint();
-+	repaint();
- }
- 
- void KviTreeTaskBarItem::highlight(int iLevel)
-@@ -851,14 +851,14 @@ void KviTreeTaskBarItem::highlight(int iLevel)
- 	m_iHighlightLevel = iLevel;
- 	if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh();
- 	if(isSelected())return;
--	tqrepaint(); // tqrepaint(false) ?
-+	repaint(); // repaint(false) ?
- }
- 
- void KviTreeTaskBarItem::setProgress(int progress)
- {
- 	if(progress == m_iProgress)return;
- 	m_iProgress = progress;
--	tqrepaint(); // tqrepaint(false) ?
-+	repaint(); // repaint(false) ?
- }
- 
- void KviTreeTaskBarItem::setActive(bool bActive)
-@@ -868,7 +868,7 @@ void KviTreeTaskBarItem::setActive(bool bActive)
- //		m_bHighlighted = false;
- //		m_bAltColor    = false;
- 		m_iHighlightLevel = 0;
--		// was not selected: the listView will tqrepaint it
-+		// was not selected: the listView will repaint it
- 	} else {
- 		if(isSelected())
- 		{
-@@ -876,7 +876,7 @@ void KviTreeTaskBarItem::setActive(bool bActive)
- //			m_bHighlighted = false;
- //			m_bAltColor = false;
- 			m_iHighlightLevel = 0;
--			// was selected: the list view will tqrepaint it
-+			// was selected: the list view will repaint it
- 		}
- 	}
- }
-@@ -1081,7 +1081,7 @@ void KviTreeTaskBarItem::timerShot()
- 		m_pAnimTimer->stop();
- 		m_iStepNumber=0; //make shure, that we cannot get out of range
- 	}
--	tqrepaint();
-+	repaint();
- }
- 
- void KviTreeTaskBarItem::mouseEnter()
-@@ -1405,7 +1405,7 @@ KviTaskBarItem * KviTreeTaskBar::nextItem()
- 	{
- 		m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->firstChild();
- 	} else {
--		// this item has no tqchildren: try the next sibling
-+		// this item has no children: try the next sibling
- 		if(m_pCurrentItem->nextSibling())
- 		{
- 			m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling();
-diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
-index 9e9ebe2..6c5794c 100644
---- a/src/kvirc/ui/kvi_taskbar.h
-+++ b/src/kvirc/ui/kvi_taskbar.h
-@@ -226,7 +226,7 @@ protected:
- 	int m_iBlueDiff;
- public:
- 	virtual TQString key(int column,bool) const;
--	virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int tqalignment);
-+	virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int alignment);
- #ifdef COMPILE_USE_QT4
- 	virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h);
- #else
-diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
-index cc3d866..d86b864 100644
---- a/src/kvirc/ui/kvi_userlistview.cpp
-+++ b/src/kvirc/ui/kvi_userlistview.cpp
-@@ -305,7 +305,7 @@ void KviUserListView::applyOptions()
- 	m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView));
- 	setMinimumWidth(100);
- 	resizeEvent(0); // this will call update() too
--	tqrepaint();
-+	repaint();
- }
- void KviUserListView::updateArea()
- {
-@@ -1281,7 +1281,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt)
- 				TQDateTime dt;
- 				dt.setTime_t(it->m_joinTime);
- 				buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>";
--				buffer += __tr2qs("Joined on <b>%1</b>").tqarg(dt.toString());
-+				buffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString());
- 				buffer += "</nobr></td></tr>";
- 			}
- 	
-@@ -1293,7 +1293,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt)
- 				int hors = mins / 60;
- 				mins = mins % 60;
- 				buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>";
--				buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").tqarg(hors).tqarg(mins).tqarg(secs);
-+				buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(hors).arg(mins).arg(secs);
- 				buffer += "</nobr></td></tr>";
- 			}
- 			buffer += "</table>";
-diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
-index e0c8621..a4828bf 100644
---- a/src/kvirc/ui/kvi_window.cpp
-+++ b/src/kvirc/ui/kvi_window.cpp
-@@ -1006,7 +1006,7 @@ void KviWindow::focusInEvent(TQFocusEvent *)
- 		if(m_pIrcView)m_pFocusHandler = m_pIrcView;
- 		else {
- #ifdef COMPILE_USE_QT4
--			TQList<TQObject *> list = tqchildren();
-+			TQList<TQObject *> list = children();
- 			for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it)
- 			{
- 				TQObject * c = *it;
-@@ -1042,7 +1042,7 @@ void KviWindow::focusInEvent(TQFocusEvent *)
- 	}
- 
- 	// Setting the focus to the focus handler usually
--	// triggers our filter for the tqchildren's focusInEvent.
-+	// triggers our filter for the children's focusInEvent.
- 	// This should call activateSelf() and thus
- 	// we should be already the active window at this point.
- 	// If we're not, then run activateSelf() to fix this.
-@@ -1124,7 +1124,7 @@ void KviWindow::childInserted(TQWidget * o)
- 	}
- 
- #ifdef COMPILE_USE_QT4
--	TQList<TQObject *> list = o->tqchildren();
-+	TQList<TQObject *> list = o->children();
- 	for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it)
- 	{
- 		TQObject * c = *it;
-@@ -1162,7 +1162,7 @@ void KviWindow::childRemoved(TQWidget * o)
- 		m_pLastFocusedChild = 0;
- 
- #ifdef COMPILE_USE_QT4
--	TQList<TQObject *> list = o->tqchildren();
-+	TQList<TQObject *> list = o->children();
- 	for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it)
- 	{
- 		TQObject * c = *it;
-@@ -1180,7 +1180,7 @@ void KviWindow::childRemoved(TQWidget * o)
- 			if(c->isWidgetType())
- 				childRemoved((TQWidget *)c);
- 		}
--	} //else debug("The removed object has no tqchildren");
-+	} //else debug("The removed object has no children");
- #endif
- }
- 
-@@ -1202,7 +1202,7 @@ void KviWindow::wheelEvent(TQWheelEvent *e)
- }
- 
- 
--void KviWindow::tqchildrenTreeChanged(TQWidget * widgetAdded)
-+void KviWindow::childrenTreeChanged(TQWidget * widgetAdded)
- {
- 	//	if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded);
- 	// FIXME: This might be useless
-@@ -1217,7 +1217,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
- 	if(!obj)
- 		obj = TQT_TQOBJECT(this);
- #ifdef COMPILE_USE_QT4
--	TQList<TQObject *> list = obj->tqchildren();
-+	TQList<TQObject *> list = obj->children();
- 	if (list.count())
- 	{
- 	
-@@ -1317,7 +1317,7 @@ TQRect KviWindow::externalGeometry()
- #ifndef Q_OS_MACX
- 	return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry();
- #else
--	return mdiParent() ? mdiParent()->restoredGeometry() : tqgeometry();
-+	return mdiParent() ? mdiParent()->restoredGeometry() : geometry();
- #endif
- }
- 
-@@ -1490,10 +1490,10 @@ void KviWindow::preprocessMessage(TQString & szMessage)
- 			if(m_pConsole->connection())
- 				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0]))
- 					if((*it)==tmp)
--						*it=TQString("\r!c\r%1\r").tqarg(*it);
-+						*it=TQString("\r!c\r%1\r").arg(*it);
- 					else
- 					{
--						*it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it);
-+						*it=TQString("\r!c%1\r%2\r").arg(tmp).arg(*it);
- 					}	
- 	}
- 	szMessage=strings.join(" ");
-diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
-index a044bae..913c63b 100644
---- a/src/kvirc/ui/kvi_window.h
-+++ b/src/kvirc/ui/kvi_window.h
-@@ -181,7 +181,7 @@ protected: // almost private: don't touch :D
- //	KviToolWindowsContainer             * m_pEditorsContainer;
- public:
- 	// The global ID of this window: unique in the application
--	TQString id(){ return TQString("%1").tqarg(m_uId); };
-+	TQString id(){ return TQString("%1").arg(m_uId); };
- 	unsigned long int numericId(){ return m_uId; };
- public:
- 	// THIS is the function that should be used
-@@ -262,7 +262,7 @@ public:
- 	bool isMaximized();
- 	// Retrieves the default log file name: this is pre-build
- 	void getDefaultLogFileName(TQString &buffer);
--	// Well...the external tqgeometry :)
-+	// Well...the external geometry :)
- 	TQRect externalGeometry();
- 
- 	void delayedClose(); // close that jumps out of the current event loop
-@@ -374,7 +374,7 @@ protected:
- 
- 	BUTTON_CLASS * createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn);
- 	// This is called by KviInput: actually it links the widgetAdded
--	virtual void tqchildrenTreeChanged(TQWidget * widgetAdded);
-+	virtual void childrenTreeChanged(TQWidget * widgetAdded);
- 	
- 	virtual bool focusNextPrevChild(bool bNext);
- 	
-diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
-index ead09cd..9404b8b 100644
---- a/src/modules/action/libkviaction.cpp
-+++ b/src/modules/action/libkviaction.cpp
-@@ -109,10 +109,10 @@ static bool action_kvs_cmd_trigger(KviKvsModuleCommandCall * c)
- 			a->activate();
- 		} else {
- 			if(!c->switches()->find('q',"quiet"))
--				c->warning(__tr2qs("The action \"%1\" is disabled").tqarg(szName));
-+				c->warning(__tr2qs("The action \"%1\" is disabled").arg(szName));
- 		}
- 	} else {
--		c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
-+		c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -158,7 +158,7 @@ static bool action_kvs_cmd_enable(KviKvsModuleCommandCall * c)
- 		if(!a->isEnabled())a->setEnabled(true);
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -206,7 +206,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c)
- 		if(a->isEnabled())a->setEnabled(false);
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -252,11 +252,11 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
- 			a->suicide();
- 		} else {
- 			if(!c->switches()->find('q',"quiet"))
--				c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").tqarg(szName));
-+				c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").arg(szName));
- 		}
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The action \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -417,7 +417,7 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
- 		if(old->isKviUserActionNeverOverrideThis())
- 			old->suicide();
- 		else {
--			c->warning(__tr2qs("The action \"%1\" is already defined as core action and cannot be overridden").tqarg(szName));
-+			c->warning(__tr2qs("The action \"%1\" is already defined as core action and cannot be overridden").arg(szName));
- 			return false;
- 		}
- 	}
-diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
-index 08f1808..9d3b0eb 100644
---- a/src/modules/addon/libkviaddon.cpp
-+++ b/src/modules/addon/libkviaddon.cpp
-@@ -195,7 +195,7 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c)
- 		KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback"));
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -235,13 +235,13 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c)
- 		if(ss.isEmpty())
- 		{
- 			if(!c->switches()->find('q',"quiet"))
--				c->warning(__tr2qs("The addon \"%1\" has no configure callback set").tqarg(szName));
-+				c->warning(__tr2qs("The addon \"%1\" has no configure callback set").arg(szName));
- 		} else {
- 			a->executeConfigureCallback(c->window());
- 		}
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -282,13 +282,13 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c)
- 		if(ss.isEmpty())
- 		{
- 			if(!c->switches()->find('q',"quiet"))
--				c->warning(__tr2qs("The addon \"%1\" has no help callback set").tqarg(szName));
-+				c->warning(__tr2qs("The addon \"%1\" has no help callback set").arg(szName));
- 		} else {
- 			a->executeHelpCallback(c->window());
- 		}
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
- 	}
- 
- 	return true;
-@@ -334,7 +334,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall *
- 		a->setConfigureCallback(c->callback()->code());
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
- 	}
- 	
- 	return true;
-@@ -381,7 +381,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
- 		a->setHelpCallback(c->callback()->code());
- 	} else {
- 		if(!c->switches()->find('q',"quiet"))
--			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
-+			c->warning(__tr2qs("The addon \"%1\" does not exist").arg(szName));
- 	}
- 	
- 	return true;
-diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
-index 8b08c54..beb9f4f 100644
---- a/src/modules/addon/managementdialog.cpp
-+++ b/src/modules/addon/managementdialog.cpp
-@@ -330,7 +330,7 @@ void KviScriptManagementDialog::uninstallScript()
- 	if(!it)return;
- 
- 	TQString txt = "<p>";
--	txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").tqarg(it->addon()->visibleName());
-+	txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").arg(it->addon()->visibleName());
- 	txt += "</p>";
- 	
- 	if(TQMessageBox::question(this,
-diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
-index 0f1201e..d020105 100644
---- a/src/modules/aliaseditor/aliaseditor.cpp
-+++ b/src/modules/aliaseditor/aliaseditor.cpp
-@@ -794,7 +794,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll
- 		else {
- 			KviTQString::sprintf(szMsg,__tr2qs("Do you really want to remove the namespace \"%Q\" ?"),&szName);
- 			szMsg += "<br>";
--			szMsg += __tr2qs("Please note that all the tqchildren items will be deleted too.");
-+			szMsg += __tr2qs("Please note that all the children items will be deleted too.");
- 		}
- 
- 		g_pAliasEditorModule->lock();
-diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
-index a71f497..8386942 100644
---- a/src/modules/avatar/libkviavatar.cpp
-+++ b/src/modules/avatar/libkviavatar.cpp
-@@ -119,7 +119,7 @@ void KviAsyncAvatarSelectionDialog::okClicked()
- 	{
- 		TQString tmp = m_szAvatarName;
- 		tmp.replace("\\","\\\\");
--		TQString szBuffer=TQString("avatar.set \"%1\"").tqarg(tmp);
-+		TQString szBuffer=TQString("avatar.set \"%1\"").arg(tmp);
- 		KviKvsScript::run(szBuffer,m_pConnection->console());
- 	}
- 	
-diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
-index 97c92ec..64b9a10 100644
---- a/src/modules/config/libkviconfig.cpp
-+++ b/src/modules/config/libkviconfig.cpp
-@@ -124,7 +124,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
- 
- 	KviConfig * cfg = new KviConfig(szAbsFile,fileMode);
- 	g_iNextConfigId++;
--	TQString tmp = TQString("%1").tqarg(g_iNextConfigId);
-+	TQString tmp = TQString("%1").arg(g_iNextConfigId);
- 	g_pConfigDict->insert(tmp,cfg);
- 	c->returnValue()->setString(tmp);
- 	return true;
-diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
-index f472817..976b638 100644
---- a/src/modules/dcc/broker.cpp
-+++ b/src/modules/dcc/broker.cpp
-@@ -268,7 +268,7 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
- 		TQString tmp = __tr2qs_ctx( \
- 				"<b>%1 [%2@%3]</b> requests a " \
- 				"<b>Direct Client Connection</b> in <b>%4</b> mode.<br>", \
--				"dcc").tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szType);
-+				"dcc").arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szType);
- 
- #ifdef COMPILE_SSL_SUPPORT
- 		if(dcc->bIsSSL)tmp += __tr2qs_ctx("The connection will be secured using SSL.<br>","dcc");
-@@ -282,11 +282,11 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
- 		} else {
- 			tmp += __tr2qs_ctx( \
- 					"The connection target will be host <b>%1</b> on port <b>%2</b><br>" \
--					,"dcc").tqarg(dcc->szIp).tqarg(dcc->szPort);
-+					,"dcc").arg(dcc->szIp).arg(dcc->szPort);
- 		}
- 
- 
--		TQString caption = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").tqarg(dcc->szType);
-+		TQString caption = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType);
- 
- 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption);
- 
-@@ -315,7 +315,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
- 	KviStr szSubProto = dcc->szType;
- 	szSubProto.toLower();
- 
--	TQString tmp = TQString("dcc: %1 %2@%3:%4").tqarg(szSubProto.ptr()).tqarg(dcc->szNick).tqarg(dcc->szIp).tqarg(dcc->szPort);
-+	TQString tmp = TQString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr()).arg(dcc->szNick).arg(dcc->szIp).arg(dcc->szPort);
- 	KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.utf8().data());
- 
- 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
-@@ -341,7 +341,7 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
- 					"<b>Direct Client Connection</b> in <b>VOICE</b> mode.<br>" \
- 					"The connection target will be host <b>%4</b> on port <b>%5</b><br>" \
- 				,"dcc" \
--			).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szIp).tqarg(dcc->szPort);
-+			).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort);
- 
- 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc"));
- 		m_pBoxList->append(box);
-@@ -412,7 +412,7 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
- 					"<b>Direct Client Connection</b> in <b>CANVAS</b> mode.<br>" \
- 					"The connection target will be host <b>%4</b> on port <b>%5</b><br>" \
- 				,"dcc" \
--			).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(dcc->szIp).tqarg(dcc->szPort);
-+			).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort);
- 
- 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc"));
- 		m_pBoxList->append(box);
-@@ -505,9 +505,9 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
- 						"<b>%5</b> large.<br>" \
- 						"The connection target will be host <b>%6</b> on port <b>%7</b><br>" \
- 					,"dcc" \
--				).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(
--				dcc->szFileName).tqarg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())).tqarg(
--					dcc->szIp).tqarg(dcc->szPort);
-+				).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(
-+				dcc->szFileName).arg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt())).arg(
-+					dcc->szIp).arg(dcc->szPort);
- 
- 		} else {
- 			// passive: we will be listening!
-@@ -518,8 +518,8 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
- 						"<b>%5</b> large.<br>" \
- 						"You will be the passive side of the connection.<br>" \
- 					,"dcc" \
--				).tqarg(dcc->szNick).tqarg(dcc->szUser).tqarg(dcc->szHost).tqarg(
--					dcc->szFileName).tqarg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt()));
-+				).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(
-+					dcc->szFileName).arg(KviTQString::makeSizeReadable(dcc->szFileSize.toInt()));
- 		}
- 
- 		if(dcc->bIsIncomingAvatar)
-@@ -540,7 +540,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
- 
- //#warning "Maybe remove the pending avatar if rejected ?"
- 
--		TQString title = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").tqarg(dcc->szType);
-+		TQString title = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType);
- 
- 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title);
- 		m_pBoxList->append(box);
-@@ -669,7 +669,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
- 							"<b>auto-rename</b> the new file, or<br>" \
- 							"<b>resume</b> an incomplete download?" \
- 						,"dcc" \
--					).tqarg(dcc->szLocalFileName).tqarg(KviTQString::makeSizeReadable(fi.size()));
-+					).arg(dcc->szLocalFileName).arg(KviTQString::makeSizeReadable(fi.size()));
- 			} else {
- 				bDisableResume = true;
- 				// the file on disk is larger or equal to the remote one
-@@ -680,7 +680,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
- 							"<b>overwrite</b> the existing file, or<br> " \
- 							"<b>auto-rename</b> the new file ?" \
- 						,"dcc" \
--					).tqarg(dcc->szLocalFileName);
-+					).arg(dcc->szLocalFileName);
- 			}
- 
- 			KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume);
-diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
-index 47bacf5..06f5d2f 100644
---- a/src/modules/dcc/canvaswidget.cpp
-+++ b/src/modules/dcc/canvaswidget.cpp
-@@ -1509,14 +1509,14 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par)
- 	connect(m_pPropertiesWidget,TQT_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQT_SLOT(propertyChanged(const TQString &,const TQVariant &)));
- 
- 	KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar);
--	KviTalPopupMenu * tqshapes = new KviTalPopupMenu(add);
-+	KviTalPopupMenu * shapes = new KviTalPopupMenu(add);
- 	KviTalPopupMenu * polygons = new KviTalPopupMenu(add);
- 	KviTalPopupMenu * items = new KviTalPopupMenu(add);
--	tqshapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine()));
--	tqshapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle()));
--	tqshapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse()));
--	tqshapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie()));
--	tqshapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord()));
-+	shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine()));
-+	shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle()));
-+	shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse()));
-+	shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie()));
-+	shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord()));
- 
- 	items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQT_SLOT(insertRichText()));
- 
-@@ -1525,7 +1525,7 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par)
- 	polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonPentagon()));
- 	polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonHexagon()));
- 
--	add->insertItem(__tr2qs_ctx("&Shape","dcc"),tqshapes);
-+	add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes);
- 	add->insertItem(__tr2qs_ctx("&Item","dcc"),items);
- 	add->insertItem(__tr2qs_ctx("&Polygons","dcc"),polygons);
- 
-diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
-index 660191f..a917171 100644
---- a/src/modules/dcc/chat.cpp
-+++ b/src/modules/dcc/chat.cpp
-@@ -221,7 +221,7 @@ void KviDccChat::connectionInProgress()
- 			struct in_addr a;
- 			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
- 
--			TQString szReq = TQString("PRIVMSG %1 :%2DCC %3 chat %4 %5").tqarg(m_pDescriptor->szNick).tqarg((char)0x01).tqarg(m_pDescriptor->szType).tqarg(ip.ptr()).tqarg(port);
-+			TQString szReq = TQString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port);
- 
- 			if(m_pDescriptor->isZeroPortRequest())	
- 			{
-@@ -268,13 +268,13 @@ const TQString & KviDccChat::target()
- 
- void KviDccChat::fillCaptionBuffers()
- {
--	TQString tmp = TQString("DCC %1 %2@%3:%4").tqarg(
-+	TQString tmp = TQString("DCC %1 %2@%3:%4").arg(
- #ifdef COMPILE_SSL_SUPPORT
--		m_pDescriptor->bIsSSL ? "SChat" : "Chat").tqarg(
-+		m_pDescriptor->bIsSSL ? "SChat" : "Chat").arg(
- #else
--		"Chat").tqarg(
-+		"Chat").arg(
- #endif
--		m_pDescriptor->szNick).tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort);
-+		m_pDescriptor->szNick).arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
- 
- 	m_szPlainTextCaption = tmp;
- 
-diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
-index 56f28b3..03f5d30 100644
---- a/src/modules/dcc/libkvidcc.cpp
-+++ b/src/modules/dcc/libkvidcc.cpp
-@@ -1543,8 +1543,8 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
- 		[br]
- 		[big]DCC File Transfer[/big][br]
- 		DCC Send: Send a file, sender is passive, receiver is active (not good for firewalled senders)[br]
--		DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br]
--		DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br]
-+		DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled receivers)[br]
-+		DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled receivers)[br]
- 		DCC Get: Receive a file, sender is passive if not firewalled, receiver active if sender not firewalled (will fail only if both are firewalled)[br]
- 		The "turbo" extension disables the stream of acknowledges and is activated by prepending the 'T' character to the DCC subprotocol name[br]
- 		The "SSL" extension causes a Secure Socket Layer to be used and is activated by prepending the 'S' character to the DCC subprotocol name[br]
-diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
-index 00a1d1e..bf8a919 100644
---- a/src/modules/dcc/requests.cpp
-+++ b/src/modules/dcc/requests.cpp
-@@ -80,7 +80,7 @@ static void dcc_module_request_error(KviDccRequest * dcc,const TQString& errText
- 
- 	if(KVI_OPTION_BOOL(KviOption_boolNotifyFailedDccHandshakes))
- 	{
--		TQString szError = TQString("Sorry, your DCC %1 request can't be satisfied: %2").tqarg(dcc->szType.ptr()).tqarg(errText);
-+		TQString szError = TQString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr()).arg(errText);
- 		dcc_module_reply_errmsg(dcc,szError);
- 	}
- }
-diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
-index 969a54a..74dbf16 100644
---- a/src/modules/dcc/send.cpp
-+++ b/src/modules/dcc/send.cpp
-@@ -811,11 +811,11 @@ void KviDccFileTransfer::startConnection()
- 	if(!(m_pDescriptor->bActive))
- 	{
- 		// PASSIVE CONNECTION
--		m_szStatusString = __tr2qs_ctx("Attempting a passive DCC %1 connection","dcc").tqarg(m_szDccType.ptr());
-+		m_szStatusString = __tr2qs_ctx("Attempting a passive DCC %1 connection","dcc").arg(m_szDccType.ptr());
- 		outputAndLog(m_szStatusString);
- 	} else {
- 		// ACTIVE CONNECTION
--		m_szStatusString = __tr2qs_ctx("Attempting an active DCC %1 connection","dcc").tqarg(m_szDccType.ptr());
-+		m_szStatusString = __tr2qs_ctx("Attempting an active DCC %1 connection","dcc").arg(m_szDccType.ptr());
- 		outputAndLog(m_szStatusString);
- 	}
- 
-@@ -841,7 +841,7 @@ void KviDccFileTransfer::startConnection()
- 				m_pDescriptor->szPort.utf8().data(),
- 				m_pDescriptor->szLocalFileSize.utf8().data(),0x01);
- 		}
--		m_szStatusString = __tr2qs_ctx("Sent DCC RESUME request to %1, waiting for ACCEPT","dcc").tqarg(m_pDescriptor->szNick);
-+		m_szStatusString = __tr2qs_ctx("Sent DCC RESUME request to %1, waiting for ACCEPT","dcc").arg(m_pDescriptor->szNick);
- 		outputAndLog(m_szStatusString);
- 
- 		// setup the resume timer: we don't want to wait forever
-@@ -1236,18 +1236,18 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei
- 					if(iW2 > 0)p->fillRect(5 + iL2,5,iW2,10,bIsTerminated ? TQColor(150,130,110) : TQColor(220,170,100));
- 					p->fillRect(5,5,iL2,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100));
- 
--					txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).tqarg(KviTQString::makeSizeReadable(iAckedBytes)).tqarg(KviTQString::makeSizeReadable(m_uTotalFileSize)).tqarg(dPerc2,0,'f',2);
-+					txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviTQString::makeSizeReadable(iAckedBytes)).arg(KviTQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc2,0,'f',2);
- 				} else {
- 					// we are receiving a file or not sending acks
- 					double dPerc = (double)(((double)uTransferred) * 100.0) / (double)m_uTotalFileSize;
- 					int iL = (int) ((((double)iW) * dPerc) / 100.0);
- 					p->fillRect(5,5,iL,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100));
- 
--					txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).tqarg(KviTQString::makeSizeReadable(uTransferred)).tqarg(KviTQString::makeSizeReadable(m_uTotalFileSize)).tqarg(dPerc,0,'f',2);
-+					txt = TQString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviTQString::makeSizeReadable(uTransferred)).arg(KviTQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2);
- 				}
- 
- 			} else {
--				txt = TQString(__tr2qs_ctx("%1","dcc")).tqarg(KviTQString::makeSizeReadable(uTransferred));
-+				txt = TQString(__tr2qs_ctx("%1","dcc")).arg(KviTQString::makeSizeReadable(uTransferred));
- 			}
- 
- 			p->setPen(TQt::black);
-@@ -1343,7 +1343,7 @@ TQString KviDccFileTransfer::tipText()
- 
- 	TQString s;
- 
--	s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").tqarg(m_szDccType.ptr()).tqarg(id());
-+	s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr()).arg(id());
- 
- 	s += "<tr><td bgcolor=\"#404040\"><font color=\"#FFFFFF\">";
- 	s += __tr2qs_ctx("Transfer Log","dcc");
-@@ -1477,14 +1477,14 @@ void KviDccFileTransfer::connectionInProgress()
- //			if(TRIGGER_EVENT_5PARAM_RETVALUE(KviEvent_OnDCCSendConnected,this,m_pDescriptor->szPort.ptr(),m_pDescriptor->szFileName.ptr(),m_pDescriptor->szNick.ptr(),m_pDescriptor->szUser.ptr(),m_pDescriptor->szHost.ptr()));
- //		}
- //
--		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort);
-+		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
- 		outputAndLog(m_szStatusString);
- 		displayUpdate();
- 		return;
- 	}
- 
- 	// PASSIVE CONNECTION
--	m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").tqarg(m_pMarshal->localIp()).tqarg(m_pMarshal->localPort());
-+	m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort());
- 	outputAndLog(m_szStatusString);
- 
- 	if(m_pDescriptor->bSendRequest)
-@@ -1507,7 +1507,7 @@ void KviDccFileTransfer::connectionInProgress()
- 						if(!tmp.isEmpty())
- 						{
- 							ip = tmp;
--							outputAndLog(__tr2qs_ctx("The local IP address is private, determining from IRC server: %1","dcc").tqarg(ip));
-+							outputAndLog(__tr2qs_ctx("The local IP address is private, determining from IRC server: %1","dcc").arg(ip));
- 						} else {
- 							outputAndLog(__tr2qs_ctx("The local IP address is private, but unable to determine it from the IRC server","dcc"));
- 						}
-@@ -1558,9 +1558,9 @@ void KviDccFileTransfer::connectionInProgress()
- 					ip.utf8().data(),port.ptr(),
- 					&(m_pDescriptor->szLocalFileSize),0x01);
- 		}
--		outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").tqarg(szReq.ptr()).tqarg(m_pDescriptor->szNick));
-+		outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").arg(szReq.ptr()).arg(m_pDescriptor->szNick));
- 	} else {
--		outputAndLog(__tr2qs_ctx("DCC %1 request not sent, awaiting manual connection","dcc").tqarg(m_szDccType.ptr()));
-+		outputAndLog(__tr2qs_ctx("DCC %1 request not sent, awaiting manual connection","dcc").arg(m_szDccType.ptr()));
- 	}
- 
- 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCFileTransferConnectionInProgress,eventWindow(),m_pDescriptor->idString());
-@@ -1579,7 +1579,7 @@ void KviDccFileTransfer::startingSSLHandshake()
- void KviDccFileTransfer::sslError(const char * msg)
- {
- #ifdef COMPILE_SSL_SUPPORT
--	outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("[SSL ERROR]: %1","dcc").tqarg(msg));
-+	outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("[SSL ERROR]: %1","dcc").arg(msg));
- #endif
- }
- 
-@@ -1687,8 +1687,8 @@ void KviDccFileTransfer::handleMarshalError(int err)
- 
- void KviDccFileTransfer::connected()
- {
--	outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").tqarg(m_pMarshal->remoteIp()).tqarg(m_pMarshal->remotePort()));
--	outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").tqarg(m_pMarshal->localIp()).tqarg(m_pMarshal->localPort()));
-+	outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").arg(m_pMarshal->remoteIp()).arg(m_pMarshal->remotePort()));
-+	outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort()));
- 
- 	m_tTransferStartTime = kvi_unixTime();
- 
-@@ -1758,7 +1758,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
- 	delete m_pResumeTimer;
- 	m_pResumeTimer = 0;
- 
--	outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1","dcc").tqarg(m_pDescriptor->szLocalFileSize));
-+	outputAndLog(__tr2qs_ctx("RESUME accepted, transfer will begin at position %1","dcc").arg(m_pDescriptor->szLocalFileSize));
- 
- 	listenOrConnect();
- 
-@@ -1768,7 +1768,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
- 
- 	if(ret != KviError_success)handleMarshalError(ret);
- 	else {
--		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").tqarg(m_pDescriptor->szIp).tqarg(m_pDescriptor->szPort);
-+		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
- 		outputAndLog(m_szStatusString);
- 		displayUpdate();
- 	}
-@@ -1794,11 +1794,11 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,unsign
- 			}
- 			if(iLocalFileSize <= filePos)
- 			{
--				outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Invalid RESUME request: Position %1 is larger than file size","dcc").tqarg(filePos));
-+				outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Invalid RESUME request: Position %1 is larger than file size","dcc").arg(filePos));
- 				return false;
- 			}
- 
--			outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Accepting RESUME request, transfer will begin at position %1","dcc").tqarg(filePos));
-+			outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("Accepting RESUME request, transfer will begin at position %1","dcc").arg(filePos));
- 
- 			m_pDescriptor->szFileSize.setNum(filePos);
- 
-@@ -1830,7 +1830,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget *
- 	m_pTransfer = t;
- 	int iVal = m_pTransfer->bandwidthLimit();
- 
--	TQString szText = __tr2qs_ctx("Configure bandwidth for DCC transfer %1","dcc").tqarg(t->id());
-+	TQString szText = __tr2qs_ctx("Configure bandwidth for DCC transfer %1","dcc").arg(t->id());
- 	setCaption(szText);
- 
- 	szText = t->isFileUpload() ? __tr2qs_ctx("Limit upload bandwidth to","dcc") : __tr2qs_ctx("Limit download bandwidth to","dcc");
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-index 6978ce0..ce454b2 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-@@ -447,10 +447,10 @@ void KviDockWidget::fillContextPopup()
- 					int id;
- 					if(pConsole->connection()->userInfo()->isAway())
- 					{
--						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
-+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
- 						bAllUnaway=0;
- 					} else {
--						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
-+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
- 						bAllAway=0;
- 					}
- 					m_pAwayPopup->setItemParameter(id,pConsole->ircContextId());
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-index d1f4eff..54033af 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-@@ -279,10 +279,10 @@ void KviDockWidget::fillContextPopup()
- 					int id;
- 					if(pConsole->connection()->userInfo()->isAway())
- 					{
--						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
-+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
- 						bAllUnaway=0;
- 					} else {
--						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").tqarg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
-+						id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int)));
- 						bAllAway=0;
- 					}
- 					m_pAwayPopup->setItemParameter(id,pConsole->ircContextId());
-diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
-index 525acfd..6945cd1 100644
---- a/src/modules/editor/scripteditor.cpp
-+++ b/src/modules/editor/scripteditor.cpp
-@@ -369,7 +369,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
- 				TQString szPrev=text(para-1);
- 				if(!szPrev.isEmpty())
- 				{
--					if(szPrev.tqat(szPrev.length() - 1).tqunicode() == ' ')
-+					if(szPrev.at(szPrev.length() - 1).tqunicode() == ' ')
- 						szPrev.remove(szPrev.length() - 1,1);
- 					TQString szCur;
- 					const TQChar * pCur = (const TQChar *)szPrev.ucs2();
-diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
-index 3fcf59d..9274946 100644
---- a/src/modules/filetransferwindow/filetransferwindow.cpp
-+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
-@@ -313,7 +313,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo
- 				if(fi.exists())
- 				{
- 					tmp += "<nobr>";
--					tmp += __tr2qs_ctx("Size: %1","filetransferwindow").tqarg(KviTQString::makeSizeReadable(fi.size()));
-+					tmp += __tr2qs_ctx("Size: %1","filetransferwindow").arg(KviTQString::makeSizeReadable(fi.size()));
- 					tmp += "</nobr><br>";
- 				}
- 
-diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
-index cfe9087..8ad7c8f 100644
---- a/src/modules/http/httpfiletransfer.cpp
-+++ b/src/modules/http/httpfiletransfer.cpp
-@@ -211,8 +211,8 @@ void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int he
- 				//iR = iW - iL;
- 				p->fillRect(5,5,iL,10,bIsTerminated ? TQColor(140,110,110) : TQColor(200,100,100));
- 
--				txt = TQString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).tqarg(KviTQString::makeSizeReadable(uRecvd))
--					.tqarg(KviTQString::makeSizeReadable(uTotal)).tqarg(dPerc,0,'f',2);
-+				txt = TQString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).arg(KviTQString::makeSizeReadable(uRecvd))
-+					.arg(KviTQString::makeSizeReadable(uTotal)).arg(dPerc,0,'f',2);
- 			} else {
- 				txt = KviTQString::makeSizeReadable(m_pHttpRequest->receivedSize());
- 			}
-@@ -265,17 +265,17 @@ void KviHttpFileTransfer::displayPaint(TQPainter * p,int column,int width,int he
- 			{
- 				KviTimeUtils::secondsToDaysHoursMinsSecs(kvi_timeSpan(m_tTransferEndTime,m_tTransferStartTime),&uD,&uH,&uM,&uS);
- 				txt = "TOT: ";
--				if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).tqarg(uD).tqarg(uH).tqarg(uM).tqarg(uS);
--				else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).tqarg(uH).tqarg(uM).tqarg(uS);
--				else txt += TQString(__tr2qs_ctx("%3m %4s","http")).tqarg(uM).tqarg(uS);
-+				if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS);
-+				else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS);
-+				else txt += TQString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS);
- 			} else {
- 				if(iEta >= 0)
- 				{
- 					KviTimeUtils::secondsToDaysHoursMinsSecs(iEta,&uD,&uH,&uM,&uS);
- 					txt = "ETA: ";
--					if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).tqarg(uD).tqarg(uH).tqarg(uM).tqarg(uS);
--					else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).tqarg(uH).tqarg(uM).tqarg(uS);
--					else txt += TQString(__tr2qs_ctx("%3m %4s","http")).tqarg(uM).tqarg(uS);
-+					if(uD > 0)txt += TQString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS);
-+					else if(uH > 0)txt += TQString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS);
-+					else txt += TQString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS);
- 				} else {
- 					txt = "ETA: Unknown";
- 				}
-@@ -301,7 +301,7 @@ int KviHttpFileTransfer::displayHeight(int iLineSpacing)
- TQString KviHttpFileTransfer::tipText()
- {
- 	TQString s;
--	s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").tqarg(id());
-+	s = TQString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").arg(id());
- 
- 	if(m_lRequest.count() > 0)
- 	{
-@@ -390,13 +390,13 @@ void KviHttpFileTransfer::connectionEstabilished()
- 
- void KviHttpFileTransfer::resolvingHost(const TQString &hostname)
- {
--	m_szStatusString = __tr2qs_ctx("Resolving host %1","http").tqarg(hostname);
-+	m_szStatusString = __tr2qs_ctx("Resolving host %1","http").arg(hostname);
- 	displayUpdate();
- }
- 
- void KviHttpFileTransfer::contactingHost(const TQString &ipandport)
- {
--	m_szStatusString = __tr2qs_ctx("Contacting host %1","http").tqarg(ipandport);
-+	m_szStatusString = __tr2qs_ctx("Contacting host %1","http").arg(ipandport);
- 	displayUpdate();
- }
- 
-@@ -404,7 +404,7 @@ void KviHttpFileTransfer::receivedResponse(const TQString &response)
- {
- 	m_lHeaders.clear();
- 	m_lHeaders.append(response);
--	m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").tqarg(response);
-+	m_szStatusString = __tr2qs_ctx("Transferring data (%1)","http").arg(response);
- 	m_tTransferStartTime = kvi_unixTime();
- 	m_eGeneralStatus = Downloading;
- 	displayUpdate();
-diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
-index 51ebce1..f2f51dd 100644
---- a/src/modules/links/linkswindow.cpp
-+++ b/src/modules/links/linkswindow.cpp
-@@ -301,7 +301,7 @@ void KviLinksWindow::endOfLinks()
- 	while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst();
- 
- 	m_pListView->setUpdatesEnabled(true);
--	m_pListView->tqrepaint();
-+	m_pListView->repaint();
- }
- 
- KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l)
-diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
-index bab0a96..55b3622 100644
---- a/src/modules/logview/logviewmdiwindow.cpp
-+++ b/src/modules/logview/logviewmdiwindow.cpp
-@@ -202,11 +202,11 @@ void KviLogViewMDIWindow::fillCaptionBuffers()
- {
- 	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
- 
--	m_szHtmlActiveCaption = TQString("<nobr><font color=\"%1\"><b>").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii());
-+	m_szHtmlActiveCaption = TQString("<nobr><font color=\"%1\"><b>").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name()).ascii());
- 	m_szHtmlActiveCaption.append(m_szPlainTextCaption);
- 	m_szHtmlActiveCaption.append("</b></font></nobr>");
- 
--	m_szHtmlInactiveCaption = TQString("<nobr><font color=\"%1\"><b>").tqarg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii());
-+	m_szHtmlInactiveCaption = TQString("<nobr><font color=\"%1\"><b>").arg(TQString(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name()).ascii());
- 	m_szHtmlInactiveCaption.append(m_szPlainTextCaption);
- 	m_szHtmlInactiveCaption.append("</b></font></nobr>");
- }
-@@ -361,7 +361,7 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
- 		else
- 			outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
- 	}
--	m_pIrcView->tqrepaint(false);
-+	m_pIrcView->repaint(false);
- }
- 
- TQStringList KviLogViewMDIWindow::getFileNames()
-diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
-index bdd21f1..e106623 100644
---- a/src/modules/mircimport/libkvimircimport.cpp
-+++ b/src/modules/mircimport/libkvimircimport.cpp
-@@ -243,7 +243,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess)
- 	if(bSuccess)
- 	{
- 		m_pOutput->setText(__tr2qs("File downloaded: processing ..."));
--		m_pOutput->tqrepaint();
-+		m_pOutput->repaint();
- #ifndef COMPILE_ON_WINDOWS
- 		g_pApp->syncX();
- #endif //!COMPILE_ON_WINDOWS
-@@ -252,7 +252,7 @@ void KviRemoteMircServerImportWizard::getListTerminated(bool bSuccess)
- 
- 		TQString tmp;
- 		if(iCount > 0)
--			tmp = __tr2qs("%1 servers imported succesfully").tqarg(iCount);
-+			tmp = __tr2qs("%1 servers imported succesfully").arg(iCount);
- 		else
- 			tmp = __tr2qs("No servers imported");
- 		m_pOutput->setText(tmp);
-diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
-index 3a7568b..bbc1298 100644
---- a/src/modules/notifier/notifierwindow.cpp
-+++ b/src/modules/notifier/notifierwindow.cpp
-@@ -1191,7 +1191,7 @@ void KviNotifierWindow::redrawWindow()
- }
- 
- inline void KviNotifierWindow::setCursor(int cur) {
--	if (m_cursor.tqshape() != cur) {
-+	if (m_cursor.shape() != cur) {
- 		if(TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor();
- 		m_cursor.setShape((Qt::CursorShape)cur);
- 		TQApplication::setOverrideCursor(m_cursor);
-diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
-index 9f6e26a..0a4f58a 100644
---- a/src/modules/objects/class_buttongroup.cpp
-+++ b/src/modules/objects/class_buttongroup.cpp
-@@ -48,7 +48,7 @@
- 	@description:
- 		This widget organizes buttons in a group.
- 		It will be usually a parent for other child controls.
--		You can either use a child tqlayout to manage the tqchildren geometries
-+		You can either use a child tqlayout to manage the children geometries
- 		or use $setColumnLayout function to manage the tqlayout automatically.
- 		The class ineriths groupbox.
- 
-diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
-index 40fc473..852db9d 100644
---- a/src/modules/objects/class_dockwindow.cpp
-+++ b/src/modules/objects/class_dockwindow.cpp
-@@ -50,7 +50,7 @@
- 	@description:
- 		A window dockable to the KVIrc main frame borders (like a toolbar).
- 		The window has an implicit tqlayout that will automatically manage
--		the tqchildren depending on the dock window's orientation.
-+		the children depending on the dock window's orientation.
- 	@functions:
- 		!fn: $addWidget(<widget:hobject>)
- 			Adds <widget> to the internal tqlayout of this dock window.[br]
-diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
-index d0ecae0..a1f5c11 100644
---- a/src/modules/objects/class_groupbox.cpp
-+++ b/src/modules/objects/class_groupbox.cpp
-@@ -29,7 +29,7 @@
- #include "kvi_locale.h"
- #include "kvi_iconmanager.h"
- 
--// Tables used in $setAlignment , $tqalignment and in $setOrientation & $orientation
-+// Tables used in $setAlignment , $alignment and in $setOrientation & $orientation
- 
- const char * const align_tbl[] = {
- 			"Left",
-@@ -60,7 +60,7 @@ const int align_cod[] = {
- 	@description:
- 		This widget can be used to display a groupbox.
- 		It will be usually a parent for other child controls.
--		You can either use a child tqlayout to manage the tqchildren geometries
-+		You can either use a child tqlayout to manage the children geometries
- 		or use $setColumnLayout to manage the tqlayout automatically.
- 	@functions:
- 		!fn: $setTitle(<text:String>)
-@@ -89,14 +89,14 @@ const int align_cod[] = {
- 		Returns the number of columns or rows in the groupbox.
- 		!fn: $addSpace()
- 		Adds an empty cell at the next free position.
--		!fn: <string> $tqalignment()
--		Returns the tqalignment of the group box title.
--		!fn: $setAlignment(<tqalignment:string>)
--		Set the tqalignment of the groupbox;  Valid values are Left,Right,HCenter.
-+		!fn: <string> $alignment()
-+		Returns the alignment of the group box title.
-+		!fn: $setAlignment(<alignment:string>)
-+		Set the alignment of the groupbox;  Valid values are Left,Right,HCenter.
- 		!fn: $setOrientation<orientation:string>
- 		Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical.
- 		!fn: $setColumnLayout(<columns:integer>,<orientation:string>)
--		Enables the automatic tqlayout management. The tqchildren are arranged in n columns with the specified orientation.[br]
-+		Enables the automatic tqlayout management. The children are arranged in n columns with the specified orientation.[br]
- 		Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical.
- 	@examples:
- 		[example]
-@@ -137,8 +137,8 @@ const int align_cod[] = {
- 		%layoutbtn->$addwidget(%btnok,0,0)[br]
- 		%layoutbtn->$addwidget(%btncancel,0,1)[br]
- 		[br]
--		#And finally we create a main tqlayout with the groupbox (and its "tqchildren")[br]
--		#and fakewiget (with its buttons tqchildren).
-+		#And finally we create a main tqlayout with the groupbox (and its "children")[br]
-+		#and fakewiget (with its buttons children).
- 		%maintqlayout=$new(tqlayout,%widget)[br]
- 		%maintqlayout->$setspacing(10)[br]
- 		%maintqlayout->$setmargin(10)[br]
-@@ -165,7 +165,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setColumns", functionSetColumns)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"columns", functionColumns)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"addSpace", functionAddSpace)
--	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqalignment", functionAlignment)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"alignment", functionAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setAlignment", functionSetAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setOrientation", functionSetOrientation)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"isChecked", functionIsChecked)
-@@ -310,7 +310,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
- {
- 	TQString szAlign;
- 	KVSO_PARAMETERS_BEGIN(c)
--		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlign)
-+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlign)
- 	KVSO_PARAMETERS_END(c)
- 	if (!widget()) return true;
- 	for(unsigned int i = 0; i < align_num; i++)
-@@ -321,12 +321,12 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
- 			return true;
- 		}
- 	}
--	c->warning(__tr2qs("Unknown tqalignment"));
-+	c->warning(__tr2qs("Unknown alignment"));
- 	return true;
- }
- bool KviKvsObject_groupbox::functionAlignment(KviKvsObjectFunctionCall *c)
- {
--	int mode = ((KviTalGroupBox *)widget())->tqalignment();
-+	int mode = ((KviTalGroupBox *)widget())->alignment();
- 	TQString szAlignment="";
- 	for(unsigned int i = 0; i < align_num; i++)
- 	{
-diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
-index 58c518c..0f6ae24 100644
---- a/src/modules/objects/class_hbox.cpp
-+++ b/src/modules/objects/class_hbox.cpp
-@@ -35,11 +35,11 @@
- 	@type:
- 		class
- 	@short:
--		Manages child widget horizontal tqgeometry
-+		Manages child widget horizontal geometry
- 	@inherits:
- 		[class]object[/class]
- 	@description:
--		The hbox class widget provides horizontal tqgeometry management for its child widgets.
-+		The hbox class widget provides horizontal geometry management for its child widgets.
- 	@functions:
- 		!fn: $setSpacing(<spacing:uint>)
- 		Sets the default spacing of the widgets in pixels
-diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
-index 580f93b..f0e93e2 100644
---- a/src/modules/objects/class_label.cpp
-+++ b/src/modules/objects/class_label.cpp
-@@ -34,7 +34,7 @@
- 
- 
- 
--// Tables used in $setAlignment & $tqalignment
-+// Tables used in $setAlignment & $alignment
- const char * const align_tbl[] = {
- 			"Left", 
- 			"Right",
-@@ -120,7 +120,7 @@ const int frame_cod[] = {
- 		[class]widget[/class]
- 	@description:
- 		This widget can be used to display a text or an image. It can
--		have different frame styles and text/image tqalignment.
-+		have different frame styles and text/image alignment.
- 	@functions:
- 		!fn: $setText(<text:string>)
- 		Sets the text to be displayed by the label.
-@@ -144,15 +144,15 @@ const int frame_cod[] = {
- 		automagically resize itself accordingly to the 'size' of the
- 		text it contains. 
- 		See also [classfnc]$autoResize[/classfnc]().
--		!fn: <string> $tqalignment()
--		Returns a string containing tqalignment flags that are set for 
-+		!fn: <string> $alignment()
-+		Returns a string containing alignment flags that are set for 
- 		this label. The flags are separated by commas. An example output
- 		could look like this:[br]
- 		[pre]Bottom, Right[/pre][br]
- 		See [classfnc]$setAlignment[/classfnc]() for explanation of all
--		tqalignment flags.
-+		alignment flags.
- 		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
--		This function sets tqalignment flags, given as parameters, for 
-+		This function sets alignment flags, given as parameters, for 
- 		this label. Valid flags are:
- 		[pre]
- 		Right     - Text is aligned to right border[br]
-@@ -179,8 +179,8 @@ const int frame_cod[] = {
- 		frame-style flags and their explenation.
- 		!fn: $setFrameStyle(<flag1>, <flag2>, ...)
- 		Sets the frame-style flags to the ones passed as arguments.
--		The flags can either decide of the tqshape or shadow of the
--		label's frame. Valid tqshape flags are:[br]
-+		The flags can either decide of the shape or shadow of the
-+		label's frame. Valid shape flags are:[br]
- 		[pre]
- 		NoFrame     - draw no frame. You shouldn't specify a shadow when
- 		using this.[br]
-@@ -216,7 +216,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setMargin", functionSetMargin)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
--	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqalignment", functionAlignment)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"alignment", functionAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle)
-@@ -297,13 +297,13 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c)
- //
- bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
- {
--	TQStringList tqalignment;
-+	TQStringList alignment;
- 	KVSO_PARAMETERS_BEGIN(c)
--		KVSO_PARAMETER("tqalignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,tqalignment)
-+		KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment)
- 	KVSO_PARAMETERS_END(c)
- 	if (!widget()) return true;
- 	int align,sum=0;
--	for ( TQStringList::Iterator it = tqalignment.begin(); it != tqalignment.end(); ++it )
-+	for ( TQStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it )
- 		{
- 		
- 			align = 0;
-@@ -318,7 +318,7 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
- 			if(align)
- 				sum = sum | align;
- 			else
--				c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it));
-+				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
- 			
- 		}
- 	((TQLabel *)widget())->setAlignment(sum);
-@@ -326,7 +326,7 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
- }
- bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c)
- {
--	int mode = ((TQLabel *)widget())->tqalignment();
-+	int mode = ((TQLabel *)widget())->alignment();
- 	TQString szAlignment="";
- 	for(unsigned int i = 0; i < align_num; i++)
- 	{
-diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
-index 4381416..5caac1d 100644
---- a/src/modules/objects/class_layout.cpp
-+++ b/src/modules/objects/class_layout.cpp
-@@ -48,11 +48,11 @@
- 	@type:
- 		class
- 	@short:
--		Manages child widget tqgeometry
-+		Manages child widget geometry
- 	@inherits:
- 		[class]object[/class]
- 	@description:
--		The tqlayout is a tqgeometry management tool for child widgets.
-+		The tqlayout is a geometry management tool for child widgets.
- 		You create a tqlayout , give it some widgets to manage and it will tqlayout them
- 		automatically.[br]
- 		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
-diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
-index 1bfe95a..f21417c 100644
---- a/src/modules/objects/class_listview.cpp
-+++ b/src/modules/objects/class_listview.cpp
-@@ -55,7 +55,7 @@
- 		[class]widget[/class]
- 	@description:
- 		It can display and control a hierarchy of multi-column items, and provides the ability to add new items at any time.
--		The items are added by creating tqchildren [class]listviewitem[/class] objects: simply allocating them with $new
-+		The items are added by creating children [class]listviewitem[/class] objects: simply allocating them with $new
- 		will add the items to the listview and simply deleting them will remove them.
- 		Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating
- 		a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either
-@@ -132,11 +132,11 @@
- 		The default implementation emits the [classfnc]$onItem[/classfnc]() signal.
- 
- 		!fn: $itemExpandedEvent(<item:object>)
--		This event is called when an item has been expanded, i.e. when the tqchildren of item are shown.
-+		This event is called when an item has been expanded, i.e. when the children of item are shown.
- 		The default implementation emits the [classfnc]$expanded[/classfnc]() signal.
- 
- 		!fn: $itemCollapsedEvent(<item:object>)
--		This event is called when an item has been collapsed, i.e. when the tqchildren of item are hidden.
-+		This event is called when an item has been collapsed, i.e. when the children of item are hidden.
- 		The default implementation emits the [classfnc]$collapsed[/classfnc]() signal.
- 
- 		!fn: $itemRenamedEvent(<item:object>,<col:integer>,<text:string>)
-diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
-index 49c448e..605fcee 100644
---- a/src/modules/objects/class_listviewitem.cpp
-+++ b/src/modules/objects/class_listviewitem.cpp
-@@ -71,7 +71,7 @@
- 		Returns $true if this item is enabled and $false otherwise
- 
- 		!fn: $setOpen(<bOpen:boolean>)
--		Opens or closes the item to show its tqchildren items
-+		Opens or closes the item to show its children items
- 
- 		!fn: $isOpen()
- 		Returns the open state of this item
-@@ -80,7 +80,7 @@
- 		Makes this item checkable or not. This function should be called immediately
- 		after the item creation: changing this property later at runtime may have
- 		strange results (like the item being moved inside the list, text disappearing,
--		hidden tqchildren etc... don't do it :D ).
-+		hidden children etc... don't do it :D ).
- 
- 		!fn: $isCheckable()
- 		Returns $true if this item is checkable and $false otherwise
-@@ -94,7 +94,7 @@
- 		have been previously called.
- 
- 		!fn: <listviewitem> $firstChild()
--		Returns the first child item of this listviewitem or $null if this item has no tqchildren.
-+		Returns the first child item of this listviewitem or $null if this item has no children.
- 
- 		!fn: <listviewitem> $nextSibling()
- 		Returns the next sibling item of this listviewitem or $null if there are no sibling items.
-diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
-index 70d5086..1d14fcb 100644
---- a/src/modules/objects/class_multilineedit.cpp
-+++ b/src/modules/objects/class_multilineedit.cpp
-@@ -226,15 +226,15 @@ static int mod_cod[] =	{
- 		Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE).
- 		!fn: <boolean> $isRedoAvailable ()
- 		Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE).
--		!fn: $setAlignment(<tqalignment:string>)
--		Sets the tqalignment of the current paragraph to <tqalignment>. Valid values are:[br]
-+		!fn: $setAlignment(<alignment:string>)
-+		Sets the alignment of the current paragraph to <alignment>. Valid values are:[br]
- 		- AlignAuto - Aligns according to the language.[br]
- 		- TQt::AlignLeft - Aligns with the left edge.[br]
- 		- TQt::AlignRight - Aligns with the right edge.[br]
- 		- TQt::AlignCenter - Centers in both dimensions.
--		!fn: $setVerticalAlignment(<vertical_tqalignment:string>)
--		Sets the vertical tqalignment of the current format to <Valignemnt>. Valid Values are:[br]
--		- AlignNormal - Normal tqalignment.[br]
-+		!fn: $setVerticalAlignment(<vertical_alignment:string>)
-+		Sets the vertical alignment of the current format to <Valignemnt>. Valid Values are:[br]
-+		- AlignNormal - Normal alignment.[br]
- 		- AlignSuperScript - Superscript.[br]
- 		- AlignSubScript - Subscript.
- 		!fn: $setAutoFormatting(<afvalue:string>)
-@@ -1095,7 +1095,7 @@ bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c)
- {
- 	TQString szAlignment;
- 	KVSO_PARAMETERS_BEGIN(c)
--		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlignment)
-+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlignment)
- 	KVSO_PARAMETERS_END(c)
- 	if(!widget()) return true;
- 	if(KviTQString::equalCI(szAlignment,"Left"))
-@@ -1106,7 +1106,7 @@ bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c)
- 		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignCenter);
- 	else if(KviTQString::equalCI(szAlignment,"Justify"))
- 		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignJustify);
--	else c->warning(__tr2qs("Unknown tqalignment '%Q'"),&szAlignment);
-+	else c->warning(__tr2qs("Unknown alignment '%Q'"),&szAlignment);
- 	return true;
- }
- 
-@@ -1131,18 +1131,18 @@ bool KviKvsObject_mledit::functionsetAutoFormatting(KviKvsObjectFunctionCall *c)
- bool KviKvsObject_mledit::functionsetVerticalAlignment(KviKvsObjectFunctionCall *c)
- 
- {
--	TQString szVtqalignment;
-+	TQString szValignment;
- 	KVSO_PARAMETERS_BEGIN(c)
--		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szVtqalignment)
-+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szValignment)
- 	KVSO_PARAMETERS_END(c)
- 	if(!widget()) return true;
--	if(KviTQString::equalCI(szVtqalignment,"Normal"))
-+	if(KviTQString::equalCI(szValignment,"Normal"))
- 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignNormal);
--	else if(KviTQString::equalCI(szVtqalignment,"SuperScript"))
-+	else if(KviTQString::equalCI(szValignment,"SuperScript"))
- 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSuperScript);
--	else if(KviTQString::equalCI(szVtqalignment,"SubScript"))
-+	else if(KviTQString::equalCI(szValignment,"SubScript"))
- 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSubScript);
--	else c->warning(__tr2qs("Unknown vertical tqalignment '%Q'"),&szVtqalignment);
-+	else c->warning(__tr2qs("Unknown vertical alignment '%Q'"),&szValignment);
- 	return true;
- }
- 
-diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
-index 826d119..81cc3f6 100644
---- a/src/modules/objects/class_painter.cpp
-+++ b/src/modules/objects/class_painter.cpp
-@@ -41,12 +41,12 @@
- 	@type:
- 		class
- 	@short:
--		This class provide a painter to paint line and tqshapes.
-+		This class provide a painter to paint line and shapes.
- 	@inherits:
- 		[class]object[/class]
- 		[class]widget[/class]
- 	@description:
--		With this class you can draw many graphics objects from simple lines to complex tqshapes like pies and chords.[br]
-+		With this class you can draw many graphics objects from simple lines to complex shapes like pies and chords.[br]
- 		It can also draw aligned text and pixmaps. Normally, it draws in a "natural" coordinate system, but it can also do view and world transformation.[br]
- 		The class need to be implemented into a [classfnc]$paintEvent[/classfnc]();
- 		@functions:
-@@ -196,8 +196,8 @@
- 			timerevent()[br] 
- 			{[br]
- 				$$->%b = $(($$->%b + 1) & 15);[br] 
--				if ($$->%nextanim == 1)  $$->$tqrepaint(1);[br] 
--				$$->$tqrepaint(0);[br] 
-+				if ($$->%nextanim == 1)  $$->$repaint(1);[br] 
-+				$$->$repaint(0);[br] 
- 			}[br] 
- 			drawAnim()[br] 
- 			{[br] 
-@@ -414,12 +414,12 @@ if(__pXOrArray->isArray())\
- 		KviKvsVariant * pH = __pXOrArray->array()->at(3);\
- 		if(!(pX && pY && pW && pH))\
- 		{\
--			c->error(__tr2qs("One of the tqgeometry array parameters is empty"));\
-+			c->error(__tr2qs("One of the geometry array parameters is empty"));\
- 			return false;\
- 		}\
- 		if(!(pX->asInteger(iX) && pY->asInteger(__iY) && pW->asInteger(__iW) && pH->asInteger(__iH)))\
- 		{\
--			c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer"));\
-+			c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer"));\
- 			return false;\
- 		}\
- 	} else {\
-diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
-index d30a6b6..fc22188 100644
---- a/src/modules/objects/class_tabwidget.cpp
-+++ b/src/modules/objects/class_tabwidget.cpp
-@@ -129,10 +129,10 @@
- 			%labelwp=$new(label,%secondtab)
- 			%labelwp->$settext("Enjoy the new Class provided by")
- 			%layoutsecondtab->$addwidget(%labelwp,0,0)
--			%labelwp->$settqalignment("Center")
-+			%labelwp->$setalignment("Center")
- 			%labelgen=$new(label,%secondtab)
- 			%labelgen->$settext(Grifisx \& Noldor)
--			%labelgen->$settqalignment("Center")
-+			%labelgen->$setalignment("Center")
- 			%layoutsecondtab->$addwidget(%labelgen,1,0)
- 			%Tabwidget->$addTab(%secondtab,&About,50)
- 			
-diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp
-index 639b311..2d0416b 100644
---- a/src/modules/objects/class_urllabel.cpp
-+++ b/src/modules/objects/class_urllabel.cpp
-@@ -152,7 +152,7 @@ bool KviScriptUrlLabelObject::eventFilter(TQObject * o, TQEvent * e)
- 		!fn: $setText(<text>)
- 		Sets the label's text. Reimplemented from internal reasons.
- 		!fn: $setCursorChange(<bEnabled:boolean>)
--		Tells the label wheather to change or not the tqshape of cursor,
-+		Tells the label wheather to change or not the shape of cursor,
- 		when it is above the widget. Default is false.
- 		!fn: <boolean> $cursorChange()
- 		Returns true if the cursor changes over the label, false if not.
-diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
-index d068156..bfc8014 100644
---- a/src/modules/objects/class_vbox.cpp
-+++ b/src/modules/objects/class_vbox.cpp
-@@ -35,11 +35,11 @@
- 	@type:
- 		class
- 	@short:
--		Manages child widget vertical tqgeometry
-+		Manages child widget vertical geometry
- 	@inherits:
- 		[class]object[/class]
- 	@description:
--		The vbox class widget provides vertical tqgeometry management for its child widgets.
-+		The vbox class widget provides vertical geometry management for its child widgets.
- 	@functions:
- 		!fn: $setSpacing(<spacing:int>)
- 		Sets the default spacing of the widgets in pixels
-diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
-index fec3925..83d5608 100644
---- a/src/modules/objects/class_widget.cpp
-+++ b/src/modules/objects/class_widget.cpp
-@@ -137,12 +137,12 @@ const int widgettypes_cod[] = {
- 		All the other widget-type classes inherit from this one.
- 	@functions:
- 		!fn: $show()
--		Shows this widget and the tqchildren.
-+		Shows this widget and the children.
- 		See also [classfnc]$hide[/classfnc]() and [classfnc]$isVisible[/classfnc].
- 		!fn: $hide()
--		Hides this widget (and conseguently all the tqchildren).
-+		Hides this widget (and conseguently all the children).
- 		See also [classfnc]$show[/classfnc]() and [classfnc]$isVisible[/classfnc].
--		!fn: $tqrepaint(<bool erase>)
-+		!fn: $repaint(<bool erase>)
- 		Repaints the widget directly by calling [classfnc]$paintEvent[/classfnc]() immediately.[br]
- 		If erase is TRUE, erases the widget before the $paintEvent() call.
- 		!fn: $x()
-@@ -157,11 +157,11 @@ const int widgettypes_cod[] = {
- 		Returns the width of this widget in pixels.
- 		!fn: $height()
- 		Returns the height of this widget in pixels.
--		!fn: $tqgeometry()
--		Returns the widget tqgeometry in this form:[br]
-+		!fn: $geometry()
-+		Returns the widget geometry in this form:[br]
- 		x, y, width, height.
- 		!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
--		Sets the tqgeometry of this widget. <x> and <y> are relative
-+		Sets the geometry of this widget. <x> and <y> are relative
- 		to the parent widget or to the desktop (if this widget is
- 		a toplevel one). All the parameters are in pixels.
- 		!fn: $setMinimumWidth(<value>)
-@@ -341,7 +341,7 @@ const int widgettypes_cod[] = {
- 		If a tooltip has setted with [classfnc]$setTooltip[/classfnc] the dynamic tooltip will be ignored.
- 		The default implementation does nothing.		
- 		!fn: $paintEvent()
--		This event handler can be reimplemented to tqrepaint all or part of the widget.
-+		This event handler can be reimplemented to repaint all or part of the widget.
- 		It's needed by the Painter class.
- 		It's very useful for drawing flicker free animations or low level special graphic effects.
- 		If you call "[cmd]return[/cmd] $true" you will stop the internal processing
-@@ -522,7 +522,7 @@ const int widgettypes_cod[] = {
- 	// ... now that I think about it , it
- 	// may happen that widget() will be zero here too:
- 	// If the TQt "physical" widget gets destroyed
--	// by some external factor (for example when tqchildren
-+	// by some external factor (for example when children
- 	// of a wrapper widget destroyed by KVIrc).
- 	//
- 	// as a convention:
-@@ -546,7 +546,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
- 	// apparence
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"show",function_show)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"hide",function_hide)
--	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqrepaint",function_tqrepaint)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"repaint",function_repaint)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isTopLevel",function_isTopLevel)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isVisible",function_isVisible)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"raise",function_raise)
-@@ -567,10 +567,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsWidth",function_fontMetricsWidth)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsHeight",function_fontMetricsHeight)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFont",function_setFont)
--	// tqgeometry
-+	// geometry
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"screenResolution",function_screenResolution)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"centerToScreen",function_centerToScreen)
--	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_tqgeometry)
-+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_geometry)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setGeometry",function_setGeometry)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapToGlobal",function_mapToGlobal)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapFromGlobal",function_mapFromGlobal)
-@@ -916,14 +916,14 @@ bool KviKvsObject_widget::function_fontAscent(KviKvsObjectFunctionCall * c)
- 
- }
- 
--bool KviKvsObject_widget::function_tqrepaint(KviKvsObjectFunctionCall * c)
-+bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c)
- {
- 	bool bEnabled;
- 	KVSO_PARAMETERS_BEGIN(c)
- 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
- 	KVSO_PARAMETERS_END(c)
- 	if(!widget()) return true;
--    widget()->tqrepaint(bEnabled);
-+    widget()->repaint(bEnabled);
- 	return true;
- }
- 
-@@ -955,9 +955,9 @@ bool KviKvsObject_widget::function_screenResolution(KviKvsObjectFunctionCall * c
- 	return true;
- }
- 
--bool KviKvsObject_widget::function_tqgeometry(KviKvsObjectFunctionCall *c)
-+bool KviKvsObject_widget::function_geometry(KviKvsObjectFunctionCall *c)
- {
--	TQRect r = widget() ? widget()->tqgeometry() : TQRect(0,0,0,0);
-+	TQRect r = widget() ? widget()->geometry() : TQRect(0,0,0,0);
- 	KviKvsArray * a = new KviKvsArray();
- 	a->set(0,new KviKvsVariant((kvs_int_t)r.x()));
- 	a->set(1,new KviKvsVariant((kvs_int_t)r.y()));
-@@ -992,7 +992,7 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c)
- 
- 	if(pXOrArray->isArray())
- 	{
--		// the user has passed a complete tqgeometry array as first parameter
-+		// the user has passed a complete geometry array as first parameter
- 		// make sure it has at least 4 elements
- 		if(pXOrArray->array()->size() < 4)
- 		{
-@@ -1009,12 +1009,12 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c)
- 		// no parameter was set in that place
- 		if(!(pX && pY && pW && pH))
- 		{
--			c->error(__tr2qs("One of the tqgeometry array parameters is empty"));
-+			c->error(__tr2qs("One of the geometry array parameters is empty"));
- 			return false;
- 		}
- 		if(!(pX->asInteger(iX) && pY->asInteger(iY) && pW->asInteger(iW) && pH->asInteger(iH)))
- 		{
--			c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer"));
-+			c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer"));
- 			return false;
- 		}
- 		// ok: the params are correct
-diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
-index edbe610..47d13cd 100644
---- a/src/modules/objects/class_widget.h
-+++ b/src/modules/objects/class_widget.h
-@@ -59,7 +59,7 @@ protected:
- 	bool function_fontMetricsHeight(KviKvsObjectFunctionCall * c);
- 	bool function_fontMetricsWidth(KviKvsObjectFunctionCall * c);
- 	bool function_foregroundColor(KviKvsObjectFunctionCall *c);
--	bool function_tqgeometry(KviKvsObjectFunctionCall *c);
-+	bool function_geometry(KviKvsObjectFunctionCall *c);
- 	bool function_globalCursorX(KviKvsObjectFunctionCall *c);
- 	bool function_globalCursorY(KviKvsObjectFunctionCall *c);
- 	bool function_hasFocus(KviKvsObjectFunctionCall *c);
-@@ -74,7 +74,7 @@ protected:
- 	bool function_move(KviKvsObjectFunctionCall *c);
- 	bool function_parentWidget(KviKvsObjectFunctionCall *c);
- 	bool function_raise(KviKvsObjectFunctionCall *);
--	bool function_tqrepaint(KviKvsObjectFunctionCall *c);
-+	bool function_repaint(KviKvsObjectFunctionCall *c);
- 	bool function_reparent(KviKvsObjectFunctionCall *c);
- 	bool function_resize(KviKvsObjectFunctionCall *c);
- 	bool function_screenResolution(KviKvsObjectFunctionCall * c);
-diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
-index 393c296..918f541 100644
---- a/src/modules/objects/class_window.cpp
-+++ b/src/modules/objects/class_window.cpp
-@@ -119,7 +119,7 @@ bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
- 	KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name());
- 	setObject(TQT_TQOBJECT(w));
- 	pContext->window()->frame()->addWindow(w,false);
--	w->minimize(); // must be minimized before tqchildren are added, otherwise the focus handling goes nuts...
-+	w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts...
- 
- 	return true;
- }
-diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
-index 928ddaf..38901ed 100644
---- a/src/modules/objects/class_wrapper.cpp
-+++ b/src/modules/objects/class_wrapper.cpp
-@@ -72,7 +72,7 @@
-                 The first entry in this example is a KVIrc server window, class "KviFrame" and name "kvirc_frame":
-                 it is a toplevel widget.[br]
-                 The "qt_top_dock", "qt_custom_toolbar" and the "qt_dockwidget_internal" are
--                direct tqchildren of that widget.[br]
-+                direct children of that widget.[br]
-                 To indicate a specific widget we will use the "class::name" form.[br]
-                 So to indicate the main KVIrc frame you will use "KviFrame::kvirc_main_frame".
-                 Look at this example:[br]
-diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
-index 3a939ff..2a4dc9d 100644
---- a/src/modules/objects/libkviobjects.cpp
-+++ b/src/modules/objects/libkviobjects.cpp
-@@ -153,7 +153,7 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
- 			Suppresses any warning message
- 		@description:
- 			Removes the definition of the class <class_name>.[br]
--			All the instances of the class are killed (thus tqchildren objects are killed too).[br]
-+			All the instances of the class are killed (thus children objects are killed too).[br]
- 			All the derived class definitions are removed as well.[br]
- 			Builtin class definitions cannot be removed and this commands
- 			kills only all the instances of that class (derived class definitions
-@@ -913,7 +913,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
- static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
- {
- #ifdef COMPILE_USE_QT4
--	const TQObjectList list = parent->tqchildren();
-+	const TQObjectList list = parent->children();
- 	if( !list.count() ) return;
- 	TQString sp(spacing);
- 	sp.append(">");
-diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
-index 107c597..4f1dedf 100644
---- a/src/modules/options/dialog.cpp
-+++ b/src/modules/options/dialog.cpp
-@@ -179,7 +179,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
- 					"</td>" \
- 				"</tr>" \
- 			"</table>"
--		).tqarg(szDialogTitle).tqarg(szDialog).tqarg(szInfoTips).tqarg(szOkCancelButtons);
-+		).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons);
- 
- 	TQString szCaption = szDialogTitle + " - KVIrc";
- 	setCaption(szCaption);
-@@ -534,10 +534,10 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt
- 		{
- 			if(e->bIsContainer)
- 			{
--				// it's a container: add only eventual not contained tqchildren (containers or explicitly marked as not contained)
-+				// it's a container: add only eventual not contained children (containers or explicitly marked as not contained)
- 				fillListView(it,e->pChildList,szGroup,true);
- 			} else {
--				// it's not a container, add any tqchildren
-+				// it's not a container, add any children
- 				fillListView(it,e->pChildList,szGroup,false);
- 			}
- 		}
-@@ -578,7 +578,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
- 	if(it->m_pOptionsWidget == pPage)return it;
- 
- 	KviOptionsListViewItem *i;
--	// run through the tqchildren
-+	// run through the children
- 	i = (KviOptionsListViewItem *)(it->firstChild());
- 	if(i)
- 	{
-@@ -586,7 +586,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
- 		if(i)return i;
- 	}
- 	
--	// not found in the tqchildren tree.. look in the next sibling
-+	// not found in the children tree.. look in the next sibling
- 	i = (KviOptionsListViewItem *)(it->nextSibling());
- 	if(i)
- 	{
-@@ -647,7 +647,7 @@ void KviOptionsDialog::closeEvent(TQCloseEvent *e)
- 
- void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
- {
--	// First commit the tqchildren
-+	// First commit the children
- 	if(!it) return;
- 	KviOptionsListViewItem *it2 = (KviOptionsListViewItem *)it->firstChild();
- 	while(it2)
-diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
-index 1a25a14..9947aff 100755
---- a/src/modules/options/mkcreateinstanceproc.sh
-+++ b/src/modules/options/mkcreateinstanceproc.sh
-@@ -271,7 +271,7 @@ printclass()
- 	fi
- }
- 
--addtqchildren()
-+addchildren()
- {
- 	if [ -f "$CLASSDIR/$2" ]; then
- 		LEVEL=`cat $CLASSDIR/$2`
-@@ -282,7 +282,7 @@ addtqchildren()
- 				echo "$3	e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $TARGET
- 				echo "$3	e$1->pChildList->setAutoDelete(true);" >> $TARGET
- 				NEXTLEVEL=`expr $1 + 1`
--				addtqchildren $NEXTLEVEL $achild "$3	"
-+				addchildren $NEXTLEVEL $achild "$3	"
- 			else
- 				echo "$3	e$1->pChildList = 0;" >> $TARGET
- 			fi
-@@ -290,7 +290,7 @@ addtqchildren()
- 	fi
- }
- 
--addtqchildren 0 NOPARENT ""
-+addchildren 0 NOPARENT ""
- 
- 
- rm -fr $CLASSDIR
-diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
-index f39add0..a6cee9d 100644
---- a/src/modules/options/optw_irc.cpp
-+++ b/src/modules/options/optw_irc.cpp
-@@ -181,7 +181,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar
- 		
- 		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
- 		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
--		m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2));
-+		m_pBanTypeCombo->insertItem(TQString("%1 (%2)").arg(tmp1).arg(tmp2));
- 	}
- 	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
- 
-diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
-index 309344c..2c26ac5 100644
---- a/src/modules/options/optw_servers.cpp
-+++ b/src/modules/options/optw_servers.cpp
-@@ -732,7 +732,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
- 	KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
- 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
- 	{
--		m_pProxyEditor->insertItem(TQString("%1:%2").tqarg(p->hostname()).tqarg(p->port()));
-+		m_pProxyEditor->insertItem(TQString("%1:%2").arg(p->hostname()).arg(p->port()));
- 	}
- 	if(m_pProxyEditor->count() > (s->proxy()+2))
- 		m_pProxyEditor->setCurrentItem(s->proxy()+2);
-diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
-index 495df00..fc915ed 100644
---- a/src/modules/options/optw_textencoding.cpp
-+++ b/src/modules/options/optw_textencoding.cpp
-@@ -68,7 +68,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
- 	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("Automatic detection","options"));
- 	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("en","options"));
- 	
--	TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
-+	TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath());
- 
- 	bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile);
- 	//We Have setted locale, but not restarted kvirc
-@@ -121,7 +121,7 @@ void KviTextEncodingOptionsWidget::commit()
- 	}
- 	
- 	idx=m_pForcedLocaleCombo->currentItem();
--	TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
-+	TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath());
- 	if(idx==0) {
- 		if(KviFileUtils::fileExists(szLangFile))
- 			KviFileUtils::removeFile(szLangFile);
-diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
-index 59fc732..254c5fe 100644
---- a/src/modules/reguser/dialog.cpp
-+++ b/src/modules/reguser/dialog.cpp
-@@ -312,7 +312,7 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
- 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(),
- 			size().width(),size().height());
- #else
--	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
-+	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();
- #endif
- 
- 	g_pRegisteredUsersDialog = 0;
-diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
-index b0c72cf..1a8b5c4 100644
---- a/src/modules/setup/setupwizard.cpp
-+++ b/src/modules/setup/setupwizard.cpp
-@@ -736,7 +736,7 @@ void KviSetupWizard::chooseOldDataPath()
- 				__tr2qs("Do not overwrite folder? - KVIrc"),
- 				tqtr("A folder %1 seems to be not a valid KVIrc settings folder."
- 					"Do you want to use it anyway?")
--					.tqarg( szBuffer ),
-+					.arg( szBuffer ),
- 				__tr2qs("&Yes"), __tr2qs("&No"),
- 				TQString(), 0, 1 ) == 0
- 			) {
-@@ -1005,7 +1005,7 @@ void KviSetupWizard::accept()
- 	
- #ifndef COMPILE_ON_WINDOWS
- 		// Make local->global link
--		TQString localPath = TQString("%1/global").tqarg(g_pApp->m_szLocalKvircDir);
-+		TQString localPath = TQString("%1/global").arg(g_pApp->m_szLocalKvircDir);
- 		unlink(TQTextCodec::codecForLocale()->fromUnicode(localPath).data());
- 		symlink(TQTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),TQTextCodec::codecForLocale()->fromUnicode(localPath).data());
- #endif
-diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-index c8aa9e4..11e320d 100644
---- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
-+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-@@ -411,7 +411,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi
- 				if(fi.exists())
- 				{
- 					tmp += "<nobr>";
--					tmp += __tr2qs_ctx("Size: %1 bytes","filetransferwindow").tqarg(fi.size());
-+					tmp += __tr2qs_ctx("Size: %1 bytes","filetransferwindow").arg(fi.size());
- 					tmp += "</nobr><br>";
- 				}
- 
-diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
-index 6f2e24c..269fbfe 100644
---- a/src/modules/theme/packthemedialog.cpp
-+++ b/src/modules/theme/packthemedialog.cpp
-@@ -293,7 +293,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem
- 	pLayout = new TQGridLayout(pPage,4,1,4,4);
- 
- 	pLabel = new TQLabel(pPage);
--	pLabel->setText(__tr2qs_ctx("Here you must choose the file name for the theme package. It should have a *.%1 extension.","theme").tqarg(KVI_FILEEXTENSION_THEMEPACKAGE));
-+	pLabel->setText(__tr2qs_ctx("Here you must choose the file name for the theme package. It should have a *.%1 extension.","theme").arg(KVI_FILEEXTENSION_THEMEPACKAGE));
- 	pLabel->setTextFormat(TQt::RichText);
- 	pLayout->addWidget(pLabel,0,0);
- 
-diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
-index 927fbf7..208c269 100644
---- a/src/modules/toolbareditor/toolbareditor.cpp
-+++ b/src/modules/toolbareditor/toolbareditor.cpp
-@@ -371,7 +371,7 @@ void KviCustomizeToolBarsDialog::deleteToolBar()
- 	if(!t)return;
- 	if(TQMessageBox::question(this,
- 			__tr2qs("Confirm ToolBar Deletion"),
--			__tr2qs("Do you really want to delete toolbar \"%1\" ?").tqarg(t->label()),
-+			__tr2qs("Do you really want to delete toolbar \"%1\" ?").arg(t->label()),
- 			__tr2qs("No"),
- 			__tr2qs("Yes")) == 0)return;
- 	KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id());
-@@ -462,7 +462,7 @@ void KviCustomizeToolBarsDialog::renameToolBar()
- 	if(!t)return;
- 
- 	KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this,
--		__tr2qs("Please specify the properties for the toolbar \"%1\"").tqarg(t->label()),
-+		__tr2qs("Please specify the properties for the toolbar \"%1\"").arg(t->label()),
- 		t->descriptor()->id(),
- 		t->descriptor()->labelCode(),
- 		t->descriptor()->iconId());
-diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
-index 45b32db..e8b6528 100644
---- a/src/modules/torrent/tc_statusbarapplet.cpp
-+++ b/src/modules/torrent/tc_statusbarapplet.cpp
-@@ -39,12 +39,12 @@ void KviTorrentStatusBarApplet::selfRegister(KviStatusBar *bar)
- TQString formatSize(float sz)
- {
- 	if (sz >= 1024.0f*1024.0f*1024.0f)
--		return TQString("%1 GB").tqarg(sz / (1024.0f*1024.0f*1024.0f), 2, 'f', 2);
-+		return TQString("%1 GB").arg(sz / (1024.0f*1024.0f*1024.0f), 2, 'f', 2);
- 	if (sz >= 1024.0f*1024.0f)
--		return TQString("%1 MB").tqarg(sz / (1024.0f*1024.0f), 2, 'f', 2);
-+		return TQString("%1 MB").arg(sz / (1024.0f*1024.0f), 2, 'f', 2);
- 	if (sz >= 1024.0f)
--		return TQString("%1 KB").tqarg(sz / 1024.0f, 2, 'f', 2);
--	return TQString("%1 B").tqarg(sz, 2, 'f', 2);
-+		return TQString("%1 KB").arg(sz / 1024.0f, 2, 'f', 2);
-+	return TQString("%1 B").arg(sz, 2, 'f', 2);
- }
- 
- void KviTorrentStatusBarApplet::update()
-@@ -52,10 +52,10 @@ void KviTorrentStatusBarApplet::update()
- 	if (KviTorrentInterface::selected())
- 	{
- 		TQString msg = TQString("up: %1 K/s (%2), dn: %3 K/s (%4)")
--					.tqarg(KviTorrentInterface::selected()->speedUp(), 2)
--					.tqarg(formatSize(KviTorrentInterface::selected()->trafficUp()))
--					.tqarg(KviTorrentInterface::selected()->speedDown(), 2)
--					.tqarg(formatSize(KviTorrentInterface::selected()->trafficDown()));
-+					.arg(KviTorrentInterface::selected()->speedUp(), 2)
-+					.arg(formatSize(KviTorrentInterface::selected()->trafficUp()))
-+					.arg(KviTorrentInterface::selected()->speedDown(), 2)
-+					.arg(formatSize(KviTorrentInterface::selected()->trafficDown()));
- 
- 		setText(msg);
- 
-diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
-index b3edd19..c0e647c 100644
---- a/src/modules/url/libkviurl.cpp
-+++ b/src/modules/url/libkviurl.cpp
-@@ -285,7 +285,7 @@ void UrlDialog::popup(KviTalListViewItem *item, const TQPoint &point, int col)
- void UrlDialog::sayToWin(int itemID)
- {
- 	KviWindow *wnd = g_pApp->findWindowByCaption(m_pListPopup->text(itemID).utf8().data());
--	TQString say=TQString("PRIVMSG %1 %2").tqarg(wnd->windowName()).tqarg(m_szUrl.ptr());
-+	TQString say=TQString("PRIVMSG %1 %2").arg(wnd->windowName()).arg(m_szUrl.ptr());
- 	if (wnd) {
- 		KviKvsScript::run(say,wnd);
- 		wnd->raise();
-diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
-index 7c83051..3624402 100644
---- a/src/modules/window/libkviwindow.cpp
-+++ b/src/modules/window/libkviwindow.cpp
-@@ -1499,7 +1499,7 @@ static bool window_module_init(KviModule *m)
- 
- 	// saveOutput (view()->saveBuffer())
- /*
--	m->registerFunction("geometry",window_module_fnc_tqgeometry);
-+	m->registerFunction("geometry",window_module_fnc_geometry);
- 	m->registerCommand("setGeometry",window_module_cmd_setGeometry);
- 
- 	m->registerFunction("isActive",window_module_fnc_isActive);
diff --git a/redhat/applications/kvirc/bp002-2dd6d32b.diff b/redhat/applications/kvirc/bp002-2dd6d32b.diff
deleted file mode 100644
index 94cee22e4..000000000
--- a/redhat/applications/kvirc/bp002-2dd6d32b.diff
+++ /dev/null
@@ -1,4391 +0,0 @@
-commit 2dd6d32bd821b303aa7b25edda76d1ef7c14b2bf
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324497989 -0600
-
-    Rename obsolete tq methods to standard names
-
-diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
-index 3441e7b..1759e32 100644
---- a/src/kvilib/config/kvi_wincfg.h
-+++ b/src/kvilib/config/kvi_wincfg.h
-@@ -132,7 +132,7 @@
- /* define this if you are on a big endian machine */
- /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
- 
--/* define this if you want to use the tqunicode-local 8bit charset translation */
-+/* define this if you want to use the unicode-local 8bit charset translation */
- /* #undef COMPILE_USE_LOCAL_8BIT */
- 
- /* define this if you want to disable the inter-process communication support */
-diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
-index 1c2bcab..99e513f 100644
---- a/src/kvilib/core/kvi_pointerhashtable.h
-+++ b/src/kvilib/core/kvi_pointerhashtable.h
-@@ -236,18 +236,18 @@ inline unsigned int kvi_hash_hash(const TQString &szKey,bool bCaseSensitive)
- 	if(!p)return 0;
- 	if(bCaseSensitive)
- 	{
--		while(p->tqunicode())
-+		while(p->unicode())
- 		{
--			uResult += p->tqunicode();
-+			uResult += p->unicode();
- 			p++;
- 		}
- 	} else {
--		while(p->tqunicode())
-+		while(p->unicode())
- 		{
- #ifdef COMPILE_USE_QT4
--			uResult += p->toLower().tqunicode();
-+			uResult += p->toLower().unicode();
- #else
--			uResult += p->lower().tqunicode();
-+			uResult += p->lower().unicode();
- #endif
- 			p++;
- 		}
-diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
-index b02e308..84beaa0 100644
---- a/src/kvilib/core/kvi_qstring.cpp
-+++ b/src/kvilib/core/kvi_qstring.cpp
-@@ -54,8 +54,8 @@ namespace KviTQString
- 	bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len)
- 	{
- 		if(len == 0)return true; // assume equal
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		unsigned int lmin = MY_MIN(sz1.length(),sz2.length());
- 		if(lmin < len)return false;
- 		const TQChar * c1e = c1 + len;
-@@ -64,7 +64,7 @@ namespace KviTQString
- 		
- 		while(c1 < c1e)
- 		{
--			if(c1->tqunicode() != c2->tqunicode())return false;
-+			if(c1->unicode() != c2->unicode())return false;
- 			c1++;
- 			c2++;
- 		}
-@@ -74,8 +74,8 @@ namespace KviTQString
- 	bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
- 	{
- 		if(len == 0)return true; // assume equal
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		unsigned int lmin = MY_MIN(sz1.length(),sz2.length());
- 		if(lmin < len)return false;
- 		const TQChar * c1e = c1 + len;
-@@ -85,9 +85,9 @@ namespace KviTQString
- 		while(c1 < c1e)
- 		{
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != c2->toLower().tqunicode())return false;
-+			if(c1->toLower().unicode() != c2->toLower().unicode())return false;
- #else
--			if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
-+			if(c1->lower().unicode() != c2->lower().unicode())return false;
- #endif
- 			c1++;
- 			c2++;
-@@ -98,7 +98,7 @@ namespace KviTQString
- 	bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len)
- 	{
- 		if(len == 0)return true; // assume equal
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		if(sz1.length() < len)return false;
- 		const TQChar * c1e = c1 + len;
- 
-@@ -107,7 +107,7 @@ namespace KviTQString
- 
- 		while((c1 < c1e) && (*sz2))
- 		{
--			if(c1->tqunicode() != *sz2)return false;
-+			if(c1->unicode() != *sz2)return false;
- 			c1++;
- 			sz2++;
- 		}
-@@ -117,7 +117,7 @@ namespace KviTQString
- 	bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len)
- 	{
- 		if(len == 0)return true; // assume equal
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		if(sz1.length() < len)return false;
- 		const TQChar * c1e = c1 + len;
- 
-@@ -127,9 +127,9 @@ namespace KviTQString
- 		while((c1 < c1e) && (*sz2))
- 		{
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != tolower(*sz2))return false;
-+			if(c1->toLower().unicode() != tolower(*sz2))return false;
- #else
--			if(c1->lower().tqunicode() != tolower(*sz2))return false;
-+			if(c1->lower().unicode() != tolower(*sz2))return false;
- #endif
- 			c1++;
- 			sz2++;
-@@ -141,19 +141,19 @@ namespace KviTQString
- 	bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len)
- 	{
- 		if(len == 0)return true; // assume equal
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		if(sz1.length() < len)return false;
- 		const TQChar * c1e = c1 + len;
- 
- 		if(!sz2)return !c1;
--		if(!c1)return !(sz2->tqunicode());
-+		if(!c1)return !(sz2->unicode());
- 
--		while((c1 < c1e) && (sz2->tqunicode()))
-+		while((c1 < c1e) && (sz2->unicode()))
- 		{
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
-+			if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
- #else
--			if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
-+			if(c1->lower().unicode() != sz2->lower().unicode())return false;
- #endif
- 			c1++;
- 			sz2++;
-@@ -189,15 +189,15 @@ namespace KviTQString
- 	{
- 		if(sz1.length() != sz2.length())return false;
- 
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 		
- 		if(!c1 || !c2)return (c1 == c2);
- 		
- 		while(c1 < c1e)
- 		{
--			if(c1->tqunicode() != c2->tqunicode())return false;
-+			if(c1->unicode() != c2->unicode())return false;
- 			c1++;
- 			c2++;
- 		}
-@@ -208,8 +208,8 @@ namespace KviTQString
- 	{
- 		if(sz1.length() != sz2.length())return false;
- 
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 
- 		if(!c1 || !c2)return (c1 == c2);
-@@ -217,9 +217,9 @@ namespace KviTQString
- 		while(c1 < c1e)
- 		{
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != c2->toLower().tqunicode())return false;
-+			if(c1->toLower().unicode() != c2->toLower().unicode())return false;
- #else
--			if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
-+			if(c1->lower().unicode() != c2->lower().unicode())return false;
- #endif
- 			c1++;
- 			c2++;
-@@ -230,35 +230,35 @@ namespace KviTQString
- 	// sz2 is assumed to be null terminated, sz1 is not!
- 	bool equalCI(const TQString &sz1,const TQChar *sz2)
- 	{
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 
- 		if(!c1 || !sz2)return (c1 == sz2);
- 
- 		while(c1 < c1e)
- 		{
--			if(!sz2->tqunicode())return false; // sz1 has at least another character
-+			if(!sz2->unicode())return false; // sz1 has at least another character
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
-+			if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
- #else
--			if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
-+			if(c1->lower().unicode() != sz2->lower().unicode())return false;
- #endif
- 			c1++;
- 			sz2++;
- 		}
--		return (c1 == c1e) && (!sz2->tqunicode());
-+		return (c1 == c1e) && (!sz2->unicode());
- 	}
- 
- 	bool equalCS(const TQString &sz1,const char * sz2)
- 	{
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 
- 		if(!c1)return !sz2;
- 
- 		while((c1 < c1e) && (*sz2))
- 		{
--			if(c1->tqunicode() != *sz2)return false;
-+			if(c1->unicode() != *sz2)return false;
- 			c1++;
- 			sz2++;
- 		}
-@@ -267,7 +267,7 @@ namespace KviTQString
- 
- 	bool equalCI(const TQString &sz1,const char * sz2)
- 	{
--		const TQChar * c1 = sz1.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 
- 		if(!c1)return !sz2;
-@@ -275,9 +275,9 @@ namespace KviTQString
- 		while((c1 < c1e) && (*sz2))
- 		{
- #ifdef COMPILE_USE_QT4
--			if(c1->toLower().tqunicode() != tolower(*sz2))return false;
-+			if(c1->toLower().unicode() != tolower(*sz2))return false;
- #else
--			if(c1->lower().tqunicode() != tolower(*sz2))return false;
-+			if(c1->lower().unicode() != tolower(*sz2))return false;
- #endif
- 			c1++;
- 			sz2++;
-@@ -287,8 +287,8 @@ namespace KviTQString
- 
- 	int cmpCS(const TQString &sz1,const TQString &sz2)
- 	{
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 		const TQChar * c2e = c2 + sz2.length();
- 
-@@ -304,12 +304,12 @@ namespace KviTQString
- 		{
- 			if(c1 >= c1e)
- 			{
--				if(c2 < c2e)return /* 0 */ - (c2->tqunicode());
-+				if(c2 < c2e)return /* 0 */ - (c2->unicode());
- 				return 0;
- 			}
--			if(c2 >= c2e)return c1->tqunicode() /* - 0 */;
-+			if(c2 >= c2e)return c1->unicode() /* - 0 */;
- 
--			int diff = c1->tqunicode() - c2->tqunicode();
-+			int diff = c1->unicode() - c2->unicode();
- 			if(diff)return diff;
- 
- 			c1++;
-@@ -321,8 +321,8 @@ namespace KviTQString
- 
- 	int cmpCI(const TQString &sz1,const TQString &sz2)
- 	{
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		const TQChar * c1e = c1 + sz1.length();
- 		const TQChar * c2e = c2 + sz2.length();
- 
-@@ -338,22 +338,22 @@ namespace KviTQString
- 			if(c1 >= c1e)
- 			{
- #ifdef COMPILE_USE_QT4
--				if(c2 < c2e)return /* 0 */ - (c2->toLower().tqunicode());
-+				if(c2 < c2e)return /* 0 */ - (c2->toLower().unicode());
- #else
--				if(c2 < c2e)return /* 0 */ - (c2->lower().tqunicode());
-+				if(c2 < c2e)return /* 0 */ - (c2->lower().unicode());
- #endif
- 				return 0;
- 			}
- #ifdef COMPILE_USE_QT4
--			if(c2 >= c2e)return c1->toLower().tqunicode() /* - 0 */;
-+			if(c2 >= c2e)return c1->toLower().unicode() /* - 0 */;
- #else
--			if(c2 >= c2e)return c1->lower().tqunicode() /* - 0 */;
-+			if(c2 >= c2e)return c1->lower().unicode() /* - 0 */;
- #endif
- 
- #ifdef COMPILE_USE_QT4
--			int diff = c1->toLower().tqunicode() - c2->toLower().tqunicode();
-+			int diff = c1->toLower().unicode() - c2->toLower().unicode();
- #else
--			int diff = c1->lower().tqunicode() - c2->lower().tqunicode();
-+			int diff = c1->lower().unicode() - c2->lower().unicode();
- #endif
- 			if(diff)return diff;
- 
-@@ -370,8 +370,8 @@ namespace KviTQString
- 		unsigned int l1 = MY_MIN(len,sz1.length());
- 		unsigned int l = MY_MIN(l1,sz2.length()); // FIXME: THIS IS NOT OK
- 
--		const TQChar * c1 = sz1.tqunicode();
--		const TQChar * c2 = sz2.tqunicode();
-+		const TQChar * c1 = sz1.unicode();
-+		const TQChar * c2 = sz2.unicode();
- 		const TQChar * c1e = c1 + l;
- 
- 		if(!c1)
-@@ -384,9 +384,9 @@ namespace KviTQString
- 		int diff = 0;
- 
- #ifdef COMPILE_USE_QT4
--		while((c1 < c1e) && !(diff = (c1->toLower().tqunicode() - c2->toLower().tqunicode())))
-+		while((c1 < c1e) && !(diff = (c1->toLower().unicode() - c2->toLower().unicode())))
- #else
--		while((c1 < c1e) && !(diff = (c1->lower().tqunicode() - c2->lower().tqunicode())))
-+		while((c1 < c1e) && !(diff = (c1->lower().unicode() - c2->lower().unicode())))
- #endif
- 		{
- 			c1++;
-@@ -533,7 +533,7 @@ namespace KviTQString
- 		}
- 
- 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
--		//TQChar * p = (TQChar *)s.tqunicode();
-+		//TQChar * p = (TQChar *)s.unicode();
- 
- 		char *argString;
- 		long argValue;
-@@ -561,12 +561,12 @@ namespace KviTQString
- 		}
- 
- 
--		for(; fmt->tqunicode() ; ++fmt)
-+		for(; fmt->unicode() ; ++fmt)
- 		{
- 			if(reallen == allocsize)INCREMENT_MEM
- 
- 			//copy up to a '%'
--			if(fmt->tqunicode() != '%')
-+			if(fmt->unicode() != '%')
- 			{
- 				*p++ = *fmt;
- 				reallen++;
-@@ -574,7 +574,7 @@ namespace KviTQString
- 			}
- 
- 			++fmt; //skip this '%'
--			switch(fmt->tqunicode())
-+			switch(fmt->unicode())
- 			{
- 				case 's': // char * string
- 				{
-@@ -583,7 +583,7 @@ namespace KviTQString
- 					TQString str(argString);
- 					if(str.isEmpty())continue;
- 					int len = str.length();
--					const TQChar * ch = str.tqunicode();
-+					const TQChar * ch = str.unicode();
- 					if(!ch)continue;
- 					if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
- 					while(len--)*p++ = *ch++;
-@@ -606,7 +606,7 @@ namespace KviTQString
- 					if(!str)continue;
- 					if(str->isEmpty())continue;
- 					int len = str->length();
--					const TQChar * ch = str->tqunicode();
-+					const TQChar * ch = str->unicode();
- 					if(!ch)continue;
- 					if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
- 					while(len--)*p++ = *ch++;
-@@ -721,7 +721,7 @@ namespace KviTQString
- 				{
- 					*p++ = '%';  //write it
- 					reallen++;
--					if(fmt->tqunicode())
-+					if(fmt->unicode())
- 					{
- 						if(reallen == allocsize)INCREMENT_MEM
- 						*p++ = *fmt;
-@@ -789,21 +789,21 @@ namespace KviTQString
- 		const TQChar * m2 = (const TQChar *)szM2.ucs2();
- #endif
- 
--		if(!(m1 && m2 && (m1->tqunicode())))return false;
-+		if(!(m1 && m2 && (m1->unicode())))return false;
- 		const TQChar * savePos1 = 0;
- 		const TQChar * savePos2 = m2;
--		while(m1->tqunicode())
-+		while(m1->unicode())
- 		{
- 			//loop managed by m1 (initially first mask)
--			if(m1->tqunicode()=='*')
-+			if(m1->unicode()=='*')
- 			{
- 				//Found a wildcard in m1
- 				savePos1 = ++m1;            //move to the next char and save the position...this is our jolly
--				if(!savePos1->tqunicode())return true;  //last was a wildcard , matches everything ahead...
-+				if(!savePos1->unicode())return true;  //last was a wildcard , matches everything ahead...
- 				savePos2 = m2+1;            //next return state for the second string
- 				continue;                   //and return
- 			}
--			if(!m2->tqunicode())return false;         //m2 finished and we had something to match here!
-+			if(!m2->unicode())return false;         //m2 finished and we had something to match here!
- #ifdef COMPILE_USE_QT4
- 			if(m1->toLower()==m2->toLower())
- #else
-@@ -813,7 +813,7 @@ namespace KviTQString
- 				//chars matched
- 				m1++;                       //Go ahead in the two strings
- 				m2++;                       //
--				if((!(m1->tqunicode())) && m2->tqunicode() && savePos1)
-+				if((!(m1->unicode())) && m2->unicode() && savePos1)
- 				{
- 					//m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)...
- 					//retry matching the string following the * from the savePos2 (one char ahead last time)
-@@ -822,7 +822,7 @@ namespace KviTQString
- 					savePos2++;             //next savePos2 will be next char
- 				}
- 			} else {
--				if(m2->tqunicode() == '*')
-+				if(m2->unicode() == '*')
- 				{
- 					//A wlidcard in the second string
- 					//Invert the game : mask1 <-> mask2
-@@ -835,11 +835,11 @@ namespace KviTQString
- 					continue;               //...and again
- 				}
- 				// m1 != m2 , m1 != * , m2 != *
--				if((m1->tqunicode() == '?') || (m2->tqunicode() == '?'))
-+				if((m1->unicode() == '?') || (m2->unicode() == '?'))
- 				{
- 					m1++;
- 					m2++;
--					if((!(m1->tqunicode())) && m2->tqunicode() && savePos1)
-+					if((!(m1->unicode())) && m2->unicode() && savePos1)
- 					{
- 						//m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)...
- 						//retry matching the string following the * from the savePos2 (one char ahead last time)
-@@ -858,7 +858,7 @@ namespace KviTQString
- 				}
- 			}
- 		}
--		return (!(m2->tqunicode()));           //m1 surely finished , so for the match , m2 must be finished too
-+		return (!(m2->unicode()));           //m1 surely finished , so for the match , m2 must be finished too
- 	}
- 
- 	bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
-@@ -870,9 +870,9 @@ namespace KviTQString
- 		TQChar* ptr=(TQChar*)szExp.ucs2();
- #endif
- 		if(!ptr) return 0;
--		while(ptr->tqunicode())
-+		while(ptr->unicode())
- 		{
--			if((ptr->tqunicode()=='[') || (ptr->tqunicode()==']'))
-+			if((ptr->unicode()=='[') || (ptr->unicode()==']'))
- 			{
- 				szWildcard.append("[");
- 				szWildcard.append(*ptr);
-@@ -904,9 +904,9 @@ namespace KviTQString
- 		TQChar* ptr=(TQChar*)szExp.ucs2();
- #endif
- 		if(!ptr) return 0;
--		while(ptr->tqunicode())
-+		while(ptr->unicode())
- 		{
--			if((ptr->tqunicode()=='[')) // <-- hum ?
-+			if((ptr->unicode()=='[')) // <-- hum ?
- 			{
- 				szWildcard.append("[");
- 				szWildcard.append(*ptr);
-@@ -1043,7 +1043,7 @@ namespace KviTQString
- 		}
- 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * szSrc.length());
- 		TQChar * b = buffer;
--		unsigned short us = c->tqunicode();
-+		unsigned short us = c->unicode();
- 		while(us)
- 		{
- 			if(us < 256)
-@@ -1052,7 +1052,7 @@ namespace KviTQString
- 				*b = *c;
- 			c++;
- 			b++;
--			us = c->tqunicode();
-+			us = c->unicode();
- 		}
- 		TQString ret(buffer,szSrc.length());
- 		kvi_free(buffer);
-@@ -1069,7 +1069,7 @@ namespace KviTQString
- 		}
- 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * szSrc.length());
- 		TQChar * b = buffer;
--		unsigned short us = c->tqunicode();
-+		unsigned short us = c->unicode();
- 		while(us)
- 		{
- 			if(us < 256)
-@@ -1079,7 +1079,7 @@ namespace KviTQString
- 				*b = *c;
- 			c++;
- 			b++;
--			us = c->tqunicode();
-+			us = c->unicode();
- 		}
- 		TQString ret(buffer,szSrc.length());
- 		kvi_free(buffer);
-diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
-index 525ad71..54a1c4a 100644
---- a/src/kvilib/core/kvi_string.cpp
-+++ b/src/kvilib/core/kvi_string.cpp
-@@ -109,7 +109,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str)
- 				if(pString->length() > 0) \
- 				{ \
- 					if(len <= ((int)(pString->length())))return (-1); \
--					_WSTRING_WMEMCPY(p,pString->tqunicode(),pString->length()); \
-+					_WSTRING_WMEMCPY(p,pString->unicode(),pString->length()); \
- 					p += pString->length(); \
- 					len -= pString->length(); \
- 				} \
-@@ -192,8 +192,8 @@ int kvi_wvsnprintf(kvi_wchar_t *buffer,kvi_wslen_t len,const kvi_wchar_t *fmt,kv
- 
- bool kvi_qstringEqualCI(const TQString &s1,const TQString &s2)
- {
--	const TQChar * p1 = s1.tqunicode();
--	const TQChar * p2 = s2.tqunicode();
-+	const TQChar * p1 = s1.unicode();
-+	const TQChar * p2 = s2.unicode();
- 	int l = s1.length() < s2.length() ? s1.length() : s2.length();
- #ifdef COMPILE_USE_QT4
- 	while(l-- && (p1->toLower() == p2->toLower()))p1++,p2++;
-@@ -1141,23 +1141,23 @@ KviStr::KviStr(char c,int fillLen)
- }
- 
- 
--KviStr::KviStr(const kvi_wchar_t * tqunicode)
-+KviStr::KviStr(const kvi_wchar_t * unicode)
- {
--	if(!tqunicode)
-+	if(!unicode)
- 	{
- 		m_len = 0;
- 		m_ptr = (char *)kvi_malloc(1);
- 		*m_ptr = 0;
- 	} else {
--		m_len = kvi_wstrlen(tqunicode);
-+		m_len = kvi_wstrlen(unicode);
- 		m_ptr = (char *)kvi_malloc(m_len + 1);
- 		register char * p = m_ptr;
--		while(*tqunicode)*p++ = *tqunicode++;
-+		while(*unicode)*p++ = *unicode++;
- 		*p = 0;
- 	}
- }
- 
--KviStr::KviStr(const kvi_wchar_t * tqunicode,int len)
-+KviStr::KviStr(const kvi_wchar_t * unicode,int len)
- {
- 	m_len = len;
- 	m_ptr = (char *)kvi_malloc(m_len + 1);
-@@ -1165,7 +1165,7 @@ KviStr::KviStr(const kvi_wchar_t * tqunicode,int len)
- 	char * end = p + len;
- 	while(p != end)
- 	{
--		*p++ = *tqunicode++;
-+		*p++ = *unicode++;
- 	}
- 	*p = 0;
- }
-diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
-index 4e9a3ac..9434e27 100644
---- a/src/kvilib/core/kvi_string.h
-+++ b/src/kvilib/core/kvi_string.h
-@@ -155,9 +155,9 @@ public:
- 	// Creates a string long fillLen characters filled with character c.<br>
- 	KviStr(char c,int fillLen = 1);
- 
--	KviStr(const kvi_wchar_t * tqunicode);
-+	KviStr(const kvi_wchar_t * unicode);
- 
--	KviStr(const kvi_wchar_t * tqunicode,int len);
-+	KviStr(const kvi_wchar_t * unicode,int len);
- 
- 	// just free(m_ptr)
- 	~KviStr();
-diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp
-index 1668999..3410773 100644
---- a/src/kvilib/file/kvi_fileutils.cpp
-+++ b/src/kvilib/file/kvi_fileutils.cpp
-@@ -60,7 +60,7 @@ namespace KviFileUtils
- 				if(tmp_buf[255] == '\r')cur_len--; //Ignore CR...
- 				int lastlen = szBuffer.length();
- 				szBuffer.setLength(lastlen + cur_len);
--				TQChar *p1 = szBuffer.tqunicode() + lastlen;
-+				TQChar *p1 = szBuffer.unicode() + lastlen;
- 				char * p2 = tmp_buf;
- 				for(int i=0;i<cur_len;i++)*p1++ = *p2++;
- 				cur_len = 0;
-@@ -76,7 +76,7 @@ namespace KviFileUtils
- 			if(tmp_buf[cur_len - 1] == '\r')cur_len--; //Ignore CR...
- 			int lastlen = szBuffer.length();
- 			szBuffer.setLength(lastlen + cur_len);
--			TQChar *p1 = szBuffer.tqunicode() + lastlen;
-+			TQChar *p1 = szBuffer.unicode() + lastlen;
- 			char * p2 = tmp_buf;
- 			for(int i=0;i<cur_len;i++)*p1++ = *p2++;
- 		}
-diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
-index 4552cc9..acc2de8 100644
---- a/src/kvilib/irc/kvi_ircmask.cpp
-+++ b/src/kvilib/irc/kvi_ircmask.cpp
-@@ -232,8 +232,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
- 	if(b)
- 	{
- 		const TQChar * p = b;
--		while(p->tqunicode() && (p->tqunicode() != '!'))p++;
--		if(p->tqunicode())
-+		while(p->unicode() && (p->unicode() != '!'))p++;
-+		if(p->unicode())
- 		{
- 			if(p != b)
- 			{
-@@ -250,8 +250,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
- 		}
- 		p++;
- 		b = p;
--		while(p->tqunicode() && (p->tqunicode() != '@'))p++;
--		if(p->tqunicode())
-+		while(p->unicode() && (p->unicode() != '@'))p++;
-+		if(p->unicode())
- 		{
- 			if(p != b)
- 			{
-@@ -267,7 +267,7 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
- 		}
- 		p++;
- 		b=p;
--		while(p->tqunicode())p++;
-+		while(p->unicode())p++;
- 		if(p != b)
- 		{
- 			m_szHost.setUnicode(b,p-b);
-@@ -291,7 +291,7 @@ bool KviIrcMask::hasNumericHost() const
- 	int nPoints = 0;
- 	int nDoublePoints = 0;
- 	unsigned short uc;
--	while((uc = p->tqunicode()))
-+	while((uc = p->unicode()))
- 	{
- 		if(uc == '.')nPoints++; // ipv6 masks can contain dots too!
- 		else {
-@@ -300,9 +300,9 @@ bool KviIrcMask::hasNumericHost() const
- 				if((uc < '0') || (uc > '9'))
- 				{
- #ifdef COMPILE_USE_QT4
--					uc = p->toUpper().tqunicode();
-+					uc = p->toUpper().unicode();
- #else
--					uc = p->upper().tqunicode();
-+					uc = p->upper().unicode();
- #endif
- 					if((uc < 'A') || (uc > 'F'))return false;
- 				}
-@@ -408,13 +408,13 @@ void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
- 			break;
- 		default:
- 			if (m_szUser.length() > 0) {
--				if(m_szUser[0].tqunicode() != '*')
-+				if(m_szUser[0].unicode() != '*')
- 					szMask.append(m_szWild);
--				if ((m_szUser[0].tqunicode() == '~') ||
--					(m_szUser[0].tqunicode() == '^') ||
--					(m_szUser[0].tqunicode() == '+') ||
--					(m_szUser[0].tqunicode() == '-') ||
--					(m_szUser[0].tqunicode() == '='))szMask.append(m_szUser.right(m_szUser.length() - 1));
-+				if ((m_szUser[0].unicode() == '~') ||
-+					(m_szUser[0].unicode() == '^') ||
-+					(m_szUser[0].unicode() == '+') ||
-+					(m_szUser[0].unicode() == '-') ||
-+					(m_szUser[0].unicode() == '='))szMask.append(m_szUser.right(m_szUser.length() - 1));
- 				else
- 					szMask.append(m_szUser);
- 			}
-@@ -614,13 +614,13 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
- int KviIrcMask::getIpDomainMaskLen() const
- {
- 	int len = m_szHost.length();
--	const TQChar *p = m_szHost.tqunicode();
-+	const TQChar *p = m_szHost.unicode();
- 	const TQChar *b = p;
- 	p += len;
- 	if(b < p)
- 	{
- 		p--;
--		while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
-+		while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
- 	}
- 	// 000.000.000.000
- 	//            p
-@@ -632,17 +632,17 @@ int KviIrcMask::getIpDomainMaskLen() const
- int KviIrcMask::getLargeIpDomainMaskLen() const
- {
- 	int len = m_szHost.length();
--	const TQChar *p = m_szHost.tqunicode();
-+	const TQChar *p = m_szHost.unicode();
- 	const TQChar *b = p;
- 	p += len;
- 	if(b < p)
- 	{
- 		p--;
--		while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
-+		while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
- 		if(b < p)
- 		{
- 			p--;
--			while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
-+			while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
- 		}
- 	}
- 	// 000.000.000.000
-@@ -657,7 +657,7 @@ TQString KviIrcMask::getHostDomainMask() const
- 	const TQChar *p=KviTQString::nullTerminatedArray(m_szHost);
- 	if(!p)return TQString();
- 	const TQChar *b = p;
--	while(p->tqunicode() && p->tqunicode() != '.')p++;
-+	while(p->unicode() && p->unicode() != '.')p++;
- 	TQString ret(p,len - (p - b));
- 	return ret;
- }
-@@ -666,18 +666,18 @@ TQString KviIrcMask::getHostDomainMask() const
- TQString KviIrcMask::getLargeHostDomainMask() const
- {
- 	int len = m_szHost.length();
--	const TQChar *p = m_szHost.tqunicode();
-+	const TQChar *p = m_szHost.unicode();
- 	const TQChar *b = p;
- 	p += len;
- 
- 	if(b < p)
- 	{
- 		p--;
--		while((b < p) && (p->tqunicode() != '.'))p--;
-+		while((b < p) && (p->unicode() != '.'))p--;
- 		if(b < p)
- 		{
- 			p--;
--			while((b < p) && (p->tqunicode() != '.'))p--;
-+			while((b < p) && (p->unicode() != '.'))p--;
- 		}
- 	}
- 
-@@ -692,14 +692,14 @@ TQString KviIrcMask::getLargeHostDomainMask() const
- bool KviIrcMask::hasMaskedIp() const
- {
- 	int len = m_szHost.length();
--	const TQChar *p = m_szHost.tqunicode();
-+	const TQChar *p = m_szHost.unicode();
- 	const TQChar *b = p;
- 	if(len == 0)return false;
- 	//run to the end
- 	p += len;
- 	const TQChar *e = p;
- 	p--;
--	while((b < p) && (p->tqunicode() != '.'))p--;
-+	while((b < p) && (p->unicode() != '.'))p--;
- 	return ((e - p) > 4); // at the moment 4 should be enough : the largest top part is "name"
- }
- 
-@@ -721,7 +721,7 @@ bool KviIrcMask::hasWildNick()
- 	const TQChar * aux = KviTQString::nullTerminatedArray(m_szNick);
- 	if(!aux)return false;
- 	unsigned short uc;
--	while((uc = aux->tqunicode()))
-+	while((uc = aux->unicode()))
- 	{
- 		if((uc == '*') || (uc == '?'))return true;
- 		aux++;
-@@ -736,14 +736,14 @@ int KviIrcMask::nonWildChars()
- 	if(!aux)return 0;
- 	unsigned short uc;
- 
--	while((uc = aux->tqunicode()))
-+	while((uc = aux->unicode()))
- 	{
- 		if((uc != '*') && (uc != '?'))iCnt++;
- 		aux++;
- 	}
- 
- 	aux = KviTQString::nullTerminatedArray(m_szUser);
--	while((uc = aux->tqunicode()))
-+	while((uc = aux->unicode()))
- 	{
- 		if((uc != '*') && (uc != '?'))iCnt++;
- 		aux++;
-@@ -751,7 +751,7 @@ int KviIrcMask::nonWildChars()
- 
- 
- 	aux = KviTQString::nullTerminatedArray(m_szHost);
--	while((uc = aux->tqunicode()))
-+	while((uc = aux->unicode()))
- 	{
- 		if((uc != '*') && (uc != '?'))iCnt++;
- 		aux++;
-diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
-index 7fda2d1..3394b04 100644
---- a/src/kvilib/irc/kvi_ircuserdb.cpp
-+++ b/src/kvilib/irc/kvi_ircuserdb.cpp
-@@ -54,9 +54,9 @@ void KviIrcUserEntry::setRealName(const TQString &rn)
- 	m_szRealName = KviTQString::trimmed(m_szRealName);
- 	if(m_szRealName.length()>=3)
- 	{
--		if( (m_szRealName[0].tqunicode()==KVI_TEXT_COLOR) && (m_szRealName[2].tqunicode()==KVI_TEXT_RESET) )
-+		if( (m_szRealName[0].unicode()==KVI_TEXT_COLOR) && (m_szRealName[2].unicode()==KVI_TEXT_RESET) )
- 		{
--			switch(m_szRealName[1].tqunicode())
-+			switch(m_szRealName[1].unicode())
- 			{
- 				case '1': // hum.. encoded as hidden color code eh ? publish is somewhere, so others might implement this...
- 					setGender(Male);
-diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/kvi_mirccntrl.cpp
-index 21b5258..e42f316 100644
---- a/src/kvilib/irc/kvi_mirccntrl.cpp
-+++ b/src/kvilib/irc/kvi_mirccntrl.cpp
-@@ -169,7 +169,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 		return charIdx;
- 	}
- 
--	unsigned short c = szData[(int)charIdx].tqunicode();
-+	unsigned short c = szData[(int)charIdx].unicode();
- 
- 	//First we can have a digit or a coma
- 	if(((c < '0') || (c > '9')))
-@@ -189,7 +189,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 		return charIdx;
- 	}
- 
--	c = szData[(int)charIdx].tqunicode();
-+	c = szData[(int)charIdx].unicode();
- 
- 	if(((c < '0') || (c > '9')) && (c != ','))
- 	{
-@@ -207,7 +207,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 			(*byte_2)=KVI_NOCHANGE;
- 			return charIdx;
- 		}
--		c = szData[(int)charIdx].tqunicode();
-+		c = szData[(int)charIdx].unicode();
- 	}
- 
- 	if(c == ',')
-@@ -218,7 +218,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 			(*byte_2)=KVI_NOCHANGE;
- 			return charIdx;
- 		}
--		c = szData[(int)charIdx].tqunicode();
-+		c = szData[(int)charIdx].unicode();
- 	} else {
- 		(*byte_2)=KVI_NOCHANGE;
- 		return charIdx;
-@@ -227,7 +227,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 	if((c < '0') || (c > '9'))
- 	{
- 		(*byte_2)=KVI_NOCHANGE;
--		if(szData[(int)(charIdx-1)].tqunicode()==',')
-+		if(szData[(int)(charIdx-1)].unicode()==',')
- 			return charIdx-1;
- 		else
- 			return charIdx;
-@@ -237,7 +237,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
- 	(*byte_2)=c-'0';
- 	charIdx++;
- 	if(charIdx >= szData.length())return charIdx;
--	c = szData[(int)charIdx].tqunicode();
-+	c = szData[(int)charIdx].unicode();
- 
- 	if((c >= '0') && (c <='9'))
- 	{
-@@ -262,7 +262,7 @@ namespace KviMircCntrl
- 		unsigned char b2;
- 		while(i < l)
- 		{
--			switch(szData[i].tqunicode())
-+			switch(szData[i].unicode())
- 			{
- 				case KVI_TEXT_UNDERLINE:
- 				case KVI_TEXT_BOLD:
-@@ -288,7 +288,7 @@ namespace KviMircCntrl
- 					i++;
- 					while(i < l)
- 					{
--						if(szData[i].tqunicode() == ' ')break;
-+						if(szData[i].unicode() == ' ')break;
- 						else i++;
- 					}
- 					begin = i;
-diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
-index 68e6967..d090fda 100644
---- a/src/kvilib/tal/kvi_tal_listview.cpp
-+++ b/src/kvilib/tal/kvi_tal_listview.cpp
-@@ -479,7 +479,7 @@
- 	        return;
- 	
- 	    TQPoint pos;
--	    int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
-+	    int boxsize = lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
- 	    if (activatedPos(pos)) {
- 	        bool parentControl = false;
- 	        if (parent() && parent()->rtti() == 1  &&
-@@ -652,7 +652,7 @@
- 	    int h = height();
- 	    KviTalListView *lv = listView();
- 	    if (lv)
--	        h = qMax(lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
-+	        h = qMax(lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
- 	                  h);
- 	    h = qMax(h, TQApplication::globalStrut().height());
- 	    setHeight(h);
-@@ -666,7 +666,7 @@
- 	        if (myType == RadioButtonController && pixmap(0)) {
- 	            //             r += 0;
- 	        } else {
--	            r +=  lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
-+	            r +=  lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
- 	        }
- 	    }
- 	    return qMax(r, TQApplication::globalStrut().width());
-@@ -700,7 +700,7 @@
- 	        parentControl = true;
- 	
- 	    TQFontMetrics fm(lv->fontMetrics());
--	    int boxsize = lv->tqstyle()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
-+	    int boxsize = lv->style()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
- 	                                           TQStyle::PM_CheckListButtonSize, 0, lv);
- 	    int marg = lv->itemMargin();
- 	    int r = marg;
-@@ -733,7 +733,7 @@
- 	            opt.rect.setRect(x, 0, boxsize, fm.height() + 2 + marg);
- 	            opt.palette = cg;
- 	            opt.state = styleflags;
--	            lv->tqstyle()->drawPrimitive(TQStyle::PE_Q3CheckListController, &opt, p, lv);
-+	            lv->style()->drawPrimitive(TQStyle::PE_Q3CheckListController, &opt, p, lv);
- 	            r += boxsize + 4;
- 	        }
- 	    } else {
-@@ -751,7 +751,7 @@
- 	        opt.rect.setRect(x, y, boxsize, fm.height() + 2 + marg);
- 	        opt.palette = cg;
- 	        opt.state = styleflags;
--	        lv->tqstyle()->drawPrimitive((myType == CheckBox || myType == CheckBoxController)
-+	        lv->style()->drawPrimitive((myType == CheckBox || myType == CheckBoxController)
- 	                                    ? TQStyle::PE_Q3CheckListIndicator
- 	                                    : TQStyle::PE_Q3CheckListExclusiveIndicator, &opt, p, lv);
- 	        r += boxsize + 4;
-@@ -782,7 +782,7 @@
- 	         (lv->rootIsDecorated() || myType == RadioButton ||
- 	          (myType == CheckBox && parentControl))) {
- 	        TQRect rect;
--	        int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
-+	        int boxsize = lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
- 	        if (lv->columnAlignment(0) == TQt::AlignCenter) {
- 	            TQFontMetrics fm(lv->font());
- 	            int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
-@@ -1216,7 +1216,7 @@
- 		return;
- 	
- 	    TQPoint pos;
--	    int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
-+	    int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
- 	    if ( activatedPos( pos ) ) {
- 		bool parentControl = FALSE;
- 		if ( parent() && parent()->rtti() == 1  &&
-@@ -1388,7 +1388,7 @@
- 	    int h = height();
- 	    KviTalListView *lv = listView();
- 	    if ( lv )
--		h = TQMAX( lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv),
-+		h = TQMAX( lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv),
- 			  h );
- 	    h = TQMAX( h, TQApplication::globalStrut().height() );
- 	    setHeight( h );
-@@ -1402,7 +1402,7 @@
- 		if ( myType == RadioButtonController && pixmap( 0 ) ) {
- 		    //	     r += 0;
- 		} else {
--		    r +=  lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
-+		    r +=  lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
- 		}
- 	    }
- 	    return TQMAX( r, TQApplication::globalStrut().width() );
-@@ -1437,7 +1437,7 @@
- 		parentControl = TRUE;
- 	
- 	    TQFontMetrics fm( lv->fontMetrics() );
--	    int boxsize = lv->tqstyle().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
-+	    int boxsize = lv->style().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
- 						   TQStyle::PM_CheckListButtonSize, lv);
- 	    int marg = lv->itemMargin();
- 	    int r = marg;
-@@ -1464,7 +1464,7 @@
- 		if(!parentControl)
- 		    x += 3;
- 		if ( !pixmap( 0 ) ) {
--		    lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListController, p,
-+		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListController, p,
- 					  TQRect(x, 0, boxsize,
- 						fm.height() + 2 + marg),
- 					  cg, styleflags, TQStyleOption(this));
-@@ -1482,12 +1482,12 @@
- 		    y = (fm.height() + 2 + marg - boxsize) / 2;
- 	
- 		if ( ( myType == CheckBox ) || ( myType == CheckBoxController ) ) {
--		    lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
-+		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
- 					      TQRect(x, y, boxsize,
- 						    fm.height() + 2 + marg),
- 					      cg, styleflags, TQStyleOption(this));
- 		} else { //radio button look
--		    lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator,
-+		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator,
- 						      p, TQRect(x, y, boxsize,
- 							       fm.height() + 2 + marg),
- 						      cg, styleflags, TQStyleOption(this));
-@@ -1519,7 +1519,7 @@
- 		 (lv->rootIsDecorated() || myType == RadioButton ||
- 		  (myType == CheckBox && parentControl) ) ) {
- 		TQRect rect;
--		int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
-+		int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
- 		if ( lv->columnAlignment(0) == AlignCenter ) {
- 		    TQFontMetrics fm( lv->font() );
- 		    int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
-diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
-index 80ac44a..85e24f3 100644
---- a/src/kvilib/tal/kvi_tal_toolbar.cpp
-+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
-@@ -49,7 +49,7 @@
- 		{
- 			//setFrameStyle(TQFrame::NoFrame);
- 			setObjectName(nam);
--			if(!tqlayout())
-+			if(!layout())
- 				this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight));
- 			w->addToolBar(dock,this);
- 		}
-@@ -58,14 +58,14 @@
- 		{
- 			//setFrameStyle(TQFrame::NoFrame);
- 			setObjectName(name);
--			if(!tqlayout())
-+			if(!layout())
- 				this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight));
- 			w->addToolBar(this);
- 		}
- 
- 		TQBoxLayout * KviTalToolBar::boxLayout()
- 		{
--			return (TQBoxLayout*)this->tqlayout();
-+			return (TQBoxLayout*)this->layout();
- 		}
- 		
- 		void KviTalToolBar::setBoxLayout(TQBoxLayout * l)
-diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
-index 1f9224c..66b65cf 100644
---- a/src/kvirc/kernel/kvi_app.cpp
-+++ b/src/kvirc/kernel/kvi_app.cpp
-@@ -916,8 +916,8 @@ TQString KviApp::getClipboardText()
- 	return buffer;
- 	*/
- 	
--	TQString buffer = tqclipboard()->text(TQClipboard::Clipboard);
--	if(buffer.isEmpty())return tqclipboard()->text(TQClipboard::Selection);
-+	TQString buffer = clipboard()->text(TQClipboard::Clipboard);
-+	if(buffer.isEmpty())return clipboard()->text(TQClipboard::Selection);
- 	return buffer;
- }
- 
-@@ -945,8 +945,8 @@ void KviApp::setClipboardText(const TQString &str)
- #if [[[TQT_VERSION IS DEPRECATED]]] >= 300
- 	}
- #endif*/
--	tqclipboard()->setText(str,TQClipboard::Clipboard);
--	tqclipboard()->setText(str,TQClipboard::Selection);
-+	clipboard()->setText(str,TQClipboard::Clipboard);
-+	clipboard()->setText(str,TQClipboard::Selection);
- }
- 
- void KviApp::setClipboardText(const KviStr &str)
-diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
-index 2e3b8fa..8bf97f4 100644
---- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
-+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
-@@ -127,7 +127,7 @@ void KviCustomToolBarDescriptor::fillToolBar()
- {
- 	if(m_pActions->count() == 0)
- 	{
--		// force tqlayout of the toolbar
-+		// force layout of the toolbar
- 		TQApplication::postEvent(m_pToolBar,new TQEvent(TQEvent::LayoutHint));
- 	} else {
- 		KviPointerList<TQString> dying;
-diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
-index 9c5ef5a..0040b53 100644
---- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
-+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
-@@ -67,7 +67,7 @@ void KviIrcConnectionServerInfo::setSupportedChannelModes(const TQString &szSupp
- 	m_bSupportsModesIe = (szSupportedChannelModes.contains('e') && szSupportedChannelModes.contains('I'));
- 	
- 	TQChar* aux=(TQChar*)szSupportedChannelModes.ucs2();
--	while(aux->tqunicode())
-+	while(aux->unicode())
- 	{
- 		if(!m_szSupportedChannelModes.contains(*aux))
- 			m_szSupportedChannelModes.append(*aux);
-@@ -98,7 +98,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable()
- 	// Alexey: FIXED: rethinked:)
- 	// Pragma: LOL :DDDD
- 	int i=0;
--	while( (uPrefix = cPrefix->tqunicode()) && (uFlag = cFlag->tqunicode()) && i<m_uPrefixes*3)
-+	while( (uPrefix = cPrefix->unicode()) && (uFlag = cFlag->unicode()) && i<m_uPrefixes*3)
- 	{
- 		m_pModePrefixTable[i]=uPrefix;
- 		m_pModePrefixTable[i+1]=uFlag;
-@@ -131,7 +131,7 @@ bool KviIrcConnectionServerInfo::isSupportedModePrefix(TQChar c)
- 	if(!m_pModePrefixTable) return false;
- 	for(int i=0;i<m_uPrefixes;i++)
- 	{
--		if(m_pModePrefixTable[i*3]==c.tqunicode()) return true;
-+		if(m_pModePrefixTable[i*3]==c.unicode()) return true;
- 	}
- 	return false;
- }
-@@ -141,7 +141,7 @@ bool KviIrcConnectionServerInfo::isSupportedModeFlag(TQChar c)
- 	if(!m_pModePrefixTable) return false;
- 	for(int i=0;i<m_uPrefixes;i++)
- 	{
--		if(m_pModePrefixTable[(i*3)+1]==c.tqunicode()) return true;
-+		if(m_pModePrefixTable[(i*3)+1]==c.unicode()) return true;
- 	}
- 	return false;
- }
-@@ -171,7 +171,7 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(TQChar c)
- 	if(!m_pModePrefixTable) return 0;
- 	for(int i=0;i<m_uPrefixes;i++)
- 	{
--		if(m_pModePrefixTable[i*3]==c.tqunicode()) return m_pModePrefixTable[i*3+2];
-+		if(m_pModePrefixTable[i*3]==c.unicode()) return m_pModePrefixTable[i*3+2];
- 	}
- 	return 0;
- }
-@@ -181,7 +181,7 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c)
- 	if(!m_pModePrefixTable) return 0;
- 	for(int i=0;i<m_uPrefixes;i++)
- 	{
--		if(m_pModePrefixTable[i*3+1]==c.tqunicode()) return m_pModePrefixTable[i*3+2];
-+		if(m_pModePrefixTable[i*3+1]==c.unicode()) return m_pModePrefixTable[i*3+2];
- 	}
- 	return 0;
- }
-@@ -225,7 +225,7 @@ const TQString & KviBasicIrcServerInfo::getUserModeDescription(TQChar mode)
- 
- const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mode)
- {
--	switch(mode.tqunicode())
-+	switch(mode.unicode())
- 	{
- 		case 'o': return __tr2qs("Channel operators"); break;
- 		case 'v': return __tr2qs("Voiced users"); break;
-@@ -265,7 +265,7 @@ const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mo
- 
- const TQString & KviBasicIrcServerInfo::getBasicUserModeDescription(TQChar mode)
- {
--	switch(mode.tqunicode())
-+	switch(mode.unicode())
- 	{
- 		case 'o': return __tr2qs("o: IRC operator (OPER)"); break;
- 		case 'O': return __tr2qs("O: Local IRC operator (LOCOP)"); break;
-diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
-index 6de1110..0bf241d 100644
---- a/src/kvirc/kernel/kvi_userinput.cpp
-+++ b/src/kvirc/kernel/kvi_userinput.cpp
-@@ -44,17 +44,17 @@ namespace KviUserInput
- 		if(!c)return true; // empty
- 		
- 		while(c->isSpace())c++;
--		if(!c->tqunicode())return true; // empty
-+		if(!c->unicode())return true; // empty
- 		
--		if(c->tqunicode() == '\\')
-+		if(c->unicode() == '\\')
- 		{
- 			c++;
--			if(c->tqunicode() != '/')c--;
-+			if(c->unicode() != '/')c--;
- 		} else {
--			if(c->tqunicode() == '/')
-+			if(c->unicode() == '/')
- 			{
- 				c++;
--				if(c->tqunicode() != '/')
-+				if(c->unicode() != '/')
- 				{
- 					szData.remove(0,c-b);
- 					return parseCommand(szData,pWindow,szContext,bUserFriendlyCommandline);
-@@ -103,11 +103,11 @@ namespace KviUserInput
- 		const TQChar * beg = aux;
- 		if(!beg)return; // empty
- 	
--		while(aux->tqunicode())
-+		while(aux->unicode())
- 		{
--			while(aux->tqunicode() && (aux->tqunicode() != '\n'))aux++;
-+			while(aux->unicode() && (aux->unicode() != '\n'))aux++;
- 			TQString buf(beg,aux-beg);
--			if(aux->tqunicode() == '\n')aux++;
-+			if(aux->unicode() == '\n')aux++;
- 			beg = aux;
- 	
- 			if(buf.isEmpty())buf = " "; // avoid "No text to send" (d3vah)
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
-index 0610328..f376b58 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
-@@ -47,7 +47,7 @@ namespace KviKvsCoreFunctions
- 		// a_f
- 		_REGFNC("active",active)
- 		_REGFNC("array",array)
--		_REGFNC("ascii",tqunicode)
-+		_REGFNC("ascii",unicode)
- 		_REGFNC("asciiToHex",asciiToHex)
- 		_REGFNC("asciiToBase64",asciiToBase64)
- 		_REGFNC("away",away)
-@@ -121,7 +121,7 @@ namespace KviKvsCoreFunctions
- 		_REGFNC("true",trueCKEYWORDWORKAROUND)
- 		_REGFNC("typeof",typeofCKEYWORDWORKAROUND)
- 		_REGFNC("u",u)
--		_REGFNC("tqunicode",tqunicode)
-+		_REGFNC("unicode",unicode)
- 		_REGFNC("unixtime",unixtime)
- 		_REGFNC("unserialize",unserialize)
- 		_REGFNC("username",username)
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h
-index 31a73b7..b902ebe 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h
-@@ -131,7 +131,7 @@ namespace KviKvsCoreFunctions
- 	KVSCF(trueCKEYWORDWORKAROUND);
- 	KVSCF(typeofCKEYWORDWORKAROUND);
- 	KVSCF(u);
--	KVSCF(tqunicode);
-+	KVSCF(unicode);
- 	KVSCF(unixtime);
- 	KVSCF(unserialize);
- 	KVSCF(username);
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
-index 60fbe44..096ff3c 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
-@@ -108,7 +108,7 @@ namespace KviKvsCoreFunctions
- 		@syntax:
- 			<variant> $ascii(<char:string>)
- 		@description:
--			This function has been renamed to $tqunicode and is present
-+			This function has been renamed to $unicode and is present
- 			only for backward compatibility.
- 		@seealso:
- 			[fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc]
-@@ -489,24 +489,24 @@ namespace KviKvsCoreFunctions
- 		@title:
- 			$char
- 		@short:
--			Returns a character specified by tqunicode
-+			Returns a character specified by unicode
- 		@syntax:
--			<string> $char(<tqunicode_value:integer>)
-+			<string> $char(<unicode_value:integer>)
- 		@description:
--			Returns a character corresponding to the UNICODE code <tqunicode_value>.[br]
-+			Returns a character corresponding to the UNICODE code <unicode_value>.[br]
- 			This function can not return NUL character (UNICODE 0). Basically
- 			you should never need it: if you do, drop me a mail.[br]
--			If the <tqunicode_code> is not a valid UNICODE code (or is 0), this function returns
-+			If the <unicode_code> is not a valid UNICODE code (or is 0), this function returns
- 			an empty string.[br]
- 		@seealso:
--			[fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$tqunicode[/fnc]
-+			[fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$unicode[/fnc]
- 	*/
- 
- 	KVSCF(charCKEYWORDWORKAROUND)
- 	{
- 		kvs_uint_t ac;
- 		KVSCF_PARAMETERS_BEGIN
--			KVSCF_PARAMETER("tqunicode_value",KVS_PT_UINT,0,ac)
-+			KVSCF_PARAMETER("unicode_value",KVS_PT_UINT,0,ac)
- 		KVSCF_PARAMETERS_END
- 
- 		if(ac != 0 && ac < 65536)
-@@ -780,15 +780,15 @@ namespace KviKvsCoreFunctions
- 		const TQChar * c = KviTQString::nullTerminatedArray(szFormat);
- 		if(c)
- 		{
--			while(c->tqunicode())
-+			while(c->unicode())
- 			{
- 				//Check for right Characters
- 				#ifdef COMPILE_ON_WINDOWS
--					if (szAllowedCharacters.find((char)(c->tqunicode()),0,true) >= 0)	tmpFormat += '%';
-+					if (szAllowedCharacters.find((char)(c->unicode()),0,true) >= 0)	tmpFormat += '%';
- 				#else
- 					if (c->isLetter()) tmpFormat += '%';
- 				#endif
--				tmpFormat += (char)(c->tqunicode());
-+				tmpFormat += (char)(c->unicode());
- 				c++;
- 			}
- 		}
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-index a5478dc..e56abbe 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-@@ -401,12 +401,12 @@ namespace KviKvsCoreFunctions
- 			if(szLongSwitch.isEmpty())
- 				v = sl->find(szSwitch);
- 			else
--				v = sl->find(szSwitch[0].tqunicode(),szLongSwitch);
-+				v = sl->find(szSwitch[0].unicode(),szLongSwitch);
- 		}else {
- 			if(szLongSwitch.isEmpty())
- 				v = sl->find(szSwitch[0]);
- 			else
--				v = sl->find(szSwitch[0].tqunicode(),szLongSwitch);
-+				v = sl->find(szSwitch[0].unicode(),szLongSwitch);
- 		}
- 
- 		if(v)KVSCF_pRetBuffer->copyFrom(*v);
-@@ -842,15 +842,15 @@ namespace KviKvsCoreFunctions
- 	/////////////////////////////////////////////////////////////////////////////////////////
- 
- 	/*
--		@doc: tqunicode
-+		@doc: unicode
- 		@type:
- 			function
- 		@title:
--			$tqunicode
-+			$unicode
- 		@short:
- 			Returns the UNICODE code of a sets of characters
- 		@syntax:
--			<variant> $tqunicode(<char:string>)
-+			<variant> $unicode(<char:string>)
- 		@description:
- 			If <char> is composed only of a single character
- 			then returns its UNICODE code point as an integer.
-@@ -860,7 +860,7 @@ namespace KviKvsCoreFunctions
- 			[fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc]
- 	*/
- 
--	KVSCF(tqunicode)
-+	KVSCF(unicode)
- 	{
- 		TQString sz;
- 		KVSCF_PARAMETERS_BEGIN
-@@ -871,10 +871,10 @@ namespace KviKvsCoreFunctions
- 		{
- 			KviKvsArray * a = new KviKvsArray();
- 			for(kvs_int_t i=0;i<sz.length();i++)
--				a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].tqunicode())));
-+				a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].unicode())));
- 			KVSCF_pRetBuffer->setArray(a);
- 		} else {
--			KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].tqunicode()));
-+			KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].unicode()));
- 		}
- 		return true;
- 	}
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-index 0a4aa54..4f11db0 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-@@ -427,7 +427,7 @@ namespace KviKvsCoreSimpleCommands
- 
- 	//	TQChar o = tbOp.length() > 0 ? tbOp[0] : TQChar('x');
- 
--		switch(o.tqunicode())
-+		switch(o.unicode())
- 		{
- 			case 't':
- 				KviTalToolTip::remove(pButton);
-@@ -853,7 +853,7 @@ namespace KviKvsCoreSimpleCommands
- 			{
- 				TQString szWnd;
- 				v->asString(szWnd);
--	//#warning "FIXME: the window database is not tqunicode! (we even could keep integer window id's at this point!)"
-+	//#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)"
- 				pWnd = g_pApp->findWindow(szWnd.utf8().data());
- 				if(!pWnd)
- 				{
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-index acf8eec..85c6c5c 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-@@ -673,7 +673,7 @@ namespace KviKvsCoreSimpleCommands
- 			to load catalogues that reside in different directories.[br]
- 			[b]NOTE[/b][br]
- 			This feature is currently work in progress: the scripting engine
--			is not yet fully tqunicode and thus some more exotic translations may still suffer...
-+			is not yet fully unicode and thus some more exotic translations may still suffer...
- 		@seealso:
- 			[fnc]$tr[/fnc], [cmd]trunload[/cmd]
- 	*/
-diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
-index fc483f5..074753e 100644
---- a/src/kvirc/kvs/kvi_kvs_parser.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
-@@ -117,9 +117,9 @@ void KviKvsParser::report(bool bError,const TQChar * pLocation,const TQString &s
- 
- void KviKvsParser::errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName)
- {
--	if(pLocation->tqunicode())
--		error(pLocation,__tr2qs("Found character '%q' (tqunicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"),
--			pLocation,pLocation->tqunicode(),cExpected,szCommandName);
-+	if(pLocation->unicode())
-+		error(pLocation,__tr2qs("Found character '%q' (unicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"),
-+			pLocation,pLocation->unicode(),cExpected,szCommandName);
- 	else
- 		error(pLocation,__tr2qs("Found end of input where character '%c' was expected: see \"/help %s\" for the command syntax"),
- 			cExpected,szCommandName);
-@@ -1349,7 +1349,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
- 		so the callback code is empty, but if you continue reading we will soon fill it.
- 		[/p]
- 
--		[big]A typical addon tqlayout[/big]
-+		[big]A typical addon layout[/big]
- 		[p]
- 		As stated above, the addons are usually shipped in a compressed archive.
- 		Once uncompressed, the archive will expand into a small directory tree
-@@ -1400,7 +1400,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
- 		[/p]
- 		[p]
- 		The entries in [b]bold[/b] are directories while the other are files.
--		Please note that this is a general tqlayout for a huge and rather complex
-+		Please note that this is a general layout for a huge and rather complex
- 		addon: you might not need all of these directories. Remember: the minimal
- 		addon has only an install.kvs file. Anyway, a really cool addon
- 		will probably have all of them and maybe some more.
-@@ -1496,7 +1496,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
- 		[p]
- 		It is a good idea to start on the KVIrc web site. There are surely
- 		several addons to look at. Pick one that seems simple and analyze its
--		tqlayout and code (wow... the free software!). It will be easier to do than it was to explain it :D
-+		layout and code (wow... the free software!). It will be easier to do than it was to explain it :D
- 		[/p]
- 		[p]
- 		Have fun! :)
-@@ -2724,7 +2724,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction()
- 				return parseCommand();
- 			} else {
- 				// what the heck is this ?
--				error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+				error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 				return 0;
- 			}
- 		break;
-@@ -2839,7 +2839,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
- 	
- 				if(KVSP_curCharUnicode == 0)
- 				{
--					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 				} else {
- 					error(KVSP_curCharPointer,__tr2qs("Unexpected end of script after a switch dash"));
- 				}
-@@ -2880,12 +2880,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
- 			if(bLong)
- 				sw->addLong(TQString(pSw,pSwEnd - pSw),p);
- 			else
--				sw->addShort(pSw->lower().tqunicode(),p);
-+				sw->addShort(pSw->lower().unicode(),p);
- 		} else {
- 			if(bLong)
- 				sw->addLong(TQString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
- 			else
--				sw->addShort(pSw->lower().tqunicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
-+				sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
- 		}
- 	}
- 
-@@ -3300,7 +3300,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex()
- 							error(KVSP_curCharPointer,__tr2qs("Unexpected end of line in array index (missing ']' character or unescaped newline)"));
- 						break;
- 						default:
--							error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+							error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 						break;
- 					}
- 					return 0;
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
-index 094fc30..865bf18 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
-@@ -139,7 +139,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
- 		// perl.begin has a *really* half special parsing routine
- 		if(iIdentifierLen == 4)
- 		{
--			if(pIdentifier->lower().tqunicode() == 'p')
-+			if(pIdentifier->lower().unicode() == 'p')
- 			{
- 				if(KviTQString::equalCI(szIdentifier,"perl"))
- 				{
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
-index 18fbbbe..ea15840 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
-@@ -85,7 +85,7 @@ KviKvsTreeNode * KviKvsParser::parseComment()
- 				}
- 				break;
- 				default:
--					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 					return 0;
- 				break;
- 			}
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
-index a2d6516..b556614 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
-@@ -50,7 +50,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
- 	if(!KVSP_curCharIsFunctionStart)
- 	{
- 		if(KVSP_curCharUnicode == 0)warning(KVSP_curCharPointer,__tr2qs("Unexpected end of script after '$' function call prefix"));
--		else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		error(KVSP_curCharPointer,__tr2qs("Syntax error after '$' function call prefix. If you want to use a plain '$' in the code you need to escape it"));
- 		return 0;
- 	}
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
-index ee91df4..44ce71d 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
-@@ -420,7 +420,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
- 						pDataList->append(new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(iVal)));
- 					} else {
- 						// bOk is false
--						if(pBegin->tqunicode() == '0')
-+						if(pBegin->unicode() == '0')
- 						{
- 							if(tmp.length() > 2)
- 							{
-@@ -448,7 +448,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina
- 						}
- 					}
- 				} else {
--					error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode);
- 					delete pDataList;
- 					return 0;
- 				}
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
-index 3733f55..bcca75d 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
-@@ -828,7 +828,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
- 	
- 	if(KVSP_curCharUnicode != '/')
- 	{
--		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -846,7 +846,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
- 
- 	if(KVSP_curCharUnicode != '/')
- 	{
--		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		delete pFirst;
- 		return 0;
- 	}
-@@ -869,7 +869,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
- 
- 	if(KVSP_curCharUnicode != '/')
- 	{
--		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		delete pFirst;
- 		return 0;
- 	}
-@@ -1173,10 +1173,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation()
- 		// must be followed by the end of a command
- 		if(r->isFunctionCall())
- 		{
--			error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+			error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		} else {
- 			warning(pBegin,__tr2qs("Unexpected (and senseless) read-only data evaluation"));
--			warning(pBegin,__tr2qs("Unexpected character '%q' (tqunicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+			warning(pBegin,__tr2qs("Unexpected character '%q' (unicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 			error(KVSP_curCharPointer,__tr2qs("Syntax error: confused by earlier errors: bailing out"));
- 		}
- 		delete r;
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_macros.h b/src/kvirc/kvs/kvi_kvs_parser_macros.h
-index e727e4a..8de1f47 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_macros.h
-+++ b/src/kvirc/kvs/kvi_kvs_parser_macros.h
-@@ -29,15 +29,15 @@
- #define KVSP_backChar m_ptr--
- #define KVSP_backNChars(n) m_ptr -= n
- 
--#define KVSP_curCharUnicode (m_ptr->tqunicode())
-+#define KVSP_curCharUnicode (m_ptr->unicode())
- #define KVSP_curCharPointer m_ptr
- 
- #define KVSP_curCharIsLetter (m_ptr->isLetter())
- #define KVSP_curCharIsNumber (m_ptr->isNumber())
- #define KVSP_curCharIsLetterOrNumber (m_ptr->isLetterOrNumber())
--#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->tqunicode() == '(') || (m_ptr->tqunicode() == '{') || (m_ptr->tqunicode() == '$'))
--#define KVSP_curCharIsEndOfCommand ((m_ptr->tqunicode() == ';') || (m_ptr->tqunicode() == 0) || (m_ptr->tqunicode() == '\n') || (m_ptr->tqunicode() == '\r'))
--#define KVSP_curCharIsEndOfBuffer (m_ptr->tqunicode() == 0)
-+#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->unicode() == '(') || (m_ptr->unicode() == '{') || (m_ptr->unicode() == '$'))
-+#define KVSP_curCharIsEndOfCommand ((m_ptr->unicode() == ';') || (m_ptr->unicode() == 0) || (m_ptr->unicode() == '\n') || (m_ptr->unicode() == '\r'))
-+#define KVSP_curCharIsEndOfBuffer (m_ptr->unicode() == 0)
- 
- #define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
-index 95eca6a..6d6ab96 100644
---- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
-@@ -207,7 +207,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
- 	if(!KVSP_curCharIsEndOfCommand)
- 	{
- 		warning(KVSP_curCharPointer,__tr2qs("The 'unset' command needs a variable list"));
--		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -277,7 +277,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
- 	if(!KVSP_curCharIsEndOfCommand)
- 	{
- 		warning(KVSP_curCharPointer,__tr2qs("The 'global' command needs a variable list"));
--		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -376,7 +376,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
- 
- 	if(KVSP_curCharUnicode != '(')
- 	{
--		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -443,7 +443,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
- 
- 		if(KVSP_curCharPointer == pLabelBegin)
- 		{
--			error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+			error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 			delete pClass;
- 			return 0;
- 		}
-@@ -471,7 +471,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
- 		
- 				if(KVSP_curCharPointer == pLabelBegin)
- 				{
--					error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 					delete pClass;
- 					return 0;
- 				}
-@@ -498,7 +498,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
- 		
- 				if(KVSP_curCharPointer == pLabelBegin)
- 				{
--					error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 					delete pClass;
- 					return 0;
- 				}
-@@ -628,7 +628,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
- 	if(KVSP_curCharUnicode != '(')
- 	{
- 		warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in parenthesis"));
--		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -740,7 +740,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
- 				if(KVSP_curCharIsEndOfBuffer)
- 					error(KVSP_curCharPointer,__tr2qs("Unexpected end of command after the 'do' command block: expected 'while' keyword"));
- 				else
--					error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+					error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 				if(i)delete i;
- 				return 0;
- 			}
-@@ -1089,7 +1089,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
- 	
- 	if(KVSP_curCharUnicode != ')')
- 	{
--		error(KVSP_curCharPointer,__tr2qs("Found char %q (tqunicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found char %q (unicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		if(i1)delete i1;
- 		if(e)delete e;
- 		if(i2)delete i2;
-@@ -1193,7 +1193,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
- 	if((KVSP_curCharUnicode != '%') && (KVSP_curCharUnicode != '$') && (KVSP_curCharUnicode != '@'))
- 	{
- 		warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command expects a writeable iteration variable as first parameter"));
--		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+		error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 		return 0;
- 	}
- 
-@@ -1419,7 +1419,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
- 
- 		if(KVSP_curCharPointer == pLabelBegin)
- 		{
--			error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+			error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 			delete pSwitch;
- 			return 0;
- 		}
-@@ -1566,7 +1566,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
- 
- 		if(KVSP_curCharPointer == pLabelBegin)
- 		{
--			error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
-+			error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
- 			delete pPopup;
- 			return 0;
- 		}
-diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-index 53ac882..c80794e 100644
---- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
-@@ -73,7 +73,7 @@ bool KviKvsProcessAsyncOperation::start()
- 		if(szShell.isEmpty())
- 		{
- #ifdef COMPILE_ON_WINDOWS
--			// [01:26:00] <PragmaOff> btw, what is qt_wintqunicode ?
-+			// [01:26:00] <PragmaOff> btw, what is qt_winunicode ?
- 			// [01:26:12] <kode54> TQt export specific to win32
- 			// [01:26:27] <kode54> bool which indicates whether system is Unicode (NT) or not
- 			// [01:26:58] <kode54> not sure if that's documented, but it is a public export
-diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp
-index aa40ef3..7618e29 100644
---- a/src/kvirc/kvs/kvi_kvs_report.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_report.cpp
-@@ -60,7 +60,7 @@ void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,in
- 	const TQChar * pPrevLine = 0;
- 	const TQChar * pLineBegin = pBegin;
- 
--	unsigned short us = pBegin->tqunicode();
-+	unsigned short us = pBegin->unicode();
- 
- 	while(us && (pBegin < pPoint))
- 	{
-@@ -73,7 +73,7 @@ void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,in
- 		} else {
- 			pBegin++;
- 		}
--		us = pBegin->tqunicode();
-+		us = pBegin->unicode();
- 	}
- 	
- 	iCol = (pBegin - pLineBegin) + 1;
-@@ -92,7 +92,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
- 	const TQChar * pPrevLine = 0;
- 	const TQChar * pLineBegin = pBegin;
- 
--	unsigned short us = pBegin->tqunicode();
-+	unsigned short us = pBegin->unicode();
- 
- 	while(us && (pBegin < pPoint))
- 	{
-@@ -105,7 +105,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
- 		} else {
- 			pBegin++;
- 		}
--		us = pBegin->tqunicode();
-+		us = pBegin->unicode();
- 	}
- 	
- 	iCol = (pBegin - pLineBegin) + 1;
-@@ -131,11 +131,11 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
- 	// current line
- 	pBegin = pLineBegin;
- 
--	us = pBegin->tqunicode();
-+	us = pBegin->unicode();
- 	while(us && (us != '\n'))
- 	{
- 		pBegin++;
--		us = pBegin->tqunicode();
-+		us = pBegin->unicode();
- 	}
- 	if(us)pBegin++;
- 
-@@ -152,11 +152,11 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
- 		// next line
- 		pLineBegin = pBegin;
- 	
--		us = pBegin->tqunicode();
-+		us = pBegin->unicode();
- 		while(us && (us != '\n'))
- 		{
- 			pBegin++;
--			us = pBegin->tqunicode();
-+			us = pBegin->unicode();
- 		}
- 		if(us)pBegin++;
- 	
-diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h
-index b82d93f..fc31461 100644
---- a/src/kvirc/kvs/kvi_kvs_switchlist.h
-+++ b/src/kvirc/kvs/kvi_kvs_switchlist.h
-@@ -48,7 +48,7 @@ public:
- 
- 	KviKvsVariant * find(const TQChar &c)
- 	{
--		return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.tqunicode()) : 0;
-+		return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.unicode()) : 0;
- 	};
- 
- 	KviKvsVariant * find(unsigned short uShortKey)
-diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
-index 26b05b9..bdb1310 100644
---- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
-@@ -1467,18 +1467,18 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c
- 			TQString szReplaced;
- 			const TQChar * p2 = KviTQString::nullTerminatedArray(szR);
- 			const TQChar * begin = p2;
--			while(p2->tqunicode())
-+			while(p2->unicode())
- 			{
--				if(p2->tqunicode() == '\\')
-+				if(p2->unicode() == '\\')
- 				{
- 					p2++;
--					if(p2->tqunicode() >= '0' && p2->tqunicode() <= '9')
-+					if(p2->unicode() >= '0' && p2->unicode() <= '9')
- 					{
- 						szReplaced.append(TQString(begin,(p2 - begin) - 1));
--						szReplaced.append(re.cap(p2->tqunicode() - '0'));
-+						szReplaced.append(re.cap(p2->unicode() - '0'));
- 						p2++;
- 						begin = p2;
--					} else if(p2->tqunicode())p2++;
-+					} else if(p2->unicode())p2++;
- 				} else p2++;
- 			}
- 			if(begin != p2)szReplaced.append(TQString(begin,p2 - begin));
-diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp
-index c4e457f..b2da370 100644
---- a/src/kvirc/kvs/kvi_kvs_variant.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_variant.cpp
-@@ -1010,7 +1010,7 @@ KviKvsVariant* KviKvsVariant::unserializeNull(const TQChar** aux)
- KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux)
- {
- 	TQString data;
--	if((*aux)->tqunicode() == '-')
-+	if((*aux)->unicode() == '-')
- 	{
- 		data.append('-');
- 		(*aux)++;
-@@ -1024,7 +1024,7 @@ KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux)
- 		data.append(**aux);
- 		(*aux)++;
- 	}
--	if((*aux)->tqunicode()=='.')
-+	if((*aux)->unicode()=='.')
- 	{
- 		return unserializeReal(aux,data);
- 	}
-@@ -1042,15 +1042,15 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const TQChar** aux,TQString& data)
- 		(*aux)++;
- 	}
- 
--	if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E')
-+	if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E')
- 	{
- 		(*aux)++;
--		if((*aux)->tqunicode() == '-')
-+		if((*aux)->unicode() == '-')
- 		{
- 			exponent.append('-');
- 			(*aux)++;
- 		} else {
--			if((*aux)->tqunicode() == '+')
-+			if((*aux)->unicode() == '+')
- 			{
- 				exponent.append('+');
- 				(*aux)++;
-@@ -1079,15 +1079,15 @@ KviKvsVariant* KviKvsVariant::unserializeInteger(const TQChar** aux,TQString& da
- 
- 	TQString exponent;
- 
--	if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E')
-+	if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E')
- 	{
- 		(*aux)++;
--		if((*aux)->tqunicode() == '-')
-+		if((*aux)->unicode() == '-')
- 		{
- 			exponent.append('-');
- 			(*aux)++;
- 		} else {
--			if((*aux)->tqunicode() == '+')
-+			if((*aux)->unicode() == '+')
- 			{
- 				exponent.append('+');
- 				(*aux)++;
-@@ -1122,9 +1122,9 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data)
- 	TQString hex; //temp var
- 	//skip leading "
- 	(*aux)++;
--	while((*aux)->tqunicode())
-+	while((*aux)->unicode())
- 	{
--		switch((*aux)->tqunicode())
-+		switch((*aux)->unicode())
- 		{
- 		case '"':
- 			//EOF
-@@ -1134,7 +1134,7 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data)
- 		case '\\':
- 			//Special
- 			(*aux)++;
--			switch((*aux)->tqunicode())
-+			switch((*aux)->unicode())
- 			{
- 			case 't':
- 				data.append('\t');
-@@ -1159,11 +1159,11 @@ void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data)
- 				//4 hexadecmical digits pending...
- 				hex="";
- 				(*aux)++;
--				for(int k=0;k<4 && (*aux)->tqunicode(); k++)
-+				for(int k=0;k<4 && (*aux)->unicode(); k++)
- 				{
- 					if((*aux)->isDigit() ||
--						((*aux)->tqunicode() >='A' && (*aux)->tqunicode() <='F')|| //ABCDEF
--						((*aux)->tqunicode() >='a' && (*aux)->tqunicode() <='f')) //abcdef
-+						((*aux)->unicode() >='A' && (*aux)->unicode() <='F')|| //ABCDEF
-+						((*aux)->unicode() >='a' && (*aux)->unicode() <='f')) //abcdef
- 					{
- 						hex.append(**aux);
- 						(*aux)++;
-@@ -1203,7 +1203,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux)
- 		while((*aux)->isSpace())
- 				(*aux)++;
- 		//waiting for starting of string
--		if((*aux)->tqunicode()!='\"')
-+		if((*aux)->unicode()!='\"')
- 		{
- 			//strange characters
- 			delete pHash;
-@@ -1221,7 +1221,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux)
- 		while((*aux)->isSpace())
- 				(*aux)++;
- 		//waiting for name-value delimeter
--		if((*aux)->tqunicode()!=':')
-+		if((*aux)->unicode()!=':')
- 		{
- 			//strange characters
- 			delete pHash;
-@@ -1238,7 +1238,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux)
- 			i++;
- 			while((*aux)->isSpace())
- 				(*aux)++;
--			switch((*aux)->tqunicode())
-+			switch((*aux)->unicode())
- 			{
- 			case ',':
- 				//goto next
-@@ -1278,7 +1278,7 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const TQChar** aux)
- 			i++;
- 			while((*aux)->isSpace())
- 				(*aux)++;
--			switch((*aux)->tqunicode())
-+			switch((*aux)->unicode())
- 			{
- 			case ',':
- 				//goto next
-@@ -1310,7 +1310,7 @@ KviKvsVariant* KviKvsVariant::unserialize(const TQChar** aux)
- 	while((*aux)->isSpace())
- 		(*aux)++;
- 
--	switch((*aux)->tqunicode())
-+	switch((*aux)->unicode())
- 	{
- 	case 't':
- 		//true
-@@ -1373,7 +1373,7 @@ KviKvsVariant* KviKvsVariant::unserialize(const TQString& data)
- 	
- 	pResult = unserialize(&aux);
- 
--	if(aux->tqunicode())
-+	if(aux->unicode())
- 	{
- 		//strange extra characters?
- 		if(pResult) delete pResult;
-diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-index b7150e8..3a28909 100644
---- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
-+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-@@ -1808,7 +1808,7 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg)
- 		if(pos>=0)
- 		{
- 			TQChar c = decoded[pos+7];
--			switch(c.tqunicode())
-+			switch(c.unicode())
- 			{
- 				case 'F':
- 				case 'f':
-diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
-index 18ab099..d488c8f 100644
---- a/src/kvirc/sparser/kvi_sp_literal.cpp
-+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
-@@ -186,13 +186,13 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
- 	// nick!user@host JOIN :#channel\x07[o|v]
- 	const TQChar * pExt = KviTQString::nullTerminatedArray(channel);
- 	char  chExtMode = 0;
--	while(pExt->tqunicode() && (pExt->tqunicode() != 0x07))pExt++;
--	if(pExt->tqunicode())
-+	while(pExt->unicode() && (pExt->unicode() != 0x07))pExt++;
-+	if(pExt->unicode())
- 	{
- 		++pExt;
--		if(pExt->tqunicode())
-+		if(pExt->unicode())
- 		{
--			chExtMode = (char)pExt->tqunicode();
-+			chExtMode = (char)pExt->unicode();
- 			channel.remove(channel.length() - 2,2); // assuming that we're at the end (we should be)
- 		} // else { senseless 0x07 in channel name ?
- 	}
-@@ -993,7 +993,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
- 		if(!chan)
- 		{
- 			// check if the channel has some leading mode prefixes 
--			while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode()))
-+			while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode()))
- 			{
- 				szPrefixes += szTarget[0];
- 				szTarget.remove(0,1);
-@@ -1328,7 +1328,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
- 	if(!chan)
- 	{
- 		// check if the channel has some leading mode prefixes 
--		while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode()))
-+		while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode()))
- 		{
- 			szPrefixes += szTarget[0];
- 			szTarget.remove(0,1);
-diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
-index c22b36b..03ab82e 100644
---- a/src/kvirc/ui/kvi_channel.cpp
-+++ b/src/kvirc/ui/kvi_channel.cpp
-@@ -112,7 +112,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
- 
- 	// Register ourselves
- 	connection()->registerChannel(this);
--	// And create the widgets tqlayout
-+	// And create the widgets layout
- 	// Button box
- 	m_pButtonBox = new KviTalHBox(this);
- 	
-@@ -287,7 +287,7 @@ void KviChannel::applyOptions()
- 
- 	m_pModeWidget->applyOptions();
- 
--	// this applies options for IrcView and Input and forces the window to retqlayout
-+	// this applies options for IrcView and Input and forces the window to relayout
- 	KviWindow::applyOptions();
- }
- 
-diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
-index a4eba90..e9e560b 100644
---- a/src/kvirc/ui/kvi_console.cpp
-+++ b/src/kvirc/ui/kvi_console.cpp
-@@ -634,7 +634,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
- 	TQChar* aux=(TQChar*)(szStripMsg.ucs2());
- 	if(aux)
- 	{
--		while(aux->tqunicode())
-+		while(aux->unicode())
- 		{
- 			if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 )
- 				szSource.append(' ');
-@@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
- 	{
- 		int sum = 0;
- 		int i = nick.length();
--		const TQChar * aux = nick.tqunicode();
-+		const TQChar * aux = nick.unicode();
- 		// FIXME: Shouldn't this be case insensitive ?
- 		while(i > 0)
- 		{
--			sum += aux->tqunicode();
-+			sum += aux->unicode();
- 			aux++;
- 			i--;
- 		}
-@@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
- 			{
- 				int sum = 0;
- 				int i = nick.length();
--				const TQChar * aux = nick.tqunicode();
-+				const TQChar * aux = nick.unicode();
- 				// FIXME: Shouldn't this be case insensitive ?
- 				while(i > 0)
- 				{
--					sum += aux->tqunicode();
-+					sum += aux->unicode();
- 					aux++;
- 					i--;
- 				}
-diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
-index e974b94..774ba53 100644
---- a/src/kvirc/ui/kvi_customtoolbar.cpp
-+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
-@@ -70,9 +70,9 @@ TQSize KviCustomToolBarSeparator::sizeHint() const
- #ifdef COMPILE_USE_QT4
- 	TQStyleOption opt;
- 	opt.initFrom(this);
--	int extent = tqstyle()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
-+	int extent = style()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
- #else
--	int extent = tqstyle().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
-+	int extent = style().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
- #endif
- 	if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0);
- 	else return TQSize(0,extent);
-@@ -84,11 +84,11 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *)
- #ifdef COMPILE_USE_QT4
- 	TQStyleOption opt;
- 	opt.initFrom(this);
--	tqstyle()->drawPrimitive(TQStyle::PE_Q3DockWindowSeparator,&opt,&p,this);
-+	style()->drawPrimitive(TQStyle::PE_Q3DockWindowSeparator,&opt,&p,this);
- #else
- 	TQStyle::SFlags flags = TQStyle::Style_Default;
- 	if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal;
--	tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
-+	style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
- #endif
- }
- 
-@@ -334,7 +334,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex
- 	// treating exclude as if it was going to be removed
- 	// find also the exclude index if needed
- #ifdef COMPILE_USE_QT4
--	TQLayout * l = tqlayout();
-+	TQLayout * l = layout();
- #else
- 	TQBoxLayout * l = boxLayout();
- #endif
-@@ -453,7 +453,7 @@ int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * ex
- #ifdef COMPILE_USE_QT4
- TQWidget * KviCustomToolBar::widgetAt(int index)
- {
--	TQLayout * l = tqlayout();
-+	TQLayout * l = layout();
- 	if(!l)
- 		return NULL;
- 	TQLayoutItem * it = l->itemAt(index);
-diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
-index 49084c3..0128f29 100644
---- a/src/kvirc/ui/kvi_frame.cpp
-+++ b/src/kvirc/ui/kvi_frame.cpp
-@@ -173,7 +173,7 @@ KviFrame::KviFrame()
- 
- 	installAccelerators(this);
- 
--	tqlayout()->setResizeMode(TQLayout::FreeResize);
-+	layout()->setResizeMode(TQLayout::FreeResize);
- }
- 
- KviFrame::~KviFrame()
-diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
-index 5d2e1c6..94afb59 100644
---- a/src/kvirc/ui/kvi_input.cpp
-+++ b/src/kvirc/ui/kvi_input.cpp
-@@ -317,7 +317,7 @@ TQSize KviInputEditor::sizeHint() const
- 				     TQSize( w + m, h + m ).
- 				     expandedTo(TQApplication::globalStrut()),this));
- #else
--	return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this,
-+	return (style().tqsizeFromContents(TQStyle::CT_LineEdit, this,
- 				     TQSize( w + m, h + m ).
- 				     expandedTo(TQApplication::globalStrut())));
- #endif
-@@ -454,7 +454,7 @@ void KviInputEditor::drawContents(TQPainter *p)
- 		{
- 			pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl));
- 
--			TQString s = getSubstituteChar(m_szTextBuffer[charIdx].tqunicode());
-+			TQString s = getSubstituteChar(m_szTextBuffer[charIdx].unicode());
- 
- 			// the block width is 4 pixels more than the actual character
- 
-@@ -523,9 +523,9 @@ void KviInputEditor::drawContents(TQPainter *p)
- 	{
- 		TQChar c = m_szTextBuffer.at(m_iBlockLen);
- #ifdef COMPILE_USE_QT4
--		m_iLastCursorXPosition+= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);
-+		m_iLastCursorXPosition+= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);
- #else
--		m_iLastCursorXPosition+= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c);
-+		m_iLastCursorXPosition+= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c);
- #endif
- 		m_iBlockLen++;
- 	}
-@@ -626,7 +626,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int
- 
- 	TQChar c = m_szTextBuffer[idx];
- 
--	if((c.tqunicode() > 32) ||
-+	if((c.unicode() > 32) ||
- 		((c != TQChar(KVI_TEXT_COLOR)) &&
- 		(c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) &&
- 		(c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) &&
-@@ -637,7 +637,7 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int
- 		while((idx < ((int)(m_szTextBuffer.length()))) && (curXPos < maxXPos))
- 		{
- 			c = m_szTextBuffer[idx];
--			if((c.tqunicode() > 32) ||
-+			if((c.unicode() > 32) ||
- 				((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) &&
- 				(c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) &&
- 				(c != TQChar(KVI_TEXT_REVERSE)) && (c != TQChar(KVI_TEXT_CRYPTESCAPE)) &&
-@@ -645,9 +645,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int
- 			{
- 				m_iBlockLen++;
- #ifdef COMPILE_USE_QT4
--				int xxx = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);;
-+				int xxx = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);;
- #else
--				int xxx = (c.tqunicode() < 256 ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c));
-+				int xxx = (c.unicode() < 256 ? g_iInputFontCharWidth[c.unicode()] : fm.width(c));
- #endif
- 				m_iBlockWidth +=xxx;
- 				curXPos       +=xxx;
-@@ -658,9 +658,9 @@ void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int
- 	} else {
- 		m_bControlBlock = true;
- 		m_iBlockLen = 1;
--		m_iBlockWidth = g_iInputFontCharWidth[c.tqunicode()];
-+		m_iBlockWidth = g_iInputFontCharWidth[c.unicode()];
- 		//Control code
--		switch(c.tqunicode())
-+		switch(c.unicode())
- 		{
- 			case KVI_TEXT_BOLD:
- 				m_bCurBold = ! m_bCurBold;
-@@ -716,7 +716,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar()
- 	register int idx = 0;
- 	while(idx < m_iFirstVisibleChar)
- 	{
--		unsigned short c = m_szTextBuffer[idx].tqunicode();
-+		unsigned short c = m_szTextBuffer[idx].unicode();
- 		if(c < 32)
- 		{
- 			switch(c)
-@@ -789,7 +789,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e)
- 		
- 		TQString szClip;
- 
--		TQClipboard * c = TQApplication::tqclipboard();
-+		TQClipboard * c = TQApplication::clipboard();
- 		if(c)
- 		{
- 			szClip = c->text(TQClipboard::Clipboard);
-@@ -918,7 +918,7 @@ bool KviInputEditor::hasSelection()
- void KviInputEditor::copyToClipboard()
- {
- 	if(!hasSelection())return;
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1);
- 	c->setText(szTxt,TQClipboard::Clipboard);
-@@ -928,7 +928,7 @@ void KviInputEditor::copyToClipboard()
- void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard)
- {
- 	if(!hasSelection())return;
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1);
- 	if(c->supportsSelection())
-@@ -969,7 +969,7 @@ void KviInputEditor::removeSelected()
- void KviInputEditor::cut()
- {
- 	if(!hasSelection())return;
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),TQClipboard::Clipboard);
- 	m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1);
-@@ -1042,7 +1042,7 @@ int KviInputEditor::replaceSegment(int start, int length, const TQString &text)
- 
- void KviInputEditor::pasteClipboardWithConfirmation()
- {
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	TQString szText = c->text(TQClipboard::Clipboard);
- 
-@@ -1057,7 +1057,7 @@ void KviInputEditor::pasteClipboardWithConfirmation()
- 
- void KviInputEditor::pasteSelectionWithConfirmation()
- {
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard);
- 
-@@ -1819,7 +1819,7 @@ void KviInputEditor::completion(bool bShift)
- 	bool bIsDir = false;
- 	bool bIsNick = false;
- 
--	unsigned short uc = word[0].tqunicode();
-+	unsigned short uc = word[0].unicode();
- 
- 	if(uc == '/')
- 	{
-@@ -1845,7 +1845,7 @@ void KviInputEditor::completion(bool bShift)
- 	{
- 		if(m_pKviWindow)
- 		{
--			if( (word.length()==1) && (m_pKviWindow->windowName()[0].tqunicode()==uc))
-+			if( (word.length()==1) && (m_pKviWindow->windowName()[0].unicode()==uc))
- 			{
- 				match=m_pKviWindow->windowName();
- 				match.append(" ");
-@@ -1911,8 +1911,8 @@ void KviInputEditor::completion(bool bShift)
- 				const TQChar * b2 = KviTQString::nullTerminatedArray(match) + wLen;
- 				const TQChar * c1 = b1;
- 				const TQChar * c2 = b2;
--				if(bIsDir)while(c1->tqunicode() && (c1->tqunicode() == c2->tqunicode()))c1++,c2++;
--				else while(c1->tqunicode() && (c1->lower().tqunicode() == c2->lower().tqunicode()))c1++,c2++;
-+				if(bIsDir)while(c1->unicode() && (c1->unicode() == c2->unicode()))c1++,c2++;
-+				else while(c1->unicode() && (c1->lower().unicode() == c2->lower().unicode()))c1++,c2++;
- 				int len = wLen + (c1 - b1);
- 				if(len < ((int)(match.length())))match.remove(len,match.length() - len);
- 				if(!all.isEmpty())all.append(", ");
-@@ -2084,17 +2084,17 @@ void KviInputEditor::moveRightFirstVisibleCharToShowCursor()
- 	TQChar c = m_szTextBuffer.at(m_iCursorPosition);
- 
- #ifdef COMPILE_USE_QT4
--	m_iLastCursorXPosition += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);;
-+	m_iLastCursorXPosition += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);;
- #else
--	m_iLastCursorXPosition += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c);
-+	m_iLastCursorXPosition += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c);
- #endif
- 	while(m_iLastCursorXPosition >= contentsRect().width()-2*KVI_INPUT_MARGIN)
- 	{
- 		c = m_szTextBuffer.at(m_iFirstVisibleChar);
- #ifdef COMPILE_USE_QT4
--		m_iLastCursorXPosition -= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);;
-+		m_iLastCursorXPosition -= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);;
- #else
--		m_iLastCursorXPosition -= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c);
-+		m_iLastCursorXPosition -= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c);
- #endif
- 		m_iFirstVisibleChar++;
- 	}
-@@ -2127,9 +2127,9 @@ int KviInputEditor::charIndexFromXPosition(int xPos)
- 	{
- 		TQChar c = m_szTextBuffer.at(curChar);
- #ifdef COMPILE_USE_QT4
--		int widthCh = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);;
-+		int widthCh = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);;
- #else
--		int widthCh = (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c);
-+		int widthCh = (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c);
- #endif
- 		if(xPos < (curXPos+(widthCh/2)))return curChar;
- 		else if(xPos < (curXPos+widthCh))return (curChar+1);
-@@ -2150,9 +2150,9 @@ int  KviInputEditor::xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bCo
- 	{
- 		TQChar c = m_szTextBuffer.at(curChar);
- #ifdef COMPILE_USE_QT4
--		curXPos += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);;
-+		curXPos += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);;
- #else
--		curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c);
-+		curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c);
- #endif
- 		curChar++;
- 	}
-@@ -2170,9 +2170,9 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords)
- 	{
- 		TQChar c = m_szTextBuffer.at(curChar);
- #ifdef COMPILE_USE_QT4
--		curXPos += c.tqunicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.tqunicode())) + 3 : g_pLastFontMetrics->width(c);
-+		curXPos += c.unicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.unicode())) + 3 : g_pLastFontMetrics->width(c);
- #else
--		curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : g_pLastFontMetrics->width(c);
-+		curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : g_pLastFontMetrics->width(c);
- #endif
- 		curChar++;
- 	}
-@@ -2336,8 +2336,8 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
- 
- #ifdef COMPILE_USE_QT4
- 	m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
--//	if(m_pButtonContainer->tqlayout())
--//		m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize);
-+//	if(m_pButtonContainer->layout())
-+//		m_pButtonContainer->layout()->setSizeConstraint(TQLayout::SetMinimumSize);
- #endif
- 
- 	m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton");
-diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
-index 9eb166c..1ddf275 100644
---- a/src/kvirc/ui/kvi_ircview.cpp
-+++ b/src/kvirc/ui/kvi_ircview.cpp
-@@ -243,12 +243,12 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t *
- 	kvi_wslen_t oldLen = qstrptr->length();
- 	qstrptr->setLength(oldLen + len);
- 	#ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR
--		_WSTRING_WMEMCPY(qstrptr->tqunicode() + oldLen,ptr,len);
-+		_WSTRING_WMEMCPY(qstrptr->unicode() + oldLen,ptr,len);
- 	#else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR
--		TQChar * c = (qstrptr->tqunicode() + oldLen);
-+		TQChar * c = (qstrptr->unicode() + oldLen);
- 		while(*ptr)
- 		{
--			c->tqunicode() = *ptr;
-+			c->unicode() = *ptr;
- 			ptr++;
- 			c++;
- 		}
-@@ -1964,8 +1964,8 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType,
- 		iTextIdx = iTimeStampLength;                     // the rest of the string will begin 11 chars later
- 
- 		// throw away const: we WANT to set the chars :D
--		register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.tqunicode();
--		register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.tqunicode();
-+		register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.unicode();
-+		register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.unicode();
- 		
- 		for(int i=0;i<iTimeStampLength;i++)
- 			*data_ptr_aux++  = *stamp_ptr_aux++;
-@@ -3449,7 +3449,7 @@ no_selection_paint:
- //
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- 
--#define IRCVIEW_WCHARWIDTH(__c) (((__c).tqunicode() < 0xff) ? m_iFontCharacterWidth[(__c).tqunicode()] : m_pFm->width(__c))
-+#define IRCVIEW_WCHARWIDTH(__c) (((__c).unicode() < 0xff) ? m_iFontCharacterWidth[(__c).unicode()] : m_pFm->width(__c))
- 
- void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
- {
-@@ -3476,12 +3476,12 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
- 
- 	int maxBlockLen = ptr->pChunks->iTextLen; // ptr->pChunks[0].iTextLen
- 
--	const TQChar * tqunicode = ptr->szText.tqunicode();
-+	const TQChar * unicode = ptr->szText.unicode();
- 
- 	for(;;)
- 	{
- 		//Calculate the block_width
--		register const TQChar * p = tqunicode + ptr->pBlocks[ptr->iBlockCount].block_start;
-+		register const TQChar * p = unicode + ptr->pBlocks[ptr->iBlockCount].block_start;
- 		int curBlockLen   = 0;
- 		int curBlockWidth = 0;
- 
-@@ -3546,7 +3546,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
- 					ptr->pBlocks[ptr->iBlockCount].block_width = 0;
- 					ptr->iBlockCount++;
- 					ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
--					ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode;
-+					ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode;
- 					ptr->pBlocks[ptr->iBlockCount].block_len   = 0;
- 					ptr->pBlocks[ptr->iBlockCount].block_width = 0;
- 					ptr->pBlocks[ptr->iBlockCount].pChunk  = &(ptr->pChunks[curAttrBlock]);
-@@ -3579,7 +3579,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
- 			maxBlockLen-=curBlockLen;
- 			ptr->iBlockCount++;
- 			ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock));
--			ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode;
-+			ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode;
- 			ptr->pBlocks[ptr->iBlockCount].block_len   = 0;
- 			ptr->pBlocks[ptr->iBlockCount].block_width = 0;
- 			ptr->pBlocks[ptr->iBlockCount].pChunk  = 0;
-@@ -3632,8 +3632,8 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i
- 	//
- 	// Yahoo!!!!
- 	//
--	const TQChar * tqunicode = line->szText.tqunicode();
--	register const TQChar * p = tqunicode + line->pBlocks[bufIndex].block_start;
-+	const TQChar * unicode = line->szText.unicode();
-+	register const TQChar * p = unicode + line->pBlocks[bufIndex].block_start;
- 
- 	int top = bottom-m_iFontLineSpacing;
- 	int right  = ((line->pBlocks[bufIndex].block_width >= 0) ? \
-@@ -4479,7 +4479,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
- 	pParams->append(szCmd);
- 	
- 
--	switch(linkCmd[0].tqunicode())
-+	switch(linkCmd[0].unicode())
- 	{
- 		case 'n':
- 		{
-@@ -4517,7 +4517,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
- 				if(((KviChannel *)m_pKviWindow)->isMeOp())
- 				{
- 					TQChar plmn = linkCmd[1];
--					if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-'))
-+					if((plmn.unicode() == '+') || (plmn.unicode() == '-'))
- 					{
- 						TQString target(m_pKviWindow->windowName());
- 						target.replace("\\","\\\\");
-@@ -4526,7 +4526,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
- 						target.replace("$","\\$");
- 						target.replace("%","\\%");
- 						TQChar flag = linkCmd[2];
--						switch(flag.tqunicode())
-+						switch(flag.unicode())
- 						{
- 							case 'o':
- 							case 'v':
-@@ -4669,7 +4669,7 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e)
- 	{
- 		if(!linkCmd.isEmpty())
- 		{
--			switch(linkCmd[0].tqunicode())
-+			switch(linkCmd[0].unicode())
- 			{
- 				case 'n':
- 					{
-@@ -4782,7 +4782,7 @@ void KviIrcView::mouseReleaseEvent(TQMouseEvent *)
- 	{
- 		killTimer(m_iSelectTimer);
- 		m_iSelectTimer = 0;
--		TQClipboard * c = TQApplication::tqclipboard();
-+		TQClipboard * c = TQApplication::clipboard();
- 		if(c)
- 		{
- 			// copy to both!
-@@ -4896,7 +4896,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
- 	
- 	TQString tip;
- 
--	switch(linkCmd[0].tqunicode())
-+	switch(linkCmd[0].unicode())
- 	{
- 		case 'u': // url link
- 		{
-@@ -4972,11 +4972,11 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
- 				if(((KviChannel *)m_pKviWindow)->isMeOp())
- 				{
- 					TQChar plmn = linkCmd[1];
--					if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-'))
-+					if((plmn.unicode() == '+') || (plmn.unicode() == '-'))
- 					{
- 						tip = __tr2qs("Double-click to set<br>");
- 						TQChar flag = linkCmd[2];
--						switch(flag.tqunicode())
-+						switch(flag.unicode())
- 						{
- 							case 'o':
- 							case 'v':
-diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h
-index 790976b..34c70c4 100644
---- a/src/kvirc/ui/kvi_ircviewprivate.h
-+++ b/src/kvirc/ui/kvi_ircviewprivate.h
-@@ -148,7 +148,7 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag
- #endif //!COMPILE_ON_WINDOWS
- 
- //=========================================================================================================
--// Screen tqlayout
-+// Screen layout
- //=========================================================================================================
- 
- //FIRST LINE (prev_line = 0) <---m_pFirstLine
-diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
-index 607f699..039bf28 100644
---- a/src/kvirc/ui/kvi_mdimanager.cpp
-+++ b/src/kvirc/ui/kvi_mdimanager.cpp
-@@ -591,7 +591,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
- 		// This is an obscure, undocumented and internal function in QT4 TQMenuBar
- 		// I won't be surprised if this disappears....
- 		b->setCornerWidget(m_pSdiControls,TQt::TopRightCorner);
--		// The show below SHOULD force a re-tqlayout of the menubar..
-+		// The show below SHOULD force a re-layout of the menubar..
- 		// but it doesn't work when the KviFrame is still hidden (at startup)
- 		// We handle this BUG in showEvent()
- 		m_pSdiControls->show();
-@@ -611,7 +611,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
- void KviMdiManager::relayoutMenuButtons()
- {
- #ifdef COMPILE_USE_QT4
--	// force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode())
-+	// force a re-layout of the menubar in TQt4 (see the note in enterSDIMode())
- 	// by resetting the corner widget
- 	if(m_pSdiControls)
- 	{
-@@ -662,7 +662,7 @@ void KviMdiManager::leaveSDIMode()
- 	}
- 	if(m_pSdiIconButton)
- 	{
--		m_pSdiIconButton->hide(); // this will force a TQMenuBar retqlayout
-+		m_pSdiIconButton->hide(); // this will force a TQMenuBar relayout
- 		delete m_pSdiIconButton;
- 		m_pSdiIconButton = 0;
- 	}
-@@ -1073,7 +1073,7 @@ void KviMdiManager::tileAnodine()
- 	int numVisible=getVisibleChildCount(); // count visible windows
- 	if(numVisible<1)return;
- 	int numCols=int(sqrt((double)numVisible)); // set columns to square root of visible count
--	// create an array to form grid tqlayout
-+	// create an array to form grid layout
- 	int *numRows=new int[numCols];
- 	int numCurCol=0;
- 	while(numCurCol<numCols)
-diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
-index 1c43223..ad5531e 100644
---- a/src/kvirc/ui/kvi_menubar.cpp
-+++ b/src/kvirc/ui/kvi_menubar.cpp
-@@ -97,7 +97,7 @@ void KviMenuBar::showEvent(TQShowEvent *e)
- {
- #ifdef COMPILE_USE_QT4
- 	debug("menubar show");
--	// force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode())
-+	// force a re-layout of the menubar in TQt4 (see the note in enterSDIMode())
- 	// by resetting the corner widget
- 	m_pFrm->mdiManager()->relayoutMenuButtons();
- #endif
-diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
-index 18ce661..5c385cf 100644
---- a/src/kvirc/ui/kvi_modeeditor.cpp
-+++ b/src/kvirc/ui/kvi_modeeditor.cpp
-@@ -121,11 +121,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
- 		TQChar ccc = szModes[0];
- 		szModes.remove(0,1);
- 
--		KviTQString::sprintf(tmp,"%c: %Q",ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc)));
-+		KviTQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc)));
- 		KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground);
- 		cb->setEnabled(isEnabled);
- 		m_pCheckBoxes->append(cb);
--		cb->setChecked(m_szMode.contains((char)ccc.tqunicode()));
-+		cb->setChecked(m_szMode.contains((char)ccc.unicode()));
- 		i++;
- 		g->addMultiCellWidget(cb,i,i,0,2);
- 	}
-@@ -193,11 +193,11 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
- 		TQChar ccc = szModes[0];
- 		szModes.remove(0,1);
- 
--		KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc)));
-+		KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc)));
- 		KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground);
- 		cb->setEnabled(isEnabled);
- 		m_pCheckBoxes->append(cb);
--		cb->setChecked(m_szMode.contains((char)ccc.tqunicode()));
-+		cb->setChecked(m_szMode.contains((char)ccc.unicode()));
- 		i++;
- 		g->addMultiCellWidget(cb,i,i,0,2);
- 	}
-@@ -317,9 +317,9 @@ void KviModeEditor::commit()
- 			TQChar ccc = sz[0];
- 			if(cb->isChecked())
- 			{
--				if(!m_szMode.contains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode());
-+				if(!m_szMode.contains((char)ccc.unicode()))szPlusModes.append((char)ccc.unicode());
- 			} else {
--				if(m_szMode.contains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode());
-+				if(m_szMode.contains((char)ccc.unicode()))szMinusModes.append((char)ccc.unicode());
- 			}
- 		}
- 	}
-diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
-index d0dae63..82c1a83 100644
---- a/src/kvirc/ui/kvi_optionswidget.cpp
-+++ b/src/kvirc/ui/kvi_optionswidget.cpp
-@@ -98,16 +98,16 @@ void KviOptionsWidget::createLayout(int rows,int cols)
- void KviOptionsWidget::createTabbedPage()
- {
- 	createLayout(1,1);
--	tqlayout()->setMargin(0);
--	tqlayout()->setSpacing(0);
-+	layout()->setMargin(0);
-+	layout()->setSpacing(0);
- 	m_pTabWidget = new TQTabWidget(this);
- 	addWidgetToLayout(m_pTabWidget,0,0,0,0);
- }
- 
- void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget)
- {
--	if(pWidget->tqlayout())
--		pWidget->tqlayout()->setMargin(10);
-+	if(pWidget->layout())
-+		pWidget->layout()->setMargin(10);
- 	m_pTabWidget->addTab(pWidget,iconSet,szText);
- 	m_pSelectorInterfaceList->append(pWidget);
- }
-@@ -115,8 +115,8 @@ void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &
- 
- void KviOptionsWidget::addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2)
- {
--	if((x1 == x2) && (y1 == y2))tqlayout()->addWidget(w,y1,x1);
--	else tqlayout()->addMultiCellWidget(w,y1,y2,x1,x2);
-+	if((x1 == x2) && (y1 == y2))layout()->addWidget(w,y1,x1);
-+	else layout()->addMultiCellWidget(w,y1,y2,x1,x2);
- }
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -622,7 +622,7 @@ void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2)
- {
- 	TQWidget * w = new TQWidget(this);
- 	addWidgetToLayout(w,x1,y1,x2,y2);
--	tqlayout()->setRowStretch(y1,1);
-+	layout()->setRowStretch(y1,1);
- }
- 
- TQLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled)
-diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h
-index 5e397f1..38023fa 100644
---- a/src/kvirc/ui/kvi_optionswidget.h
-+++ b/src/kvirc/ui/kvi_optionswidget.h
-@@ -54,7 +54,7 @@ private:
- public:
- 	void mergeResetFlag(int flag){ m_iResetFlags |= flag; };
- 	void createLayout(int rows,int columns);
--	TQGridLayout * tqlayout(){ return m_pLayout; };
-+	TQGridLayout * layout(){ return m_pLayout; };
- protected:
- 	void commitSelectors();
- 	void commitOptionsReset();
-diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
-index ef70a1d..0d133bd 100644
---- a/src/kvirc/ui/kvi_query.cpp
-+++ b/src/kvirc/ui/kvi_query.cpp
-@@ -547,7 +547,7 @@ void KviQuery::applyOptions()
- {
- 	m_pUserListView->applyOptions();
- 	updateLabelText();
--	// this applies options for IrcView and Input and forces the window to retqlayout
-+	// this applies options for IrcView and Input and forces the window to relayout
- 	KviWindow::applyOptions();
- }
- 
-diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
-index 1985217..481a521 100644
---- a/src/kvirc/ui/kvi_statusbar.cpp
-+++ b/src/kvirc/ui/kvi_statusbar.cpp
-@@ -249,7 +249,7 @@ void KviStatusBar::recalcMinimumHeight()
- 	{
- 		m_iLastMinimumHeight = s;
- 		setMinimumHeight(s);
--		TQLayout * l = tqlayout();
-+		TQLayout * l = layout();
- 		if(l)
- 			if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING))
- 				((TQBoxLayout *)l)->addStrut(s);
-diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
-index 63fd4e6..3267679 100644
---- a/src/kvirc/ui/kvi_topicw.cpp
-+++ b/src/kvirc/ui/kvi_topicw.cpp
-@@ -153,7 +153,7 @@ TQString convertToHtml(const TQString &text)
- 
- 	while(idx < text.length())
- 	{
--		unsigned short c = text[(int)idx].tqunicode();
-+		unsigned short c = text[(int)idx].unicode();
- 
- 		unsigned int start = idx;
- 
-@@ -168,7 +168,7 @@ TQString convertToHtml(const TQString &text)
- 		{
- 			idx++;
- 			if(idx >= text.length())break;
--			else c = text[(int)idx].tqunicode();
-+			else c = text[(int)idx].unicode();
- 		}
- 		
- 		int len = idx - start;
-@@ -251,7 +251,7 @@ TQString convertToHtml(const TQString &text)
- 				++idx;
- 
- 				unsigned int icoStart = idx;
--				while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++;
-+				while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++;
- 
- 				KviStr lookupString = text.mid(icoStart,idx - icoStart);
- 
-@@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG
- 
- 	while((idx < text.length()) && (curX < width))
- 	{
--		unsigned short c = text[(int)idx].tqunicode();
-+		unsigned short c = text[(int)idx].unicode();
- 
- 		unsigned int start = idx;
- 
-@@ -305,7 +305,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG
- 			)
- 		{
- 			idx++;
--			c = text[(int)idx].tqunicode();
-+			c = text[(int)idx].unicode();
- 		}
- 
- 		int len = idx - start;
-@@ -392,7 +392,7 @@ void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorG
- 				++idx;
- 
- 				unsigned int icoStart = idx;
--				while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++;
-+				while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++;
- 
- 				KviStr lookupString = text.mid(icoStart,idx - icoStart);
- 
-@@ -629,7 +629,7 @@ void KviTopicWidget::contextPopupAboutToShow()
- 
- void KviTopicWidget::copy()
- {
--	TQClipboard * c = TQApplication::tqclipboard();
-+	TQClipboard * c = TQApplication::clipboard();
- 	if(!c)return;
- 	if(c->supportsSelection())c->setText(m_szTopic,TQClipboard::Selection);
- 	c->setText(m_szTopic,TQClipboard::Clipboard);
-diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
-index d86b864..a66156c 100644
---- a/src/kvirc/ui/kvi_userlistview.cpp
-+++ b/src/kvirc/ui/kvi_userlistview.cpp
-@@ -838,7 +838,7 @@ int KviUserListView::getUserModeLevel(const TQString &szNick)
- char KviUserListView::getUserFlag(KviUserListEntry * e)
- {
- 	if(!e)return 0;
--	return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).tqunicode();
-+	return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode();
- }
- 
- void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer)
-diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
-index a4828bf..984fb70 100644
---- a/src/kvirc/ui/kvi_window.cpp
-+++ b/src/kvirc/ui/kvi_window.cpp
-@@ -1327,7 +1327,7 @@ void KviWindow::applyOptions()
- 	if(m_pIrcView)m_pIrcView->applyOptions();
- 	if(m_pInput)m_pInput->applyOptions();
- 
--	// trick: retqlayout
-+	// trick: relayout
- 	resize(width() - 1,height() - 1);
- 	resize(width() + 1,height() + 1);
- }
-diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
-index 6945cd1..9d704ec 100644
---- a/src/modules/editor/scripteditor.cpp
-+++ b/src/modules/editor/scripteditor.cpp
-@@ -107,11 +107,11 @@ void KviCompletionBox::updateContents(TQString buffer)
- 	if(pos>0)
- 	{
- 		szModule=buffer.left(pos);
--		if(szModule[0].tqunicode()=='$')
-+		if(szModule[0].unicode()=='$')
- 			szModule.remove(0,1);
- 	}
- 	
--	if(pCur->tqunicode() == '$')
-+	if(pCur->unicode() == '$')
- 	{
- 		buffer.remove(0,1);
- 		if(!buffer.isEmpty())
-@@ -369,13 +369,13 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
- 				TQString szPrev=text(para-1);
- 				if(!szPrev.isEmpty())
- 				{
--					if(szPrev.at(szPrev.length() - 1).tqunicode() == ' ')
-+					if(szPrev.at(szPrev.length() - 1).unicode() == ' ')
- 						szPrev.remove(szPrev.length() - 1,1);
- 					TQString szCur;
- 					const TQChar * pCur = (const TQChar *)szPrev.ucs2();
- 					if(pCur)
- 					{
--						while(pCur->tqunicode() && pCur->isSpace()) 
-+						while(pCur->unicode() && pCur->isSpace()) 
- 						{
- 							szCur.append(*pCur);
- 							pCur++;
-@@ -557,9 +557,9 @@ void KviScriptEditorWidget::slotComplete(const TQString &str)
- 	bool bIsFirstWordInLine;
- 	getWordBeforeCursor(buffer,index,&bIsFirstWordInLine);
- 	int len=buffer.length();
--//	if (buffer[1].tqunicode() == '$') len --;
-+//	if (buffer[1].unicode() == '$') len --;
- 	complete.remove(0,len-1);
--	if (buffer[1].tqunicode() == '$') complete.append("(");
-+	if (buffer[1].unicode() == '$') complete.append("(");
- 	else complete.append(" ");
- 	insert (complete);
- 	completelistbox->hide();
-@@ -595,19 +595,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 	const TQChar * pBegin;
- 
- 
--	while(c->tqunicode())
-+	while(c->unicode())
- 	{
- 		if(bInComment)
- 		{
- 			pBegin = c;
--			while(c->tqunicode() && (c->tqunicode() != '*'))c++;
--			if(!c->tqunicode())
-+			while(c->unicode() && (c->unicode() != '*'))c++;
-+			if(!c->unicode())
- 			{
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
- 				return IN_COMMENT;
- 			}
- 			c++;
--			if(c->tqunicode() == '/')
-+			if(c->unicode() == '/')
- 			{
- 				// end of the comment!
- 				c++;
-@@ -620,14 +620,14 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 
- 		if(c->isSpace())
- 		{
--			while(c->tqunicode() && c->isSpace())c++;
--			if(!c->tqunicode())continue;
-+			while(c->unicode() && c->isSpace())c++;
-+			if(!c->unicode())continue;
- 		}
- 
- 		pBegin = c;
- 
- 		// this does not break the bNewCommand flag
--		if((c->tqunicode() == '{') || (c->tqunicode() == '}'))
-+		if((c->unicode() == '{') || (c->unicode() == '}'))
- 		{
- 			c++;
- 			setFormat(pBegin - pBuf,1,g_fntNormal,g_clrBracket);
-@@ -639,12 +639,12 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 		{
- 			bNewCommand = false;
- 
--			if(c->tqunicode() == '#')
-+			if(c->unicode() == '#')
- 			{
- 				if(c > pBuf)
- 				{
- 					const TQChar * prev = c - 1;
--					if((prev->tqunicode() == ']') || (prev->tqunicode() == '}'))
-+					if((prev->unicode() == ']') || (prev->unicode() == '}'))
- 					{
- 						// array or hash count
- 						c++;
-@@ -653,19 +653,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 					}
- 				}
- 				// comment until the end of the line
--				while(c->tqunicode())c++;
-+				while(c->unicode())c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
- 				continue;
- 			}
--			if(c->tqunicode() == '/')
-+			if(c->unicode() == '/')
- 			{
- 				c++;
--				if(c->tqunicode() == '/')
-+				if(c->unicode() == '/')
- 				{
--					while(c->tqunicode())c++;
-+					while(c->unicode())c++;
- 					setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
- 					continue;
--				} else if(c->tqunicode() == '*')
-+				} else if(c->unicode() == '*')
- 				{
- 					c++;
- 					setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
-@@ -674,13 +674,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 				}
- 				c--;
- 			}
--			if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_')))
-+			if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_')))
- 			{
- 				c++;
--				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++;
-+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
- 				// special processing for callbacks and magic commands
--				if(pBegin->tqunicode() == 'e')
-+				if(pBegin->unicode() == 'e')
- 				{
- 					if(c - pBegin == 4)
- 					{
-@@ -691,7 +691,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 					}
- 				}
- 				else
--				if(pBegin->tqunicode() == 'f')
-+				if(pBegin->unicode() == 'f')
- 				{
- 					if(c - pBegin == 8)
- 					{
-@@ -702,7 +702,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 					}
- 				}
- 
--				if(pBegin->tqunicode() == 'i')
-+				if(pBegin->unicode() == 'i')
- 				{
- 					if(c - pBegin == 8)
- 					{
-@@ -717,28 +717,28 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 				continue;
- 			}
- 		}
--		if(c->tqunicode() == '$')
-+		if(c->unicode() == '$')
- 		{
- 			c++;
--			if(c->tqunicode() == '$')
-+			if(c->unicode() == '$')
- 			{
- 				c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
- 			} else {
--				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++;
-+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrFunction);
- 			}
- 			continue;
- 		}
- 		
--		if(c->tqunicode() == '-')
-+		if(c->unicode() == '-')
- 		{
- 			TQChar * pTmp =(TQChar *) c;
- 			c++;
--			if(c->tqunicode() == '-')	c++;
-+			if(c->unicode() == '-')	c++;
- 			if(c->isLetter())
- 			{
--				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_')))c++;
-+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_')))c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
- 				continue;
- 			} else {
-@@ -746,35 +746,35 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 			}
- 		}
- 
--		if(c->tqunicode() == '%')
-+		if(c->unicode() == '%')
- 		{
- 			c++;
--			if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_')))
-+			if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_')))
- 			{
--				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_')))c++;
-+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_')))c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrVariable);
- 				continue;
- 			}
- 			c--;
- 		}
- 
--		if(!c->tqunicode())continue;
-+		if(!c->unicode())continue;
- 
--		if(c->isLetterOrNumber() || c->tqunicode() == '_')
-+		if(c->isLetterOrNumber() || c->unicode() == '_')
- 		{
- 			c++;
--			while(c->tqunicode() && c->isLetterOrNumber() || (c->tqunicode() == '_'))c++;
-+			while(c->unicode() && c->isLetterOrNumber() || (c->unicode() == '_'))c++;
- 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText);
- 			continue;
- 		}
- 
--		if(c->tqunicode() == '\\')
-+		if(c->unicode() == '\\')
- 		{
- 			c++;
- 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation);
- 			// the next char is to be interpreted as normal text
- 			pBegin = c;
--			if(c->tqunicode() && (c->tqunicode() != '\n'))
-+			if(c->unicode() && (c->unicode() != '\n'))
- 			{
- 				c++;
- 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText);
-@@ -785,13 +785,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
- 			return IN_LINE;
- 		}
- 
--		if(c->tqunicode() == '"')
-+		if(c->unicode() == '"')
- 		{
- 			bInString = !bInString;
- 			c++;
- 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation);
- 			continue;
--		} else if(c->tqunicode() == ';')
-+		} else if(c->unicode() == ';')
- 		{
- 			if(!bInString)	bNewCommand = true; // the next will be a new command
- 		}
-@@ -1124,7 +1124,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
- 	emit initFind();
- 	setPaletteForegroundColor( TQColor( 0, 0, 0 ) );
- 	setPaletteBackgroundColor( TQColor( 236, 233, 216 ) );
--	TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6, "replace tqlayout"); 
-+	TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6, "replace layout"); 
-  
- 	m_pFindlineedit = new TQLineEdit( this, "findlineedit" );
- #ifndef COMPILE_USE_QT4
-@@ -1133,14 +1133,14 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
- 	m_pFindlineedit->setFrameShadow( TQLineEdit::Sunken );
- #endif
- 
--	tqlayout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
-+	layout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
- 
- 	m_pReplacelineedit = new TQLineEdit( this, "replacelineedit" );
- #ifndef COMPILE_USE_QT4
- 	m_pReplacelineedit->setFrameShape( TQLineEdit::LineEditPanel );
- 	m_pReplacelineedit->setFrameShadow( TQLineEdit::Sunken );
- #endif
--	tqlayout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 );
-+	layout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 );
- 
-    	m_pFindlineedit->setFocus();
- 
-@@ -1150,36 +1150,36 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
- 	findlabel->setAutoResize(true);
- #endif
- 
--	tqlayout->addWidget( findlabel, 2, 0 );
-+	layout->addWidget( findlabel, 2, 0 );
- 
-     TQLabel *replacelabel = new TQLabel( this, "replacelabel" );
- 	replacelabel->setText(tr("Replace with"));
- #ifndef COMPILE_USE_QT4
- 	replacelabel->setAutoResize(true);
- #endif
--	tqlayout->addWidget( replacelabel, 3, 0 );
-+	layout->addWidget( replacelabel, 3, 0 );
- 
-     TQPushButton *cancelbutton = new TQPushButton( this, "cancelButton" );
- 	cancelbutton->setText(tr("&Cancel"));
--	tqlayout->addWidget( cancelbutton, 5, 2 );
-+	layout->addWidget( cancelbutton, 5, 2 );
- 
-     replacebutton = new TQPushButton( this, "replacebutton" );
- 	replacebutton->setText(tr("&Replace"));
- 	replacebutton->setEnabled( FALSE );
--	tqlayout->addWidget( replacebutton, 5, 0 );
-+	layout->addWidget( replacebutton, 5, 0 );
- 
- 	checkReplaceAll = new KviStyledCheckBox( this, "replaceAll" );
- 	checkReplaceAll->setText(tr("&Replace in all Aliases"));
--	tqlayout->addWidget( checkReplaceAll, 4, 0 );
-+	layout->addWidget( checkReplaceAll, 4, 0 );
- 	
- 	findNext = new TQPushButton(this, "findNext(WIP)" );	
- 	findNext->setText(tr("&Findnext"));
--	tqlayout->addWidget( findNext, 2, 3 );
-+	layout->addWidget( findNext, 2, 3 );
- 	findNext->setEnabled(false);
- 
- 	replace = new TQPushButton(this, "replace" );	
- 	replace->setText(tr("&Replace(WIP)"));
--	tqlayout->addWidget( replace, 3, 3 );
-+	layout->addWidget( replace, 3, 3 );
- 	replace->setEnabled(false);
- 
- #ifndef COMPILE_USE_QT4
-diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
-index 14ddad5..009340f 100644
---- a/src/modules/file/libkvifile.cpp
-+++ b/src/modules/file/libkvifile.cpp
-@@ -873,7 +873,7 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
- 	@switches:
- 		!sw: -l | --local-8-bit
- 		Causes the lines to be saved in local 8 bit character set instead
--		of the default tqunicode encoding.
-+		of the default unicode encoding.
- 		!sw: -a | --append
- 		If the file already exists, then the lines are appended to the end
- 		instead of overwriting the file.
-diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
-index 9274946..0990e17 100644
---- a/src/modules/filetransferwindow/filetransferwindow.cpp
-+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
-@@ -580,12 +580,12 @@ void KviFileTransferWindow::copyLocalFileToClipboard()
- 	TQString tmp = t->localFileName();
- 	if(tmp.isEmpty())return;
- #ifdef COMPILE_USE_QT4
--	TQApplication::tqclipboard()->setText(tmp);
-+	TQApplication::clipboard()->setText(tmp);
- #else
--	TQApplication::tqclipboard()->setSelectionMode(false);
--	TQApplication::tqclipboard()->setText(tmp);
--	TQApplication::tqclipboard()->setSelectionMode(true);
--	TQApplication::tqclipboard()->setText(tmp);
-+	TQApplication::clipboard()->setSelectionMode(false);
-+	TQApplication::clipboard()->setText(tmp);
-+	TQApplication::clipboard()->setSelectionMode(true);
-+	TQApplication::clipboard()->setText(tmp);
- #endif
- }
- 
-diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
-index c0f7f1c..96a7edb 100644
---- a/src/modules/help/helpwidget.cpp
-+++ b/src/modules/help/helpwidget.cpp
-@@ -138,7 +138,7 @@ TQSize KviHelpWidget::sizeHint() const
- 
- bool KviHelpWidget::eventFilter(TQObject * o, TQEvent *e)
- {
--	TQClipboard *cb = TQApplication::tqclipboard();
-+	TQClipboard *cb = TQApplication::clipboard();
- 	
- 	if(e->type() == TQEvent::MouseButtonRelease) {
- 		if(m_pTextBrowser->hasSelectedText()) {
-diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
-index 46dc4f2..d77e6fe 100755
---- a/src/modules/help/index.cpp
-+++ b/src/modules/help/index.cpp
-@@ -164,7 +164,7 @@ void Index::parseDocument( const TQString &filename, int docNum )
-     if (text.isNull())
-         return;
-     bool valid = TRUE;
--    const TQChar *buf = text.tqunicode();
-+    const TQChar *buf = text.unicode();
-     TQChar str[64];
-     TQChar c = buf[0];
-     int j = 0;
-@@ -727,7 +727,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
- 
-     bool valid = TRUE;
- 
--    const TQChar *buf = text.tqunicode();
-+    const TQChar *buf = text.unicode();
- 
-     TQChar str[64];
- 
-diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
-index acc6fd1..b7bd8bc 100644
---- a/src/modules/list/listwindow.cpp
-+++ b/src/modules/list/listwindow.cpp
-@@ -145,7 +145,7 @@ void KviChannelListViewItem::paintCell(TQPainter * p,const TQColorGroup &cg,int
- 		if ( isEnabled() || !lv )
- 			p->setPen( cg.text() );
- 		else if ( !isEnabled() && lv)
--			p->setPen( lv->tqpalette().disabled().text() );
-+			p->setPen( lv->palette().disabled().text() );
- 	}
- 	
- 	KviTopicWidget::paintColoredText(p,szText,cg,height(),width);
-diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
-index 55b3622..84a6711 100644
---- a/src/modules/logview/logviewmdiwindow.cpp
-+++ b/src/modules/logview/logviewmdiwindow.cpp
-@@ -90,67 +90,67 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
- 	m_pSearchTab  = new TQWidget(m_pTabWidget);
- 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
- 
--	TQGridLayout *tqlayout = new TQGridLayout(m_pSearchTab,10,2,3,5);
-+	TQGridLayout *layout = new TQGridLayout(m_pSearchTab,10,2,3,5);
- 	
- 	m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
- 	m_pShowChannelsCheck->setChecked(true);
--	tqlayout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
-+	layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
- 	
- 	m_pShowQueryesCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);
- 	m_pShowQueryesCheck->setChecked(true);
--	tqlayout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
-+	layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
- 	
- 	m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);
- 	m_pShowConsolesCheck->setChecked(true);
--	tqlayout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
-+	layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
- 
- 	m_pShowDccChatCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);
- 	m_pShowDccChatCheck->setChecked(true);
--	tqlayout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
-+	layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
- 	
- 	m_pShowOtherCheck   = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);
- 	m_pShowOtherCheck->setChecked(true);
--	tqlayout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
-+	layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
- 	
- 	TQLabel *l;
- 	l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
--	tqlayout->addMultiCellWidget(l,5,5,0,1);
-+	layout->addMultiCellWidget(l,5,5,0,1);
- 
- 	l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
- 	m_pFileNameMask = new TQLineEdit(m_pSearchTab);
- 	connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
--	tqlayout->addWidget(l,6,0);
--	tqlayout->addWidget(m_pFileNameMask,6,1);
-+	layout->addWidget(l,6,0);
-+	layout->addWidget(m_pFileNameMask,6,1);
- 
- 	l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
- 	m_pContentsMask = new TQLineEdit(m_pSearchTab);
- 	connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
--	tqlayout->addWidget(l,7,0);
--	tqlayout->addWidget(m_pContentsMask,7,1);
-+	layout->addWidget(l,7,0);
-+	layout->addWidget(m_pContentsMask,7,1);
- 
- 	m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
- 	m_pFromDateEdit = new TQDateEdit(m_pSearchTab);
- 	m_pFromDateEdit->setDate(TQDate::currentDate());
--	tqlayout->addWidget(m_pEnableFromFilter,8,0);
--	tqlayout->addWidget(m_pFromDateEdit,8,1);
-+	layout->addWidget(m_pEnableFromFilter,8,0);
-+	layout->addWidget(m_pFromDateEdit,8,1);
- 	connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool)));
- 	m_pFromDateEdit->setEnabled(false);
- 
- 	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
- 	m_pToDateEdit = new TQDateEdit(m_pSearchTab);
- 	m_pToDateEdit->setDate(TQDate::currentDate());
--	tqlayout->addWidget(m_pEnableToFilter,9,0);
--	tqlayout->addWidget(m_pToDateEdit,9,1);
-+	layout->addWidget(m_pEnableToFilter,9,0);
-+	layout->addWidget(m_pToDateEdit,9,1);
- 	connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool)));
- 	m_pToDateEdit->setEnabled(false);
- 
- 	TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
- 	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter()));
--	tqlayout->addWidget(pb,10,1);
-+	layout->addWidget(pb,10,1);
- 
- 	TQWidget *w = new TQWidget(m_pSearchTab);
- 	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
--	tqlayout->addWidget(w,11,1);
-+	layout->addWidget(w,11,1);
- 
- 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
- #ifdef COMPILE_USE_QT4
-diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
-index dfc9d6d..cbb2682 100644
---- a/src/modules/notifier/notifierwindow.h
-+++ b/src/modules/notifier/notifierwindow.h
-@@ -77,7 +77,7 @@ protected:
- 	TQPixmap m_pixBackgroundHighlighted;
- 	TQPixmap m_pixForeground;         // we paint the stuff HERE
- 	
--	// Notifier graphic tqlayout
-+	// Notifier graphic layout
- 	TQPixmap m_pixBckgrnd;
- 
- 	TQImage  m_imgBuffer;             // here we merge the two images
-diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
-index 0a4f58a..96ecc40 100644
---- a/src/modules/objects/class_buttongroup.cpp
-+++ b/src/modules/objects/class_buttongroup.cpp
-@@ -48,8 +48,8 @@
- 	@description:
- 		This widget organizes buttons in a group.
- 		It will be usually a parent for other child controls.
--		You can either use a child tqlayout to manage the children geometries
--		or use $setColumnLayout function to manage the tqlayout automatically.
-+		You can either use a child layout to manage the children geometries
-+		or use $setColumnLayout function to manage the layout automatically.
- 		The class ineriths groupbox.
- 
- 	@functions:
-diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
-index 852db9d..c0942a6 100644
---- a/src/modules/objects/class_dockwindow.cpp
-+++ b/src/modules/objects/class_dockwindow.cpp
-@@ -49,11 +49,11 @@
- 		[class]widget[/class]
- 	@description:
- 		A window dockable to the KVIrc main frame borders (like a toolbar).
--		The window has an implicit tqlayout that will automatically manage
-+		The window has an implicit layout that will automatically manage
- 		the children depending on the dock window's orientation.
- 	@functions:
- 		!fn: $addWidget(<widget:hobject>)
--			Adds <widget> to the internal tqlayout of this dock window.[br]
-+			Adds <widget> to the internal layout of this dock window.[br]
- 			The widget must be a child of this dock window (otherwise strange things may happen).
- 		!fn: <string> $orientation()
- 			Returns the string "vertical" or "horizontal" depending on the orientation of this dock window.
-diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
-index a1f5c11..7c01140 100644
---- a/src/modules/objects/class_groupbox.cpp
-+++ b/src/modules/objects/class_groupbox.cpp
-@@ -60,8 +60,8 @@ const int align_cod[] = {
- 	@description:
- 		This widget can be used to display a groupbox.
- 		It will be usually a parent for other child controls.
--		You can either use a child tqlayout to manage the children geometries
--		or use $setColumnLayout to manage the tqlayout automatically.
-+		You can either use a child layout to manage the children geometries
-+		or use $setColumnLayout to manage the layout automatically.
- 	@functions:
- 		!fn: $setTitle(<text:String>)
- 		Sets the group box title to <text>.
-@@ -96,7 +96,7 @@ const int align_cod[] = {
- 		!fn: $setOrientation<orientation:string>
- 		Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical.
- 		!fn: $setColumnLayout(<columns:integer>,<orientation:string>)
--		Enables the automatic tqlayout management. The children are arranged in n columns with the specified orientation.[br]
-+		Enables the automatic layout management. The children are arranged in n columns with the specified orientation.[br]
- 		Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical.
- 	@examples:
- 		[example]
-@@ -120,16 +120,16 @@ const int align_cod[] = {
- 		%inputpass->$setechomode("password")[br]
- 		[br]
- 		#now lets' layouting the groupbox's element's.[br]
--		%layoutgb=$new(tqlayout,%gb)[br]
-+		%layoutgb=$new(layout,%gb)[br]
- 		%layoutgb->$setmargin(20)[br]
- 		%layoutgb->$addwidget(%labeluser,0,0)[br]
- 		%layoutgb->$addwidget(%labelpass,1,0)[br]
- 		%layoutgb->$addwidget(%inputuser,0,1)[br]
- 		%layoutgb->$addwidget(%inputpass,1,1)[br]
- 		[br]
--		# now we create a fake widget and managing the two buttons tqlayout.[br]
-+		# now we create a fake widget and managing the two buttons layout.[br]
- 		%fakewidget=$new(widget,%widget)[br]
--		%layoutbtn=$new(tqlayout,%fakewidget)[br]
-+		%layoutbtn=$new(layout,%fakewidget)[br]
- 		%btnok=$new(button,%fakewidget)[br]
- 		%btnok->$settext("OK")[br]
- 		%btncancel=$new(button,%fakewidget)[br]
-@@ -137,13 +137,13 @@ const int align_cod[] = {
- 		%layoutbtn->$addwidget(%btnok,0,0)[br]
- 		%layoutbtn->$addwidget(%btncancel,0,1)[br]
- 		[br]
--		#And finally we create a main tqlayout with the groupbox (and its "children")[br]
-+		#And finally we create a main layout with the groupbox (and its "children")[br]
- 		#and fakewiget (with its buttons children).
--		%maintqlayout=$new(tqlayout,%widget)[br]
--		%maintqlayout->$setspacing(10)[br]
--		%maintqlayout->$setmargin(10)[br]
--		%maintqlayout->$addwidget(%gb,0,0)[br]
--		%maintqlayout->$addwidget(%fakewidget,1,0)[br]
-+		%mainlayout=$new(layout,%widget)[br]
-+		%mainlayout->$setspacing(10)[br]
-+		%mainlayout->$setmargin(10)[br]
-+		%mainlayout->$addwidget(%gb,0,0)[br]
-+		%mainlayout->$addwidget(%fakewidget,1,0)[br]
- 		[br]
- 		#Let's show our nice login request =D ! [br]
- 		%widget->$show()[br]
-diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
-index 0f6ae24..21167be 100644
---- a/src/modules/objects/class_hbox.cpp
-+++ b/src/modules/objects/class_hbox.cpp
-@@ -44,7 +44,7 @@
- 		!fn: $setSpacing(<spacing:uint>)
- 		Sets the default spacing of the widgets in pixels
- 		!fn: $setMargin(<margin:uint>)
--		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
-+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
- 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
- 		Sets the stretch factor of widget to stretch.
- */
-diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
-index 5caac1d..7b2d252 100644
---- a/src/modules/objects/class_layout.cpp
-+++ b/src/modules/objects/class_layout.cpp
-@@ -40,11 +40,11 @@
- 
- 
- /*
--	@doc: tqlayout
-+	@doc: layout
- 	@keyterms:
--		tqlayout object class, child widgets
-+		layout object class, child widgets
- 	@title:
--		tqlayout class
-+		layout class
- 	@type:
- 		class
- 	@short:
-@@ -52,25 +52,25 @@
- 	@inherits:
- 		[class]object[/class]
- 	@description:
--		The tqlayout is a geometry management tool for child widgets.
--		You create a tqlayout , give it some widgets to manage and it will tqlayout them
-+		The layout is a geometry management tool for child widgets.
-+		You create a layout , give it some widgets to manage and it will layout them
- 		automatically.[br]
--		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
--		A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
--		Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
-+		The parent of the layout must be the widget for which child widget geometries have to be managed.
-+		A layout is a grid of NxM cells in which you insert child widgets with [classfnc:layout]$addWidget[/classfnc]().[br]
-+		Widgets that must span multiple cells can be added to the layout with [classfnc:layout]$addMultiCellWidget[/classfnc]().[br]
- 	@functions:
- 		!fn: $addWidget(<widget:object widget>,<row:uint>,<column:uint>)
--		Adds a widget to this tqlayout placing it at position <row>,<column> in the grid
-+		Adds a widget to this layout placing it at position <row>,<column> in the grid
- 		!fn: $addMultiCellWidget(<widget:object widget>,<start_row:uint>,<end_row:uint>,<start_col:uint>,<end_col:uint>)
--		Adds a widget to this tqlayout spanning multiple grid cells
-+		Adds a widget to this layout spanning multiple grid cells
- 		!fn: $setRowStretch(<row:uint>,<stretch:uint>)
--		Sets the stretch value for a particular row of this tqlayout. The <stretch_value>
-+		Sets the stretch value for a particular row of this layout. The <stretch_value>
- 		must be a positive integer. The rows with bigger stretch values will take more space
--		in the tqlayout.
-+		in the layout.
- 		!fn: $setColStretch(<column:uint>,<stretch:uint>)
--		Sets the stretch value for a particular column in this tqlayout. The <stretch_value>
-+		Sets the stretch value for a particular column in this layout. The <stretch_value>
- 		must be a positive integer. The rows with bigger stretch values will take more space
--		in the tqlayout.
-+		in the layout.
- 		!fn: $addRowSpacing(<row:uint>,<spacing:uint>)
- 		Sets the minimum height of the specified <row> to <spacing> which must be a positive integer
- 		!fn: $addColSpacing(<column:uint>,<spacing:uint>)
-@@ -78,18 +78,18 @@
- 		!fn: $setSpacing(<spacing:uint>)
- 		Sets the default spacing of the widgets in pixels
- 		!fn: $setMargin(<margin:uint>)
--		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
-+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
- 		!fn: $setResizeMode(<resize_mode:string>)
--		Sets the resize mode of the parent widget in relation to this tqlayout.
-+		Sets the resize mode of the parent widget in relation to this layout.
- 		<mode> can be one of:[br]
- 		-Auto: this is the default[br]
--		-Fixed: the parent widget of this tqlayout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
--		-Minimum: the minimum size of the parent widget of this tqlayout is set to minimumSize() and it cannot be smaller[br]
--		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
-+		-Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
-+		-Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller[br]
-+		-FreeResize: the parent widget of this layout is not constrained at all[br]
- */
- 
- 
--KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"tqlayout","object")
-+KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object")
- 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addWidget", functionAddWidget)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addMultiCellWidget", functionAddMultiCellWidget)
- 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setRowStretch", functionSetRowStretch)
-@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
- 
- 	if(!w)
- 	{
--		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
-+		pContext->warning(__tr2qs("The parent of a layout must be a widget!"));
- 		return false;
- 	}
- 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
-diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
-index 81cc3f6..0949945 100644
---- a/src/modules/objects/class_painter.cpp
-+++ b/src/modules/objects/class_painter.cpp
-@@ -323,7 +323,7 @@
- 			}[br]
- 		}[br] 
- 		[br]
--		%lay=$new(tqlayout,%Hello)[br] 
-+		%lay=$new(layout,%Hello)[br] 
- 		%lay->$addwidget(%Btn,4,0)[br] 
- 		%Hello->$setBackgroundColor("000000");[br] 
- 		%Hello->$setmaximumwidth(800)[br] 
-diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
-index 8f1afd7..cb9c3bb 100644
---- a/src/modules/objects/class_popupmenu.cpp
-+++ b/src/modules/objects/class_popupmenu.cpp
-@@ -89,7 +89,7 @@
- 			{[br]
- 				#Geometry of the widget and setting-up of popupmenu [br]
- 				$$->$setGeometry(%X,%Y,100,100)[br]
--			    $$->%lay=$new(tqlayout,$$)[br]
-+			    $$->%lay=$new(layout,$$)[br]
- 				#Here we generate a cicle to create our labels inside the widget.[br]
- 				%i=0[br]
- 				while (%i<10)[br]
-diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
-index 9ec6cc5..1c45ed4 100644
---- a/src/modules/objects/class_process.cpp
-+++ b/src/modules/objects/class_process.cpp
-@@ -82,7 +82,7 @@
- 		%tt=$new(test)[br]
- 		%A=$new(widget)[br]
- 		%A->$setGeometry(100,100,400,300)[br]
--		%layoutA=$new(tqlayout,%A)[br]
-+		%layoutA=$new(layout,%A)[br]
- 		%Ainput=$new(lineedit,%A)[br]
- 		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
- 		%Aoutput=$new(label,%A)[br]
-diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
-index fc22188..3b76821 100644
---- a/src/modules/objects/class_tabwidget.cpp
-+++ b/src/modules/objects/class_tabwidget.cpp
-@@ -94,7 +94,7 @@
- 			%secondtab=$new(widget,%Tabwidget)
- 			
- 			# Now we'll create the item to put in to tab's pages.
--			%layoutfirsttab=$new(tqlayout,%firsttab)
-+			%layoutfirsttab=$new(layout,%firsttab)
- 			%labelbt=$new(label,%firsttab)
- 			%labelbt->$settext(Botton Tab)
- 			%labeltt=$new(label,%firsttab)
-@@ -104,7 +104,7 @@
- 			%buttontt=$new(button,%firsttab)
- 			%buttontt->$settext("To &Top")
- 			
--			# Now we'll give a tqlayout to all items.
-+			# Now we'll give a layout to all items.
- 			# This also allows to use privateimpl without making buttons global variables
- 			%layoutfirsttab->$addwidget(%labelbt,0,0)
- 			%layoutfirsttab->$addwidget(%labeltt,0,1)
-@@ -125,7 +125,7 @@
- 			}
- 			
- 			# We do the same work  with the second tab's page.
--			%layoutsecondtab=$new(tqlayout,%secondtab)
-+			%layoutsecondtab=$new(layout,%secondtab)
- 			%labelwp=$new(label,%secondtab)
- 			%labelwp->$settext("Enjoy the new Class provided by")
- 			%layoutsecondtab->$addwidget(%labelwp,0,0)
-diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
-index bfc8014..0019f00 100644
---- a/src/modules/objects/class_vbox.cpp
-+++ b/src/modules/objects/class_vbox.cpp
-@@ -44,7 +44,7 @@
- 		!fn: $setSpacing(<spacing:int>)
- 		Sets the default spacing of the widgets in pixels
- 		!fn: $setMargin(<margin:int>)
--		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
-+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
- 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
- 		Sets the stretch factor of widget to stretch.
- */
-diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
-index 83d5608..644999a 100644
---- a/src/modules/objects/class_widget.cpp
-+++ b/src/modules/objects/class_widget.cpp
-@@ -167,19 +167,19 @@ const int widgettypes_cod[] = {
- 		!fn: $setMinimumWidth(<value>)
- 		Sets the minimum width of this widget to <value>.
- 		The user will not be able to resize the widget to a smaller
--		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
-+		value. This value is also used by the [class:layout]layout class[/class].
- 		!fn: $setMinimumHeight(<value>)
- 		Sets the minimum height of this widget to <value>.
- 		The user will not be able to resize the widget to a smaller
--		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
-+		value. This value is also used by the [class:layout]layout class[/class].
- 		!fn: $setMaximumWidth(<value>)
- 		Sets the maximum width of this widget to <value>.
- 		The user will not be able to resize the widget to a bigger
--		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
-+		value. This value is also used by the [class:layout]layout class[/class].
- 		!fn: $setMaximumHeight(<value>)
- 		Sets the maximum height of this widget to <value>.
- 		The user will not be able to resize the widget to a bigger
--		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
-+		value. This value is also used by the [class:layout]layout class[/class].
- 		!fn: $move(<x_or_array>[,<y>])
- 		Moves this widget to the coordinate <x> and <y> relative to its
- 		parent widget (or the desktop if this widget is a toplevel one).
-@@ -1616,7 +1616,7 @@ bool KviKvsObject_widget::function_addWidgetToWrappedLayout(KviKvsObjectFunction
- 		c->warning(__tr2qs("Widget parameter is not a valid object"));
- 		return true;
- 	}
--	TQLayout *lay=widget()->tqlayout();
-+	TQLayout *lay=widget()->layout();
- 	if (!lay)
- 	{
- 		c->warning(__tr2qs("No Layout associated to the widget "));
-diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
-index 4809277..4f17802 100644
---- a/src/modules/objects/class_workspace.cpp
-+++ b/src/modules/objects/class_workspace.cpp
-@@ -110,7 +110,7 @@
- 			constructor[br]
- 			{[br]
- 			       $$->$setGeometry(%X,%Y,100,100)[br]
--			       $$->%lay=$new(tqlayout,$$)[br]
-+			       $$->%lay=$new(layout,$$)[br]
- 			       %i=0[br]
- 			       while (%i<10)[br]
- 				{[br]
-diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
-index 4f1dedf..7eab580 100644
---- a/src/modules/options/dialog.cpp
-+++ b/src/modules/options/dialog.cpp
-@@ -70,7 +70,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
- 	l->setWordWrap(true);
- #endif
- 	l->setAlignment(TQt::AlignTop);
--	tqlayout()->addWidget(l,0,0);
-+	layout()->addWidget(l,0,0);
- }
- 
- KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
-diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
-index 43cc13e..770db33 100644
---- a/src/modules/options/optw_antispam.cpp
-+++ b/src/modules/options/optw_antispam.cpp
-@@ -47,7 +47,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
- 
- 	reenableStuff(true);
- 
--	tqlayout()->setRowStretch(2,1);
-+	layout()->setRowStretch(2,1);
- }
- 
- KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
-diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
-index 57b67a4..e403dae 100644
---- a/src/modules/options/optw_identity.cpp
-+++ b/src/modules/options/optw_identity.cpp
-@@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
- 
- 
- 	createLayout(3,1);
--	tqlayout()->setMargin(10);
-+	layout()->setMargin(10);
- 
- 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
- 	KviTalHBox * hb = new KviTalHBox(gbox);
-@@ -492,7 +492,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
- : KviOptionsWidget(parent)
- {
- 	createLayout(4,1);
--	tqlayout()->setMargin(10);
-+	layout()->setMargin(10);
- 	
- 	m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar));
- 
-@@ -540,7 +540,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
- 
- 	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
- 
--	tqlayout()->setRowStretch(1,2);
-+	layout()->setRowStretch(1,2);
- }
- 
- KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
-@@ -678,7 +678,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa
-     
- 
- 	createLayout(2,1);
--	tqlayout()->setMargin(10);
-+	layout()->setMargin(10);
- 
- 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
- 	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
-diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
-index c1ad6e8..1153365 100644
---- a/src/modules/options/optw_input.cpp
-+++ b/src/modules/options/optw_input.cpp
-@@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
- 	}
- 
- 
--	tqlayout()->setRowStretch(7,1);
-+	layout()->setRowStretch(7,1);
- }
- 
- KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
-diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
-index 1e2c998..e5d0cd5 100644
---- a/src/modules/options/optw_interfacelookglobal.cpp
-+++ b/src/modules/options/optw_interfacelookglobal.cpp
-@@ -104,13 +104,13 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
- 
- 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
- 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
--	tqlayout()->setRowStretch(6,1);
-+	layout()->setRowStretch(6,1);
- 	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
- 
- #else //!COMPILE_KDE_SUPPORT
- 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
- 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
--	tqlayout()->setRowStretch(4,1);
-+	layout()->setRowStretch(4,1);
- #endif //!COMPILE_KDE_SUPPORT
- 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
- 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
-@@ -177,7 +177,7 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
- 	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
- 	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
- 
--	tqlayout()->setRowStretch(1,1);
-+	layout()->setRowStretch(1,1);
- }
- 
- KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
-@@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidge
- 
- 	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
- 
--	tqlayout()->setRowStretch(8,1);
-+	layout()->setRowStretch(8,1);
- }
- 
- KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
-diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
-index 4bb80f5..52f7cec 100644
---- a/src/modules/options/optw_ircview.cpp
-+++ b/src/modules/options/optw_ircview.cpp
-@@ -98,7 +98,7 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
- 			m_pVerticalAlign->setCurrentItem(0);
- 	}
- 	
--	tqlayout()->setRowStretch(2,1);
-+	layout()->setRowStretch(2,1);
- }
- 
- KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
-diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
-index b93081e..c4fb694 100644
---- a/src/modules/options/optw_mediatypes.cpp
-+++ b/src/modules/options/optw_mediatypes.cpp
-@@ -77,72 +77,72 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
- 
- 	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
- 
--	tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2);
-+	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
- 
- 	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
--	tqlayout()->addWidget(l,1,0);
-+	layout()->addWidget(l,1,0);
- 	m_pDescription = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2);
-+	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
- 
- 	l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this);
--	tqlayout()->addWidget(l,2,0);
-+	layout()->addWidget(l,2,0);
- 	m_pIanaType = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
-+	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
- 
- 	l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this);
--	tqlayout()->addWidget(l,3,0);
-+	layout()->addWidget(l,3,0);
- 	m_pFileMask = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
-+	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
- 
- 	l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this);
--	tqlayout()->addWidget(l,4,0);
-+	layout()->addWidget(l,4,0);
- 	m_pMagicBytes = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
-+	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
- 
- 	l = new TQLabel(__tr2qs_ctx("Save path:","options"),this);
--	tqlayout()->addWidget(l,5,0);
-+	layout()->addWidget(l,5,0);
- 	m_pSavePath = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
-+	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
- 
- 	l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this);
--	tqlayout()->addWidget(l,6,0);
-+	layout()->addWidget(l,6,0);
- 	m_pCommandline = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
-+	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
- #ifdef COMPILE_INFO_TIPS
- 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
- 		"<tt>$0</tt> is used in place of the filename</center>","options"));
- #endif
- 
- 	l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this);
--	tqlayout()->addWidget(l,7,0);
-+	layout()->addWidget(l,7,0);
- 	m_pRemoteExecCommandline = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
-+	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
- #ifdef COMPILE_INFO_TIPS
- 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
- 		"<tt>$0</tt> is used in place of the filename</center>","options"));
- #endif
- 
- 	l = new TQLabel(__tr2qs_ctx("Icon","options"),this);
--	tqlayout()->addWidget(l,8,0);
-+	layout()->addWidget(l,8,0);
- 	m_pIcon = new TQLineEdit(this);
--	tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2);
-+	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
- 
- 	TQFrame * f = new TQFrame(this);
- 	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
--	tqlayout()->addMultiCellWidget(f,9,9,0,2);
-+	layout()->addMultiCellWidget(f,9,9,0,2);
- 
- 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
- 	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
--	tqlayout()->addWidget(b,10,1);
-+	layout()->addWidget(b,10,1);
- 
- 	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
- 	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
--	tqlayout()->addWidget(m_pDelete,10,2);
-+	layout()->addWidget(m_pDelete,10,2);
- 	
- 
--	tqlayout()->setColStretch(1,1);
--	tqlayout()->setColStretch(2,1);
--	tqlayout()->setRowStretch(0,1);
-+	layout()->setColStretch(1,1);
-+	layout()->setColStretch(2,1);
-+	layout()->setRowStretch(0,1);
- 
- 	m_pLastItem = 0;
- 
-diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
-index 568499a..0a8e70b 100644
---- a/src/modules/options/optw_messages.cpp
-+++ b/src/modules/options/optw_messages.cpp
-@@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent
- 
- 	addRowSpacer(0,4,3,4);
- 	
--	tqlayout()->setRowStretch(4,1);
-+	layout()->setRowStretch(4,1);
- }
- 
- KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
-@@ -464,8 +464,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
- 		it = new KviMessageListViewItem(m_pListView,i);
- 	}
- 
--	tqlayout()->setRowStretch(0,1);
--	tqlayout()->setColStretch(0,1);
-+	layout()->setRowStretch(0,1);
-+	layout()->setColStretch(0,1);
- 
- 	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *)));
- 	connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
-diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
-index 19a7683..612627f 100644
---- a/src/modules/options/optw_nickserv.cpp
-+++ b/src/modules/options/optw_nickserv.cpp
-@@ -236,7 +236,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
- {
- 	createLayout(3,3);
- 	
--	TQGridLayout * gl = tqlayout();
-+	TQGridLayout * gl = layout();
- 
- 	KviNickServRuleSet * rs = g_pNickServRuleSet;
- 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
-diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
-index f5db325..aa9ceda 100644
---- a/src/modules/options/optw_proxy.cpp
-+++ b/src/modules/options/optw_proxy.cpp
-@@ -104,7 +104,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
- 
- 
- 	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this);
--	//TQGridLayout * gl = new TQGridLayout(gbox->tqlayout());
-+	//TQGridLayout * gl = new TQGridLayout(gbox->layout());
- 	//gl->setMargin(2);
- 	//gl->setSpacing(4);
- 
-@@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
- 
- 	fillProxyList();
- 
--	tqlayout()->setRowStretch(0,1);
--	tqlayout()->setColStretch(0,1);
-+	layout()->setRowStretch(0,1);
-+	layout()->setColStretch(0,1);
- 
- 	m_pContextPopup = new KviTalPopupMenu(this);
- 
-diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
-index 2c26ac5..3706f10 100644
---- a/src/modules/options/optw_servers.cpp
-+++ b/src/modules/options/optw_servers.cpp
-@@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
- 
- 	fillServerList();
- 
--	tqlayout()->setRowStretch(0,1);
--	//tqlayout()->setColStretch(1,5);
--	//tqlayout()->setColStretch(2,2);
--	tqlayout()->setColStretch(0,1);
-+	layout()->setRowStretch(0,1);
-+	//layout()->setColStretch(1,5);
-+	//layout()->setColStretch(2,2);
-+	layout()->setColStretch(0,1);
- 	setMinimumWidth(320);
- }
- 
-diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
-index 201766c..0c85ea7 100644
---- a/src/modules/options/optw_taskbar.cpp
-+++ b/src/modules/options/optw_taskbar.cpp
-@@ -161,7 +161,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW
- 			m_pVerticalAlign->setCurrentItem(0);
- 	}
- 
--	tqlayout()->setRowStretch(1,1);
-+	layout()->setRowStretch(1,1);
- }
- 
- 
-diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
-index 7f86182..bbd2290 100644
---- a/src/modules/options/optw_texticons.cpp
-+++ b/src/modules/options/optw_texticons.cpp
-@@ -160,14 +160,14 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
- 		++it;
- 	}
- 
--	tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1);
-+	layout()->addMultiCellWidget(m_pTable,0,0,0,1);
- 
- 	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
--	tqlayout()->addWidget(m_pAdd,1,0);
-+	layout()->addWidget(m_pAdd,1,0);
- 	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
- 
- 	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
--	tqlayout()->addWidget(m_pDel,1,1);
-+	layout()->addWidget(m_pDel,1,1);
- 	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
- 
- 	m_pDel->setEnabled(false);
-diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
-index ec076da..904eeae 100644
---- a/src/modules/options/optw_topiclabel.cpp
-+++ b/src/modules/options/optw_topiclabel.cpp
-@@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviO
- 	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
- 	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
- 	
--	tqlayout()->setRowStretch(3, 1);
-+	layout()->setRowStretch(3, 1);
- }
- 
- KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
-diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
-index 9785cf2..595db91 100644
---- a/src/modules/options/optw_userlist.cpp
-+++ b/src/modules/options/optw_userlist.cpp
-@@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T
- 
- 
- 
--	//tqlayout()->setColStretch(0,1);
--	tqlayout()->setRowStretch(1,1);
-+	//layout()->setColStretch(0,1);
-+	layout()->setRowStretch(1,1);
- }
- 
- KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
-diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
-index 9fb7f61..115cf4b 100644
---- a/src/modules/reguser/edituser.cpp
-+++ b/src/modules/reguser/edituser.cpp
-@@ -460,25 +460,25 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
- 	TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb);
- 	connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool)));
- 	
--	TQVBoxLayout * tqlayout = new TQVBoxLayout(gb,20,3);
-+	TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3);
- 	
- 	m_pIgnoreQuery = new KviStyledCheckBox(__tr2qs("Ignore query-messages"),gb);
--	tqlayout->addWidget(m_pIgnoreQuery);
-+	layout->addWidget(m_pIgnoreQuery);
- 
- 	m_pIgnoreChannel = new KviStyledCheckBox(__tr2qs("Ignore channel-messages"),gb);
--	tqlayout->addWidget(m_pIgnoreChannel);
-+	layout->addWidget(m_pIgnoreChannel);
- 
- 	m_pIgnoreNotice = new KviStyledCheckBox(__tr2qs("Ignore notice-messages"),gb);
--	tqlayout->addWidget(m_pIgnoreNotice);
-+	layout->addWidget(m_pIgnoreNotice);
- 
- 	m_pIgnoreCtcp = new KviStyledCheckBox(__tr2qs("Ignore ctcp-messages"),gb);
--	tqlayout->addWidget(m_pIgnoreCtcp);
-+	layout->addWidget(m_pIgnoreCtcp);
- 
- 	m_pIgnoreInvite = new KviStyledCheckBox(__tr2qs("Ignore invites"),gb);
--	tqlayout->addWidget(m_pIgnoreInvite);
-+	layout->addWidget(m_pIgnoreInvite);
- 
- 	m_pIgnoreDcc = new KviStyledCheckBox(__tr2qs("Ignore DCCs"),gb);
--	tqlayout->addWidget(m_pIgnoreDcc);
-+	layout->addWidget(m_pIgnoreDcc);
- 
- 	TQWidget *w = new TQWidget(vb);
- 	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
-diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-index 11e320d..d4e59cb 100644
---- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
-+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
-@@ -592,10 +592,10 @@ void KviSharedFilesWindow::copyLocalFileToClipboard()
- 	if(!t)return;
- 	TQString tmp = t->localFileName();
- 	if(tmp.isEmpty())return;
--	TQApplication::tqclipboard()->setSelectionMode(false);
--	TQApplication::tqclipboard()->setText(tmp);
--	TQApplication::tqclipboard()->setSelectionMode(true);
--	TQApplication::tqclipboard()->setText(tmp);
-+	TQApplication::clipboard()->setSelectionMode(false);
-+	TQApplication::clipboard()->setText(tmp);
-+	TQApplication::clipboard()->setSelectionMode(true);
-+	TQApplication::clipboard()->setText(tmp);
- }
- 
- void KviSharedFilesWindow::openLocalFileFolder()
-diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
-index de2236c..b7ea2e7 100644
---- a/src/modules/str/libkvistr.cpp
-+++ b/src/modules/str/libkvistr.cpp
-@@ -102,7 +102,7 @@ static bool str_kvs_fnc_fromclipboard(KviKvsModuleFunctionCall * c)
- 	TQString szString;
- 	KVSM_PARAMETERS_BEGIN(c)
- 	KVSM_PARAMETERS_END(c)
--	TQClipboard *cb = TQApplication::tqclipboard();
-+	TQClipboard *cb = TQApplication::clipboard();
-         szString = cb->text(TQClipboard::Clipboard);
- 	c->returnValue()->setString(szString);
- 	return true;
-@@ -132,7 +132,7 @@ static bool str_kvs_cmd_toClipboard(KviKvsModuleCommandCall * c)
- 	KVSM_PARAMETERS_BEGIN(c)
- 		KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
- 	KVSM_PARAMETERS_END(c)
--	TQClipboard *cb = TQApplication::tqclipboard();
-+	TQClipboard *cb = TQApplication::clipboard();
- 	cb->setText(szValue, TQClipboard::Clipboard );
- 	return true;
- }
-@@ -1360,17 +1360,17 @@ static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c)
- 	int len = szString.length();
- 	while (idx<len)
- 	{
--		TQChar szTmp = szString[idx].tqunicode();
-+		TQChar szTmp = szString[idx].unicode();
- 		while (szTmp.isSpace())
- 		{
- 			idx++;
--			 szTmp = szString[idx].tqunicode();
-+			 szTmp = szString[idx].unicode();
- 		}
- 		begin = idx;
- 		while (idx<len && !szTmp.isSpace())
- 		{
- 			idx++;
--			szTmp = szString[idx].tqunicode();
-+			szTmp = szString[idx].unicode();
- 		}
- 		if (iOccurence == (kvs_int_t)cnt)
- 		{
-@@ -1433,18 +1433,18 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
- 	int len = szString.length();
- 	while (idx<len)
- 	{
--		TQChar szTmp = szString[idx].tqunicode();
-+		TQChar szTmp = szString[idx].unicode();
- //		while (szTmp==sep)
- 		while (sep.contains(szTmp))
- 		{
- 			idx++;
--			 szTmp = szString[idx].tqunicode();
-+			 szTmp = szString[idx].unicode();
- 		}
- 		begin = idx;
- 		while (idx<len && !sep.contains(szTmp))
- 		{
- 			idx++;
--			szTmp = szString[idx].tqunicode();
-+			szTmp = szString[idx].unicode();
- 		}
- 		if (n == cnt)
- 		{
-@@ -1489,13 +1489,13 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c)
- 	{
- 		while(idx < len)
- 		{
--			sum += szString[idx].lower().tqunicode();
-+			sum += szString[idx].lower().unicode();
- 			idx++;
- 		}
- 	} else {
- 		while(idx < len)
- 		{
--			sum += szString[idx].tqunicode();
-+			sum += szString[idx].unicode();
- 			idx++;
- 		}
- 	}
-@@ -1963,7 +1963,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 	if(fmt)
- 	{
- 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
--		//TQChar * p = (TQChar *)s.tqunicode();
-+		//TQChar * p = (TQChar *)s.unicode();
- 	
- 		//9999999999999999999999999999999\0
- 		char numberBuffer[1024];
-@@ -1993,12 +1993,12 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 	
- 		pVar = vArgs.first();
- 
--		for(; fmt->tqunicode() ; ++fmt)
-+		for(; fmt->unicode() ; ++fmt)
- 		{
- 			if(reallen == allocsize)INCREMENT_MEM
- 	
- 			//copy up to a '?'
--			if(fmt->tqunicode() != '?')
-+			if(fmt->unicode() != '?')
- 			{
- 				*p++ = *fmt;
- 				reallen++;
-@@ -2006,7 +2006,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 			}
- 	
- 			++fmt; //skip this '?'
--			switch(fmt->tqunicode())
-+			switch(fmt->unicode())
- 			{
- 				case 's':
- 				{
-@@ -2015,7 +2015,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 					if(sz.isEmpty())continue;
- 					int len = sz.length();
- 					if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
--					const TQChar * ch = sz.tqunicode();
-+					const TQChar * ch = sz.unicode();
- 					while(len--)*p++ = *ch++;
- 					reallen += sz.length();
- 					pVar = vArgs.next();
-@@ -2149,7 +2149,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 				}
- 				case '?':
- 				{
--					if(fmt->tqunicode())
-+					if(fmt->unicode())
- 					{
- 						if(reallen == allocsize)INCREMENT_MEM
- 						*p++ = *fmt;
-@@ -2171,15 +2171,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 	
- 					int idx = 2;
- 					
--					while((fmt->tqunicode() >= '0') && (fmt->tqunicode() <= '9') && (idx < 6))
-+					while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6))
- 					{
- 						uPrecision *= 10;
--						fmtbuffer[idx] = fmt->tqunicode();
-+						fmtbuffer[idx] = fmt->unicode();
- 						uPrecision += fmtbuffer[idx] - '0';
- 						fmt++;
- 						idx++;
- 					}
--					fmtbuffer[idx] = fmt->tqunicode();
-+					fmtbuffer[idx] = fmt->unicode();
- 					fmtbuffer[idx+1] = 0;
- 	
- 					if(pVar)
-@@ -2193,7 +2193,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 						c->warning(__tr2qs("Missing argument for a floating point escape sequence, 0.0 assumed"));
- 						argRValue = 0;
- 					}
--					switch(fmt->tqunicode())
-+					switch(fmt->unicode())
- 					{
- 						case 'e':
- 						case 'E':
-@@ -2212,7 +2212,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 							fmt = save;
- 							*p++ = '?';  //write it
- 							reallen++;
--							if(fmt->tqunicode())
-+							if(fmt->unicode())
- 							{
- 								if(reallen == allocsize)INCREMENT_MEM
- 								*p++ = *fmt;
-@@ -2228,7 +2228,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
- 				{
- 					*p++ = '?';  //write it
- 					reallen++;
--					if(fmt->tqunicode())
-+					if(fmt->unicode())
- 					{
- 						if(reallen == allocsize)INCREMENT_MEM
- 						*p++ = *fmt;
-diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
-index df68402..879a2ae 100644
---- a/src/modules/system/libkvisystem.cpp
-+++ b/src/modules/system/libkvisystem.cpp
-@@ -240,7 +240,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
- 
- static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c)
- {
--	c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Clipboard));
-+	c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Clipboard));
- 	return true;
- }
- 
-@@ -275,7 +275,7 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c)
- 	KVSM_PARAMETERS_BEGIN(c)
- 		KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
- 	KVSM_PARAMETERS_END(c)
--	g_pApp->tqclipboard()->setText(szValue,TQClipboard::Clipboard);
-+	g_pApp->clipboard()->setText(szValue,TQClipboard::Clipboard);
- 	return true;
- }
- 
-@@ -307,7 +307,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
- 	KVSM_PARAMETERS_BEGIN(c)
- 		KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
- 	KVSM_PARAMETERS_END(c)
--	g_pApp->tqclipboard()->setText(szValue,TQClipboard::Selection);
-+	g_pApp->clipboard()->setText(szValue,TQClipboard::Selection);
- 	return true;
- }
- 
-@@ -337,7 +337,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
- 
- static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c)
- {
--	c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Selection));
-+	c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Selection));
- 	return true;
- }
- 
diff --git a/redhat/applications/kvirc/bp003-1c00d6ff.diff b/redhat/applications/kvirc/bp003-1c00d6ff.diff
deleted file mode 100644
index ab9589368..000000000
--- a/redhat/applications/kvirc/bp003-1c00d6ff.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 1c00d6ffa847ef0cc0cc6deaf1da412c8264f7ac
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1324748257 -0600
-
-    Rename a few stragglers
-
-diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
-index b7bd8bc..c5ed5ea 100644
---- a/src/modules/list/listwindow.cpp
-+++ b/src/modules/list/listwindow.cpp
-@@ -140,7 +140,7 @@ void KviChannelListViewItem::paintCell(TQPainter * p,const TQColorGroup &cg,int
- 		if ( isEnabled() || !lv )
- 			p->setPen( cg.highlightedText() );
- 		else if ( !isEnabled() && lv)
--			p->setPen( lv->tqpalette().disabled().highlightedText() );
-+			p->setPen( lv->palette().disabled().highlightedText() );
- 	} else {
- 		if ( isEnabled() || !lv )
- 			p->setPen( cg.text() );
diff --git a/redhat/applications/kvirc/bp004-ff96f491.diff b/redhat/applications/kvirc/bp004-ff96f491.diff
deleted file mode 100644
index c825af5a1..000000000
--- a/redhat/applications/kvirc/bp004-ff96f491.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit ff96f491739a5bee6e9d9c2b0c6b9b38e790f9af
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1325294026 -0600
-
-    Fix FTBFS
-
-diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
-index 9947aff..c426230 100755
---- a/src/modules/options/mkcreateinstanceproc.sh
-+++ b/src/modules/options/mkcreateinstanceproc.sh
-@@ -355,7 +355,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
- 	if(e->pWidget->parent() != par)
- 	{
- 		QWidget * oldPar = (QWidget *)e->pWidget->parent();
--		e->pWidget->reparent(par,QPoint(0,0));
-+		e->pWidget->reparent(par,TQPoint(0,0));
- 		delete oldPar;
- 	}
- 	if(e->bIsContainer)
diff --git a/redhat/applications/kvirc/bp005-2285efe5.diff b/redhat/applications/kvirc/bp005-2285efe5.diff
deleted file mode 100644
index 27b10d930..000000000
--- a/redhat/applications/kvirc/bp005-2285efe5.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 2285efe5dc2c83eda4578527b65f759f6382d094
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1325323706 -0600
-
-    Fix FTBFS
-
-diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
-index c426230..5e504fa 100755
---- a/src/modules/options/mkcreateinstanceproc.sh
-+++ b/src/modules/options/mkcreateinstanceproc.sh
-@@ -56,7 +56,7 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
- 
- typedef struct _KviOptionsWidgetInstanceEntry
- {
--	KviOptionsWidget                          * (*createProc)(QWidget *);
-+	KviOptionsWidget                          * (*createProc)(TQWidget *);
- 	KviOptionsWidget                          * pWidget;   // singleton
- 	int                                         iIcon;
- 	QString                                     szName;
-@@ -73,9 +73,10 @@ typedef struct _KviOptionsWidgetInstanceEntry
- } KviOptionsWidgetInstanceEntry;
- 
- 
--class KviOptionsInstanceManager : public QObject
-+class KviOptionsInstanceManager : public TQObject
- {
- 	Q_OBJECT
-+	TQ_OBJECT
- public:
- 	KviOptionsInstanceManager();
- 	virtual ~KviOptionsInstanceManager();
-@@ -83,14 +84,14 @@ protected:
- 	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
- public:
- 	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
--	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
-+	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par);
- 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
- 	void cleanup(KviModule * m);
- protected:
- 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
--	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
- 	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
--protected Q_SLOTS:
-+protected slots:
- 	void widgetDestroyed();
- };
- 
diff --git a/redhat/applications/kvirc/bp006-51bbe9e5.diff b/redhat/applications/kvirc/bp006-51bbe9e5.diff
deleted file mode 100644
index 5909e9948..000000000
--- a/redhat/applications/kvirc/bp006-51bbe9e5.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 51bbe9e5da9c9ebf2109ab59f98d182c3ee23d86
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date:   1327529886 -0600
-
-    Fix linear alphabet string errors
-
-diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
-index 54a1c4a..a02d6c7 100644
---- a/src/kvilib/core/kvi_string.cpp
-+++ b/src/kvilib/core/kvi_string.cpp
-@@ -1342,7 +1342,7 @@ int KviStr::hexToBuffer(char ** buffer,bool bNullToNewlines)
- 	return len;
- }
- 
--static const char * base64_chars = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char * base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- 
- 
- void KviStr::bufferToBase64(const char * buffer,int len)
-diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
-index 2bd8e6e..e9c7051 100644
---- a/src/modules/rijndael/libkvirijndael.cpp
-+++ b/src/modules/rijndael/libkvirijndael.cpp
-@@ -471,7 +471,7 @@
- 		*/
- 	}
- 	
--	static unsigned char fake_base64[]="./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
-+	static unsigned char fake_base64[]="./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- 
- 	unsigned int fake_base64dec(unsigned char c)
- 	{
diff --git a/redhat/applications/kvirc/bp007-a24a8595.diff b/redhat/applications/kvirc/bp007-a24a8595.diff
deleted file mode 100644
index 7ec48b2c6..000000000
--- a/redhat/applications/kvirc/bp007-a24a8595.diff
+++ /dev/null
@@ -1,1956 +0,0 @@
-commit a24a8595fc6663038f6ce26cfed6276910eef984
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334302607 -0500
-
-    Fix inadvertent "TQ" changes.
-
-diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h
-index f7f9fd4..fc375b0 100644
---- a/src/kvilib/config/kvi_defaults.h
-+++ b/src/kvilib/config/kvi_defaults.h
-@@ -50,7 +50,7 @@
- #define KVI_DEFAULT_REALNAME "KVIrc " VERSION " '" KVI_RELEASE_NAME "' http://kvirc.net/"
- 
- #define KVI_DEFAULT_PART_MESSAGE "No matter how dark the night, somehow the Sun rises once again"
--#define KVI_DEFAULT_TQUIT_MESSAGE "KVIrc $version $version(r) http://www.kvirc.net/"
-+#define KVI_DEFAULT_QUIT_MESSAGE "KVIrc $version $version(r) http://www.kvirc.net/"
- #define KVI_DEFAULT_CTCP_USERINFO_REPLY "I'm too lazy to edit this field."
- #define KVI_DEFAULT_CTCP_PAGE_REPLY "Your message has been received and logged"
- #define KVI_DEFAULT_AWAY_MESSAGE "I'm off to see the wizard."
-diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
-index f2f39d2..5922e99 100644
---- a/src/kvilib/ext/kvi_osinfo.cpp
-+++ b/src/kvilib/ext/kvi_osinfo.cpp
-@@ -317,7 +317,7 @@ static TQString queryWinInfo( QueryInfo info)
- 
- 			lRet = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
- 				TEXT("SYSTEM\\CurrentControlSet\\Control\\ProductOptions"),
--				0, KEY_TQUERY_VALUE, &hKey );
-+				0, KEY_QUERY_VALUE, &hKey );
- 			if( lRet != ERROR_SUCCESS )
- 				return FALSE;
- 
-@@ -348,7 +348,7 @@ static TQString queryWinInfo( QueryInfo info)
- 			// Test for SP6 versus SP6a.
- 			lRet = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
- 				TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"),
--				0, KEY_TQUERY_VALUE, &hKey );
-+				0, KEY_QUERY_VALUE, &hKey );
- 			if( lRet == ERROR_SUCCESS )
- 				szVersion+= TQString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF );         
- 			else // Windows NT 4.0 prior to SP6a
-diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
-index 4e3468d..5be98fa 100644
---- a/src/kvilib/irc/kvi_useridentity.cpp
-+++ b/src/kvilib/irc/kvi_useridentity.cpp
-@@ -172,7 +172,7 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
- 	ret->setUserName(KVI_DEFAULT_USERNAME);
- 	ret->setRealName(KVI_DEFAULT_REALNAME);
- 	ret->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
--	ret->setQuitMessage(KVI_DEFAULT_TQUIT_MESSAGE);
-+	ret->setQuitMessage(KVI_DEFAULT_QUIT_MESSAGE);
- 	
- 	m_pIdentityDict->replace(ret->id(),ret);
- 	
-diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp
-index 472486f..02dcdc0 100644
---- a/src/kvilib/system/kvi_thread.cpp
-+++ b/src/kvilib/system/kvi_thread.cpp
-@@ -152,7 +152,7 @@ static void kvi_threadInitialize()
- 
- // the maximum length of the slave->master queue
- // over this length , the slave is forced to usleep()
--#define KVI_THREAD_MAX_EVENT_TQUEUE_LENGTH 50
-+#define KVI_THREAD_MAX_EVENT_QUEUE_LENGTH 50
- 
- static KviThreadManager * g_pThreadManager = 0;
- 
-@@ -319,7 +319,7 @@ void KviThreadManager::postSlaveEvent(TQObject *o,TQEvent *e)
- 	// on the main application thread we also can't artificially process the events.
- 	// So the solution is to skip this algorithm when at least one
- 	// thread is in waiting state.
--	while((m_pEventQueue->count() > KVI_THREAD_MAX_EVENT_TQUEUE_LENGTH) && (m_iWaitingThreads < 1))
-+	while((m_pEventQueue->count() > KVI_THREAD_MAX_EVENT_QUEUE_LENGTH) && (m_iWaitingThreads < 1))
- 	{
- 		// wait for the master to process the queue
- 
-diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
-index 0c10f99..d27d69e 100644
---- a/src/kvirc/kernel/kvi_action.cpp
-+++ b/src/kvirc/kernel/kvi_action.cpp
-@@ -251,7 +251,7 @@ void KviAction::activeWindowChanged()
- 				if(isEnabled())setEnabled(false);
- 			}
- 			break;
--		case KVI_WINDOW_TYPE_TQUERY:
-+		case KVI_WINDOW_TYPE_QUERY:
- 			if(m_uFlags & WindowQuery)
- 			{
- 				if(m_uFlags & WindowOnlyIfUsersSelected)
-@@ -305,7 +305,7 @@ void KviAction::activeWindowSelectionStateChanged(bool bSelectedNow)
- 				if(isEnabled())setEnabled(false);
- 			}
- 			break;
--		case KVI_WINDOW_TYPE_TQUERY:
-+		case KVI_WINDOW_TYPE_QUERY:
- 			if(m_uFlags & WindowQuery)
- 			{
- 				if(bSelectedNow != isEnabled())setEnabled(bSelectedNow);
-diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
-index c7ac426..b54760b 100644
---- a/src/kvirc/kernel/kvi_app_setup.cpp
-+++ b/src/kvirc/kernel/kvi_app_setup.cpp
-@@ -109,9 +109,9 @@ bool KviApp::checkLocalKvircDirectory(const TQString szDir)
- bool KviApp::checkFileAssociations()
- {
- #ifdef COMPILE_ON_WINDOWS
--#define TQUERY_BUFFER 2048
-+#define QUERY_BUFFER 2048
- 	char* buffer;
--	DWORD len = TQUERY_BUFFER;
-+	DWORD len = QUERY_BUFFER;
- 	DWORD err;
- 	buffer = (char*)malloc(len*sizeof(char));
- 	HKEY hKey;
-@@ -130,7 +130,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -145,7 +145,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\DefaultIcon",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -162,7 +162,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -177,7 +177,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse\\command",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -210,7 +210,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcConfig",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -229,7 +229,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcAddon",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 	//Theme
-@@ -247,7 +247,7 @@ bool KviApp::checkFileAssociations()
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcTheme",0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -261,9 +261,9 @@ bool KviApp::checkFileAssociations()
- bool KviApp::checkUriAssociations(char * proto)
- {
- #ifdef COMPILE_ON_WINDOWS
--#define TQUERY_BUFFER 2048
-+#define QUERY_BUFFER 2048
- 	char* buffer;
--	DWORD len = TQUERY_BUFFER;
-+	DWORD len = QUERY_BUFFER;
- 	DWORD err;
- 	buffer = (char*)malloc(len*sizeof(char));
- 	HKEY hKey;
-@@ -272,7 +272,7 @@ bool KviApp::checkUriAssociations(char * proto)
- 
- 	KviStr key=storedKey;
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -287,7 +287,7 @@ bool KviApp::checkUriAssociations(char * proto)
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if( (err=RegQueryValueEx( hKey,"URL Protocol",0,0,(LPBYTE)buffer,&len)) != ERROR_SUCCESS)
- 	{
- 		free(buffer);
-@@ -295,7 +295,7 @@ bool KviApp::checkUriAssociations(char * proto)
- 	}
- 
- 	key = storedKey+"\\DefaultIcon";
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
- 
-@@ -312,7 +312,7 @@ bool KviApp::checkUriAssociations(char * proto)
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	key = storedKey+"\\Shell\\open";
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
-@@ -328,7 +328,7 @@ bool KviApp::checkUriAssociations(char * proto)
- 		}
- 	}
- 
--	len = TQUERY_BUFFER;
-+	len = QUERY_BUFFER;
- 	key = storedKey+"\\Shell\\open\\command";
- 	if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS )
- 		return false;
-diff --git a/src/kvirc/kernel/kvi_coreactionnames.h b/src/kvirc/kernel/kvi_coreactionnames.h
-index 2c211ed..7309e28 100644
---- a/src/kvirc/kernel/kvi_coreactionnames.h
-+++ b/src/kvirc/kernel/kvi_coreactionnames.h
-@@ -45,7 +45,7 @@
- #define KVI_COREACTION_TILEWINDOWS (KVI_COREACTION_NAME_PREFIX "tilewindows")
- #define KVI_COREACTION_MINIMIZEALLWINDOWS (KVI_COREACTION_NAME_PREFIX "minimizeallwindows")
- #define KVI_COREACTION_NEWIRCCONTEXT (KVI_COREACTION_NAME_PREFIX "newirccontext")
--#define KVI_COREACTION_TQUITKVIRC (KVI_COREACTION_NAME_PREFIX "quitkvirc")
-+#define KVI_COREACTION_QUITKVIRC (KVI_COREACTION_NAME_PREFIX "quitkvirc")
- #define KVI_COREACTION_IRCCONTEXTDISPLAY (KVI_COREACTION_NAME_PREFIX "irccontextdisplay")
- #define KVI_COREACTION_SEPARATOR (KVI_COREACTION_NAME_PREFIX "separator")
- #define KVI_COREACTION_CONNECT (KVI_COREACTION_NAME_PREFIX "connect")
-diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
-index fb6fa04..8a66430 100644
---- a/src/kvirc/kernel/kvi_coreactions.cpp
-+++ b/src/kvirc/kernel/kvi_coreactions.cpp
-@@ -427,14 +427,14 @@ void register_core_actions(KviActionManager * m)
- 		"Ctrl+Alt+N");
- 
- 	SLOT_ACTION(
--		KVI_COREACTION_TQUITKVIRC,
-+		KVI_COREACTION_QUITKVIRC,
- 		g_pApp,
- 		TQT_SLOT(quit()),
- 		__tr2qs("Quit KVIrc"),
- 		__tr2qs("Quits KVIrc closing all the current connections"),
- 		KviActionManager::categoryGeneric(),
- 		"kvi_bigicon_quit.png",
--		KVI_SMALLICON_TQUITAPP,
-+		KVI_SMALLICON_QUITAPP,
- 		0,
- 		TQString());
- }
-diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h
-index ef7f44f..9d1267c 100644
---- a/src/kvirc/kernel/kvi_iconmanager.h
-+++ b/src/kvirc/kernel/kvi_iconmanager.h
-@@ -45,7 +45,7 @@
- #define KVI_SMALLICON_DEFAULTICON 5
- #define KVI_SMALLICON_DOCK 6
- #define KVI_SMALLICON_UNDOCK 7
--#define KVI_SMALLICON_TQUITAPP 8
-+#define KVI_SMALLICON_QUITAPP 8
- #define KVI_SMALLICON_CONSOLE 9
- #define KVI_SMALLICON_FLOPPY 10
- #define KVI_SMALLICON_PARSERERROR 11
-@@ -84,8 +84,8 @@
- #define KVI_SMALLICON_DISCARD 44
- #define KVI_SMALLICON_OWNPRIVMSG 45
- #define KVI_SMALLICON_CHANPRIVMSG 46
--#define KVI_SMALLICON_TQUERY 47
--#define KVI_SMALLICON_TQUERYPRIVMSG 48
-+#define KVI_SMALLICON_QUERY 47
-+#define KVI_SMALLICON_QUERYPRIVMSG 48
- #define KVI_SMALLICON_HELP 49
- #define KVI_SMALLICON_MDIHELP 50
- #define KVI_SMALLICON_CTCPREPLY 51
-@@ -95,9 +95,9 @@
- #define KVI_SMALLICON_CTCPREQUESTUNKNOWN 55
- #define KVI_SMALLICON_ACTION 56
- #define KVI_SMALLICON_AVATAR 57
--#define KVI_SMALLICON_TQUIT 58
-+#define KVI_SMALLICON_QUIT 58
- #define KVI_SMALLICON_SPLIT 59
--#define KVI_SMALLICON_TQUITSPLIT 60
-+#define KVI_SMALLICON_QUITSPLIT 60
- #define KVI_SMALLICON_NICK 61
- #define KVI_SMALLICON_DEOP 62
- #define KVI_SMALLICON_DEVOICE 63
-@@ -139,7 +139,7 @@
- #define KVI_SMALLICON_UNLOCKEDOFF 99
- #define KVI_SMALLICON_OWNPRIVMSGCRYPTED 100
- #define KVI_SMALLICON_CHANPRIVMSGCRYPTED 101
--#define KVI_SMALLICON_TQUERYPRIVMSGCRYPTED 102
-+#define KVI_SMALLICON_QUERYPRIVMSGCRYPTED 102
- #define KVI_SMALLICON_DCCCHATMSG 103
- #define KVI_SMALLICON_DCCCHATMSGCRYPTED 104
- #define KVI_SMALLICON_IRC 105
-@@ -192,8 +192,8 @@
- #define KVI_SMALLICON_ALIAS 152
- #define KVI_SMALLICON_CHANNELNOTICE 153
- #define KVI_SMALLICON_CHANNELNOTICECRYPTED 154
--#define KVI_SMALLICON_TQUERYNOTICE 155
--#define KVI_SMALLICON_TQUERYNOTICECRYPTED 156
-+#define KVI_SMALLICON_QUERYNOTICE 155
-+#define KVI_SMALLICON_QUERYNOTICECRYPTED 156
- // FIXME: rename the icon 157: it was colliding with 141
- #define KVI_SMALLICON_SERVNOTICE 157
- #define KVI_SMALLICON_POPUP 158
-@@ -219,7 +219,7 @@
- #define KVI_SMALLICON_LOOK 178
- #define KVI_SMALLICON_INPUT 179
- #define KVI_SMALLICON_MESSAGES 180
--#define KVI_SMALLICON_TQUERYTRACE 181
-+#define KVI_SMALLICON_QUERYTRACE 181
- #define KVI_SMALLICON_NOCHANNEL 182
- #define KVI_SMALLICON_BROADCASTPRIVMSG 183
- #define KVI_SMALLICON_BROADCASTNOTICE 184
-@@ -271,7 +271,7 @@
- #define KVI_SMALLICON_CRY 230
- #define KVI_SMALLICON_EYE 231
- #define KVI_SMALLICON_DEADCHANNEL 232
--#define KVI_SMALLICON_DEADTQUERY 233
-+#define KVI_SMALLICON_DEADQUERY 233
- #define KVI_SMALLICON_SOUND 234
- #define KVI_SMALLICON_TOOLBAR 235
- #define KVI_SMALLICON_TEXTENCODING 236
-diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h
-index 8ac0343..533dfc0 100644
---- a/src/kvirc/kernel/kvi_internalcmd.h
-+++ b/src/kvirc/kernel/kvi_internalcmd.h
-@@ -56,7 +56,7 @@
- #define KVI_INTERNALCOMMAND_POPUPEDITOR_OPEN 29
- #define KVI_INTERNALCOMMAND_EXECUTE_SCRIPT_FROM_DISK 30
- #define KVI_INTERNALCOMMAND_ACTIONEDITOR_OPEN 31
--#define KVI_INTERNALCOMMAND_TQUIT 32
-+#define KVI_INTERNALCOMMAND_QUIT 32
- #define KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU 33
- #define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE 34
- #define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET 35
-diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
-index ec6085a..7f61e5d 100644
---- a/src/kvirc/kernel/kvi_ircconnection.cpp
-+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
-@@ -697,7 +697,7 @@ void KviIrcConnection::resolveLocalHost()
- 		}
- 	} else {
- 		m_pUserInfo->setLocalHostIp(szIp);
--		if(!_OUTPUT_TQUIET)
-+		if(!_OUTPUT_QUIET)
- 			m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Local host address is %Q"),
- 				&(m_pUserInfo->localHostIp()));
- 	}
-diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-index fa3ae79..7c8e12e 100644
---- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
-@@ -189,7 +189,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
- 
- 	if(bValidIp)
- 	{
--		if(!_OUTPUT_TQUIET)
-+		if(!_OUTPUT_QUIET)
- 			m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
- 				__tr2qs("Using cached proxy IP address (%s)"),
- 				m_pTarget->proxy()->m_szIp.ptr());
-@@ -279,7 +279,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *)
- 
- 			for(TQString * addr = m_pProxyDns->hostnameList()->next();addr;addr = m_pProxyDns->hostnameList()->next())
- 			{
--				if(!_OUTPUT_TQUIET)
-+				if(!_OUTPUT_QUIET)
- 					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
- 						__tr2qs("Proxy %Q has a nickname: %Q"),&szFirstHostname,addr);
- 			}
-@@ -317,7 +317,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
- 
- 	if(bValidIp && m_pTarget->server()->cacheIp())
- 	{
--		if(!_OUTPUT_TQUIET)
-+		if(!_OUTPUT_QUIET)
- 			m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
- 				__tr2qs("Using cached server IP address (%s)"),
- 				m_pTarget->server()->m_szIp.utf8().data());
-@@ -395,7 +395,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *)
- 
- 	if(!KviTQString::equalCI(m_pTarget->server()->m_szHostname,m_pServerDns->firstHostname()))
- 	{
--		if(!_OUTPUT_TQUIET)
-+		if(!_OUTPUT_QUIET)
- 			m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
- 				__tr2qs("Real hostname for %Q is %Q"),
- 				&(m_pTarget->server()->m_szHostname),
-@@ -409,7 +409,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *)
- 	{
- 		for(TQString * addr = m_pServerDns->hostnameList()->next();addr;addr = m_pServerDns->hostnameList()->next())
- 		{
--			if(!_OUTPUT_TQUIET)
-+			if(!_OUTPUT_QUIET)
- 				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
- 					__tr2qs("Server %Q has a nickname: %Q"),
- 					&szFirstHostname,addr);
-diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
-index 55c3998..183b46c 100644
---- a/src/kvirc/kernel/kvi_irccontext.cpp
-+++ b/src/kvirc/kernel/kvi_irccontext.cpp
-@@ -698,7 +698,7 @@ void KviIrcContext::connectionTerminated()
- 	pInfo->m_bIsAway=connection()->userInfo()->isAway();
- 	pInfo->m_szAwayReason=connection()->userInfo()->awayReason();
- 
--	// we consider it unexpected when we haven't sent a TQUIT message and we're connected
-+	// we consider it unexpected when we haven't sent a QUIT message and we're connected
- 	// or alternatively when a simulation of such a termination is requested (this is used to keep the queries open etc..)
- 	bool bUnexpectedDisconnect = (!(connection()->stateData()->sentQuit())) && (m_eState == KviIrcContext::Connected) ||
- 									connection()->stateData()->simulateUnexpectedDisconnect();
-@@ -871,7 +871,7 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const TQString &szQui
- 				if(connection())connection()->abort();
- 			} else {
- 				if(!bWasSentQuit)
--					m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent TQUIT, waiting for the server to close the connection..."));
-+					m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent QUIT, waiting for the server to close the connection..."));
- 				// else it was already sent anyway
- 			}
- 		}
-diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
-index 4585276..cf312b2 100644
---- a/src/kvirc/kernel/kvi_ircsocket.cpp
-+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
-@@ -273,7 +273,7 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char *
- 		// check the proxy IP address
- 		if(m_pProxy->isIpV6())
- 		{
--			// IpV6 proxy :) (STILL TQUITE UNTESTED ?)
-+			// IpV6 proxy :) (STILL QUITE UNTESTED ?)
- #ifdef COMPILE_IPV6_SUPPORT
- 			bTargetIpV6 = true;
- 			if(!kvi_isValidStringIp_V6(m_pProxy->ip()))return KviError_invalidProxyAddress;
-@@ -743,7 +743,7 @@ void KviIrcSocket::proxyLoginV5()
- 	// appear in the METHODS field.
- 	// The values currently defined for TQT_METHOD are:
- 	//
--	//      o  X'00' NO AUTHENTICATION RETQUIRED
-+	//      o  X'00' NO AUTHENTICATION REQUIRED
- 	//      o  X'01' GSSAPI
- 	//      o  X'02' USERNAME/PASSWORD
- 	//      o  X'03' CHAP
-@@ -979,7 +979,7 @@ void KviIrcSocket::proxyHandleV5MethodReply(unsigned char reply)
- 	//
- 	// The values currently defined for TQT_METHOD are:
- 	//
--	//      o  X'00' NO AUTHENTICATION RETQUIRED
-+	//      o  X'00' NO AUTHENTICATION REQUIRED
- 	//      o  X'01' GSSAPI
- 	//      o  X'02' USERNAME/PASSWORD
- 	//      o  X'03' CHAP
-diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
-index fce6137..6789f7e 100644
---- a/src/kvirc/kernel/kvi_options.cpp
-+++ b/src/kvirc/kernel/kvi_options.cpp
-@@ -338,7 +338,7 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS]=
- 	STRING_OPTION("Realname",KVI_DEFAULT_REALNAME,KviOption_sectFlagUser),
- 	STRING_OPTION("LocalHostIp","127.0.0.1",KviOption_sectFlagIrcSocket),
- 	STRING_OPTION("PartMessage",KVI_DEFAULT_PART_MESSAGE,KviOption_sectFlagConnection),
--	STRING_OPTION("QuitMessage",KVI_DEFAULT_TQUIT_MESSAGE,KviOption_sectFlagConnection),
-+	STRING_OPTION("QuitMessage",KVI_DEFAULT_QUIT_MESSAGE,KviOption_sectFlagConnection),
- 	STRING_OPTION("UrlHttpCommand",RUN_THE_BROWSER,KviOption_sectFlagUrl),
- 	STRING_OPTION("ExtendedPrivmsgPrefix","[",KviOption_sectFlagIrcView | KviOption_groupTheme),
- 	STRING_OPTION("ExtendedPrivmsgPostfix","] ",KviOption_sectFlagIrcView | KviOption_groupTheme),
-@@ -698,7 +698,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
- 	MSGTYPE_OPTION("Topic",__tr_no_lookup("Topic message"),KVI_SMALLICON_TOPIC,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("OwnPrivateMessage",__tr_no_lookup("Own private message"),KVI_SMALLICON_OWNPRIVMSG,KVI_MSGTYPE_LEVEL_1),
- 	MSGTYPE_OPTION("ChannelPrivateMessage",__tr_no_lookup("Channel private message"),KVI_SMALLICON_CHANPRIVMSG,KVI_MSGTYPE_LEVEL_4),
--	MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KVI_SMALLICON_TQUERYPRIVMSG,KVI_MSGTYPE_LEVEL_4),
-+	MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KVI_SMALLICON_QUERYPRIVMSG,KVI_MSGTYPE_LEVEL_4),
- 	MSGTYPE_OPTION("CtcpReply",__tr_no_lookup("CTCP reply"),KVI_SMALLICON_CTCPREPLY,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("CtcpRequestReplied",__tr_no_lookup("CTCP request replied"),KVI_SMALLICON_CTCPREQUESTREPLIED,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("CtcpRequestIgnored",__tr_no_lookup("CTCP request ignored"),KVI_SMALLICON_CTCPREQUESTIGNORED,KVI_MSGTYPE_LEVEL_3),
-@@ -706,9 +706,9 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
- 	MSGTYPE_OPTION("CtcpRequestUnknown",__tr_no_lookup("CTCP request unknown"),KVI_SMALLICON_CTCPREQUESTUNKNOWN,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("Action",__tr_no_lookup("User action"),KVI_SMALLICON_ACTION,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("AvatarChange",__tr_no_lookup("Avatar change"),KVI_SMALLICON_AVATAR,KVI_MSGTYPE_LEVEL_3),
--	MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KVI_SMALLICON_TQUIT,KVI_MSGTYPE_LEVEL_1),
-+	MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KVI_SMALLICON_QUIT,KVI_MSGTYPE_LEVEL_1),
- 	MSGTYPE_OPTION("Split",__tr_no_lookup("Split message"),KVI_SMALLICON_SPLIT,KVI_MSGTYPE_LEVEL_2),
--	MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KVI_SMALLICON_TQUITSPLIT,KVI_MSGTYPE_LEVEL_2),
-+	MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KVI_SMALLICON_QUITSPLIT,KVI_MSGTYPE_LEVEL_2),
- 	MSGTYPE_OPTION("Nick",__tr_no_lookup("Nick changes"),KVI_SMALLICON_NICK,KVI_MSGTYPE_LEVEL_2),
- 	MSGTYPE_OPTION("Op",__tr_no_lookup("+o mode change"),KVI_SMALLICON_OP,KVI_MSGTYPE_LEVEL_2),
- 	MSGTYPE_OPTION("Deop",__tr_no_lookup("-o mode change"),KVI_SMALLICON_DEOP,KVI_MSGTYPE_LEVEL_2),
-@@ -739,7 +739,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
- 	MSGTYPE_OPTION("NotifyOffLine",__tr_no_lookup("Notify list leaves"),KVI_SMALLICON_NOTIFYOFFLINE,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("OwnPrivmsgCrypted",__tr_no_lookup("Own encrypted private message"),KVI_SMALLICON_OWNPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_1),
- 	MSGTYPE_OPTION("ChanPrivmsgCrypted",__tr_no_lookup("Channel encrypted private message"),KVI_SMALLICON_CHANPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3),
--	MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KVI_SMALLICON_TQUERYPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3),
-+	MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KVI_SMALLICON_QUERYPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("DccChatMsg",__tr_no_lookup("DCC chat message"),KVI_SMALLICON_DCCCHATMSG,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("DccChatMsgCrypted",__tr_no_lookup("Encrypted DCC chat message"),KVI_SMALLICON_DCCCHATMSGCRYPTED,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("Irc",__tr_no_lookup("Login operations completed"),KVI_SMALLICON_IRC,KVI_MSGTYPE_LEVEL_1),
-@@ -751,8 +751,8 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
- 	MSGTYPE_OPTION("IcqMessageSent",__tr_no_lookup("Outgoing ICQ user-message"),KVI_SMALLICON_MESSAGESENT,KVI_MSGTYPE_LEVEL_1),
- 	MSGTYPE_OPTION("ChannelNotice",__tr_no_lookup("Channel notice"),KVI_SMALLICON_CHANNELNOTICE,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("ChannelNoticeCrypted",__tr_no_lookup("Encrypted channel notice"),KVI_SMALLICON_CHANNELNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3),
--	MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KVI_SMALLICON_TQUERYNOTICE,KVI_MSGTYPE_LEVEL_3),
--	MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KVI_SMALLICON_TQUERYNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3),
-+	MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KVI_SMALLICON_QUERYNOTICE,KVI_MSGTYPE_LEVEL_3),
-+	MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KVI_SMALLICON_QUERYNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("ServerNotice",__tr_no_lookup("Server notice"),KVI_SMALLICON_SERVERNOTICE,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("HalfOp",__tr_no_lookup("Halfop mode change"),KVI_SMALLICON_HALFOP,KVI_MSGTYPE_LEVEL_2),
- 	MSGTYPE_OPTION("CtcpReplyUnknown",__tr_no_lookup("Unknown CTCP reply"),KVI_SMALLICON_CTCPREPLYUNKNOWN,KVI_MSGTYPE_LEVEL_3),
-@@ -764,7 +764,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
- 	MSGTYPE_OPTION("HalfDeOp",__tr_no_lookup("Half-deop mode change"),KVI_SMALLICON_HALFDEOP,KVI_MSGTYPE_LEVEL_2),
- 	MSGTYPE_OPTION("Invite",__tr_no_lookup("Invite message"),KVI_SMALLICON_INVITE,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("Multimedia",__tr_no_lookup("Multimedia message"),KVI_SMALLICON_MULTIMEDIA,KVI_MSGTYPE_LEVEL_2),
--	MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KVI_SMALLICON_TQUERYTRACE,KVI_MSGTYPE_LEVEL_1),
-+	MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KVI_SMALLICON_QUERYTRACE,KVI_MSGTYPE_LEVEL_1),
- 	MSGTYPE_OPTION("Wallops",__tr_no_lookup("Wallops message"),KVI_SMALLICON_WALLOPS,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("JoinError",__tr_no_lookup("Join error message"),KVI_SMALLICON_NOCHANNEL,KVI_MSGTYPE_LEVEL_3),
- 	MSGTYPE_OPTION("BroadcastPrivmsg",__tr_no_lookup("Broadcast private message"),KVI_SMALLICON_BROADCASTPRIVMSG,KVI_MSGTYPE_LEVEL_3),
-diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
-index 1395aba..881042c 100644
---- a/src/kvirc/kernel/kvi_options.h
-+++ b/src/kvirc/kernel/kvi_options.h
-@@ -641,14 +641,14 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
- // Verbosity constants
- 
- #define KVI_VERBOSITY_LEVEL_MUTE 0
--#define KVI_VERBOSITY_LEVEL_TQUIET 1
-+#define KVI_VERBOSITY_LEVEL_QUIET 1
- #define KVI_VERBOSITY_LEVEL_NORMAL 2
- #define KVI_VERBOSITY_LEVEL_VERBOSE 3
- #define KVI_VERBOSITY_LEVEL_PARANOIC 4
- 
- #define _OUTPUT_PARANOIC (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) >= KVI_VERBOSITY_LEVEL_PARANOIC)
- #define _OUTPUT_VERBOSE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) >= KVI_VERBOSITY_LEVEL_VERBOSE)
--#define _OUTPUT_TQUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_TQUIET)
-+#define _OUTPUT_QUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_QUIET)
- #define _OUTPUT_MUTE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_MUTE)
- 
- #ifdef COMPILE_USE_QT4
-diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h
-index 9a5bdc0..7482906 100644
---- a/src/kvirc/kernel/kvi_out.h
-+++ b/src/kvirc/kernel/kvi_out.h
-@@ -50,7 +50,7 @@
- #define KVI_OUT_TOPIC 23
- #define KVI_OUT_OWNPRIVMSG 24
- #define KVI_OUT_CHANPRIVMSG 25
--#define KVI_OUT_TQUERYPRIVMSG 26
-+#define KVI_OUT_QUERYPRIVMSG 26
- #define KVI_OUT_CTCPREPLY 27
- #define KVI_OUT_CTCPREQUESTREPLIED 28
- #define KVI_OUT_CTCPREQUESTIGNORED 29
-@@ -58,9 +58,9 @@
- #define KVI_OUT_CTCPREQUESTUNKNOWN 31
- #define KVI_OUT_ACTION 32
- #define KVI_OUT_AVATAR 33
--#define KVI_OUT_TQUIT 34
-+#define KVI_OUT_QUIT 34
- #define KVI_OUT_SPLIT 35
--#define KVI_OUT_TQUITSPLIT 36
-+#define KVI_OUT_QUITSPLIT 36
- #define KVI_OUT_NICK 37
- #define KVI_OUT_OP 38
- #define KVI_OUT_DEOP 39
-@@ -91,7 +91,7 @@
- #define KVI_OUT_NOTIFYOFFLINE 64
- #define KVI_OUT_OWNPRIVMSGCRYPTED 65
- #define KVI_OUT_CHANPRIVMSGCRYPTED 66
--#define KVI_OUT_TQUERYPRIVMSGCRYPTED 67
-+#define KVI_OUT_QUERYPRIVMSGCRYPTED 67
- #define KVI_OUT_DCCCHATMSG 68
- #define KVI_OUT_DCCCHATMSGCRYPTED 69
- #define KVI_OUT_IRC 70
-@@ -103,8 +103,8 @@
- #define KVI_OUT_ICTQMESSAGESENT 76
- #define KVI_OUT_CHANNELNOTICE 77
- #define KVI_OUT_CHANNELNOTICECRYPTED 78
--#define KVI_OUT_TQUERYNOTICE 79
--#define KVI_OUT_TQUERYNOTICECRYPTED 80
-+#define KVI_OUT_QUERYNOTICE 79
-+#define KVI_OUT_QUERYNOTICECRYPTED 80
- #define KVI_OUT_SERVERNOTICE 81
- #define KVI_OUT_HALFOP 82
- #define KVI_OUT_CTCPREPLYUNKNOWN 83
-@@ -116,7 +116,7 @@
- #define KVI_OUT_HALFDEOP 89
- #define KVI_OUT_INVITE 90
- #define KVI_OUT_MULTIMEDIA 91
--#define KVI_OUT_TQUERYTRACE 92
-+#define KVI_OUT_QUERYTRACE 92
- #define KVI_OUT_WALLOPS 93
- #define KVI_OUT_JOINERROR 94
- #define KVI_OUT_BROADCASTPRIVMSG 95
-diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
-index 0bf241d..3f4dbbc 100644
---- a/src/kvirc/kernel/kvi_userinput.cpp
-+++ b/src/kvirc/kernel/kvi_userinput.cpp
-@@ -127,7 +127,7 @@ namespace KviUserInput
- 					pWindow->output(KVI_OUT_PARSERERROR,__tr2qs("You are not connected to a server"));
- 				break;
- 				case KVI_WINDOW_TYPE_CHANNEL:
--				case KVI_WINDOW_TYPE_TQUERY:
-+				case KVI_WINDOW_TYPE_QUERY:
- 					if(pWindow->connection())
- 					{
- 						if(KVI_OPTION_BOOL(KviOption_boolExitAwayOnInput)) 
-diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
-index 7a675d2..93880f5 100644
---- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
-@@ -347,7 +347,7 @@ namespace KviKvsCoreCallbackCommands
- 			KVSCCC_PARAMETER("magic",KVS_PT_VARIANT,KVS_PF_OPTIONAL,pMagic)
- 		KVSCCC_PARAMETERS_END
- 
--		KVSCCC_RETQUIRE_CONNECTION
-+		KVSCCC_REQUIRE_CONNECTION
- 
- 		KviTQCString szN = KVSCCC_pConnection->encodeText(szNick);
- 
-@@ -883,7 +883,7 @@ namespace KviKvsCoreCallbackCommands
- 					{
- 						[comment]# We don't wait anymore :)[/comment]
- 						%:state++
--						echo "Sending TQUIT..."
-+						echo "Sending QUIT..."
- 						return "QUIT$cr$lf"
- 					}
- 					break;
-diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
-index 478358d..ce77ec6 100644
---- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
-+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
-@@ -48,7 +48,7 @@
- 	KVS_PARAMETERS_END \
- 	if(!KviKvsParameterProcessor::process(KVSCCC_pParams,KVSCCC_pContext,parameter_format_list))return false;
- 
--#define KVSCCC_RETQUIRE_CONNECTION \
-+#define KVSCCC_REQUIRE_CONNECTION \
- 	if(!KVSCCC_pContext->window()->context())return KVSCCC_pContext->errorNoIrcContext(); \
- 	if(!KVSCCC_pContext->window()->connection())return KVSCCC_pContext->warningNoIrcConnection();
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
-index 00d8d2d..6968c1e 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
-@@ -496,7 +496,7 @@ namespace KviKvsCoreFunctions
- 				}
- 			}
- 		} else {
--			if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_TQUERY)wnd = KVSCF_pContext->window();
-+			if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_QUERY)wnd = KVSCF_pContext->window();
- 		}
- 
- 		KVSCF_pRetBuffer->setInteger((kvs_int_t)(wnd ? wnd->numericId() : 0));
-diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-index e56abbe..5b1c60d 100644
---- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
-@@ -73,7 +73,7 @@ namespace KviKvsCoreFunctions
- {
- 	/////////////////////////////////////////////////////////////////////////////////////////
- 
--	// FIXME: #warning "THIS HAS TO WORK FOR TQUERIES TOO!"
-+	// FIXME: #warning "THIS HAS TO WORK FOR QUERIES TOO!"
- 	/*
- 		@doc: selected
- 		@type:
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
-index 97a669f..c1cc418 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
-@@ -146,7 +146,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("tokens",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szTokens)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL)
- 		{
-@@ -222,7 +222,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviTQCString txt = KVSCSC_pConnection->encodeText(szText);
- 		KviTQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName());
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
-index 9c773a9..94acbdc 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
-@@ -46,7 +46,7 @@
- 	KVS_PARAMETERS_END \
- 	if(!KviKvsParameterProcessor::process(KVSCSC_pParams,KVSCSC_pContext,parameter_format_list))return false;
- 
--#define KVSCSC_RETQUIRE_CONNECTION \
-+#define KVSCSC_REQUIRE_CONNECTION \
- 	if(!KVSCSC_pContext->window()->context())return KVSCSC_pContext->errorNoIrcContext(); \
- 	if(!KVSCSC_pContext->window()->connection())return KVSCSC_pContext->warningNoIrcConnection();
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-index 398b11c..6eb820e 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
-@@ -118,7 +118,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		if(szReason.isEmpty())szReason = KVI_OPTION_STRING(KviOption_stringAwayMessage);
- 	
-@@ -190,7 +190,7 @@ namespace KviKvsCoreSimpleCommands
- 				++it;
- 			}
- 		} else {
--			KVSCSC_RETQUIRE_CONNECTION
-+			KVSCSC_REQUIRE_CONNECTION
- 	
- 			if(!(KVSCSC_pConnection->sendFmtData("AWAY")))
- 				return KVSCSC_pContext->warningNoIrcConnection();
-@@ -514,7 +514,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("ctcp_data",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szCtcpData)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 		
- 		if(KviTQString::equalCI(szCtcpData,"PING"))
- 		{
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
-index e787cf2..c46ecb2 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
-@@ -389,7 +389,7 @@ try_again:
- 			KVSCSC_PARAMETER("keys",KVS_PT_STRING,KVS_PF_OPTIONAL,szKeys)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		TQStringList slChans = TQStringList::split(",",szChans);
- 
-@@ -458,7 +458,7 @@ try_again:
- 			KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL)
- 		{
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
-index e79fb9b..d398b18 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
-@@ -83,12 +83,12 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		switch(KVSCSC_pWindow->type())
- 		{
- 			case KVI_WINDOW_TYPE_CHANNEL:
--			case KVI_WINDOW_TYPE_TQUERY:
-+			case KVI_WINDOW_TYPE_QUERY:
- 			case KVI_WINDOW_TYPE_DCCCHAT:
- 				KVSCSC_pWindow->ownAction(szText);
- 			break;
-@@ -130,7 +130,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviTQCString szTxt = KVSCSC_pConnection->encodeText(szText);
- 
-@@ -217,7 +217,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviTQCString szData = KVSCSC_pConnection->encodeText(szNick);
- 		if(!szData.data())szData = "";
-@@ -265,7 +265,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviWindow * w = KVSCSC_pConnection->findChannel(szTarget);
- 		if(!w)w = KVSCSC_pConnection->findQuery(szTarget);
-@@ -705,7 +705,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("part_message",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szMsg)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		if(szChans.isEmpty())
- 		{
-@@ -940,7 +940,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviWindow * w = KVSCSC_pConnection->findChannel(szTarget);
- 		if(!w)w = KVSCSC_pConnection->findQuery(szTarget);
-@@ -1000,7 +1000,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviQuery * query;
- 		
-@@ -1053,21 +1053,21 @@ namespace KviKvsCoreSimpleCommands
- 			!sw: -q | --quit
- 			Terminates this KVIrc application instance
- 			!sw: -f | --force
--			Forces the immediate termination of the current IRC session (The TQUIT message may be not sent)
-+			Forces the immediate termination of the current IRC session (The QUIT message may be not sent)
- 			!sw: -u | --unexpected
- 			Simulates an "unexpected disconnection"
- 		@description:
- 			Terminates the current IRC session.[br]
--			By default this command sends a TQUIT message 
-+			By default this command sends a QUIT message 
- 			and waits for the server to close the connection.[br]
- 			If you want to force KVIrc to close the connection 
--			immediately after sending the TQUIT message you must use the -f switch.[br]
-+			immediately after sending the QUIT message you must use the -f switch.[br]
- 			Forcing the connection may cause your quit message to not be 
- 			displayed to the other IRC users: most likely it will be replaced 
- 			by a 'Connection reset by peer' or a 'EOF from client'.[br]
- 			If the -u switch is specified then an "unexpected disconnection" will be simulated
- 			and all the related options will be applied (e.g. automatic reconnection,
--			channels and queries kept open etc..). The TQUIT message will be still sent unless
-+			channels and queries kept open etc..). The QUIT message will be still sent unless
- 			the -f switch is used. You can control all the "unexpected
- 			disconnection" options in the options dialog.
- 			If the -q switch is specified , this command terminates KVIrc immediately.[br]
-@@ -1088,7 +1088,7 @@ namespace KviKvsCoreSimpleCommands
- 		{
- 			TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit()));
- 		} else {
--			KVSCSC_RETQUIRE_CONNECTION
-+			KVSCSC_REQUIRE_CONNECTION
- 			KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected"));
- 		}	
- 		return true;
-@@ -1175,7 +1175,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("raw_command",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szRawCommand)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		KviTQCString szData = KVSCSC_pConnection->encodeText(szRawCommand);
- 		if(!szData.data())szData = "";
-diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-index 85c6c5c..6bfa61a 100644
---- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
-@@ -595,7 +595,7 @@ namespace KviKvsCoreSimpleCommands
- 			KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic)
- 		KVSCSC_PARAMETERS_END
- 
--		KVSCSC_RETQUIRE_CONNECTION
-+		KVSCSC_REQUIRE_CONNECTION
- 
- 		if(szChannel.isEmpty())
- 		{
-diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-index b2fc61b..4b8c8c9 100644
---- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
-@@ -842,7 +842,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
- 			Console
- 		@description:
- 			Triggered when an user is quitting IRC.[br]
--			The TQUIT message has already been processed by the server , so
-+			The QUIT message has already been processed by the server , so
- 			the user is effectively no longer on IRC.
- 			On the other side, it might be useful to access the user-related data from
- 			this event, thus the handler is called effectively just BEFORE the
-@@ -2797,11 +2797,11 @@ channel
- 			Triggered when the user requests a disconnection from
- 			a server by pressing the "disconnect", by closing
- 			the console or closing KVIrc. It is your last chance
--			to send some meaningful data to the server before the TQUIT message
-+			to send some meaningful data to the server before the QUIT message
- 			is sent. You can't prevent the user from disconnecting: [cmd]halt [/cmd]does nothing here.[br]
- 			This event is useful to either give a salute to all the users
- 			you were talking with or maybe to send some commands to the
--			bouncer you're connected to. Note that you can override the TQUIT
-+			bouncer you're connected to. Note that you can override the QUIT
- 			message sent by KVIrc by sending it by youself first.[br]
- 		@seealso:
- 	*/
-diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
-index 0b47154..83f08ce 100644
---- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h
-+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
-@@ -219,7 +219,7 @@ protected:
- 	KVS_PARAMETERS_END \
- 	if(!KviKvsParameterProcessor::process(pCall->params(),pCall->context(),parameter_format_list))return false;
- 
--#define KVSM_RETQUIRE_CONNECTION(pCall) \
-+#define KVSM_REQUIRE_CONNECTION(pCall) \
- 	if(!pCall->window()->context())return c->context()->errorNoIrcContext(); \
- 	if(!pCall->window()->connection())return c->context()->warningNoIrcConnection();
- 
-diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
-index e5ff0a5..87f405f 100644
---- a/src/kvirc/kvs/kvi_kvs_object.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
-@@ -85,7 +85,7 @@
- 		by the programmer; the name is just a mnemonic expedient, and
- 		you may also not need it.[br][br]
- 
--		Each object is identified by an [b]OPAQUE UNITQUE ID[/b].
-+		Each object is identified by an [b]OPAQUE UNIQUE ID[/b].
- 		The ID is assigned by KVIrc and can be held in any variable.
- 		You can think the object id as a "handle for the object" or the object's pointer.
- 		Any action performed on the object will require its ID.[br][br]
-diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
-index 61a4151..67edb21 100644
---- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
-+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
-@@ -726,7 +726,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorGreaterThan::evaluateReadOnly(KviKvsR
- 	return true;
- }
- 
--PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWERORETQUALTO)
-+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWEROREQUALTO)
- 
- bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
- {
-@@ -738,7 +738,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviK
- 	return true;
- }
- 
--PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATERORETQUALTO)
-+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATEROREQUALTO)
- 
- bool KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
- {
-@@ -763,7 +763,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorEqualTo::evaluateReadOnly(KviKvsRunTi
- }
- 
- 
--PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTETQUALTO)
-+PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTEQUALTO)
- 
- bool KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
- {
-diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
-index 6688f5b..d4fb355 100644
---- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h
-+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
-@@ -56,10 +56,10 @@
- 
- #define PREC_OP_EQUALTO 12              /* == */ /* Case sensitive comparison for strings or normal comp.fr numbers */
- 
--#define PREC_OP_GREATERORETQUALTO 14     /* >= */ /* Case sensitive (normal for numbers) */
--#define PREC_OP_LOWERORETQUALTO 14       /* <= */ /* Case sensitive (normal for numbers) */
-+#define PREC_OP_GREATEROREQUALTO 14     /* >= */ /* Case sensitive (normal for numbers) */
-+#define PREC_OP_LOWEROREQUALTO 14       /* <= */ /* Case sensitive (normal for numbers) */
- 
--#define PREC_OP_NOTETQUALTO 15           /* != */ /* Case sensitive (normal for numbers) */
-+#define PREC_OP_NOTEQUALTO 15           /* != */ /* Case sensitive (normal for numbers) */
- 
- #define PREC_OP_AND 16                  /* && */
- #define PREC_OP_OR 17                   /* || */
-diff --git a/src/kvirc/sparser/kvi_antispam.cpp b/src/kvirc/sparser/kvi_antispam.cpp
-index 9aafcfb..2dcfe33 100644
---- a/src/kvirc/sparser/kvi_antispam.cpp
-+++ b/src/kvirc/sparser/kvi_antispam.cpp
-@@ -56,7 +56,7 @@
- // Ideas:
- // - A spam message is generally a single PRIVMSG <mynick> :<text>
- //		so this function should be (and is) called when
--//		a PRIVMSG is received from a person that has no TQUERY
-+//		a PRIVMSG is received from a person that has no QUERY
- //		window open yet.
- // - 95% of spam messages contain an URL inside (http,ftp,www) or a channel name.
- // - The other 5% contain words like auto-msg , msg me or query <nickname>
-diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h
-index 0e05775..32e388d 100644
---- a/src/kvirc/sparser/kvi_numeric.h
-+++ b/src/kvirc/sparser/kvi_numeric.h
-@@ -280,7 +280,7 @@
- #define ERR_WILDTOPLEVEL     414 /* "%s :Wildcard in toplevel Domain" [I,E,U,D] */
- #define ERR_BADMASK          415 /* ??? [I] */
- //#define ERR_TOOMANYTARGETS 416 /* Can not understand this ... but I've found it in some docs [I] */
--#define ERR_TQUERYTOOLONG     416 /* "<target> <erroneous command> :Too many lines in the output, please restrict your query [U] */
-+#define ERR_QUERYTOOLONG     416 /* "<target> <erroneous command> :Too many lines in the output, please restrict your query [U] */
- //      ERR_??????????   417-420
- #define ERR_UNKNOWNCOMMAND   421 /* "%s :Unknown command"                                [I,E,U,D] # */
- #define ERR_NOMOTD           422 /* ":MOTD File is missing" [I,E,U,D] */
-diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-index df42662..93b1b2c 100644
---- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
-+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
-@@ -24,7 +24,7 @@
- 
- #define __KVIRC__
- // FIXME: #warning "CTCP BEEP == WAKEUP == AWAKE"
--// FIXME: #warning "CTCP AVATARREQ or TQUERYAVATAR"
-+// FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR"
- 
- #include "kvi_mirccntrl.h"
- #include "kvi_osinfo.h"
-diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
-index d488c8f..43efeb4 100644
---- a/src/kvirc/sparser/kvi_sp_literal.cpp
-+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
-@@ -262,7 +262,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
- 			}
- 		}
- 
--		// MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL TQUERY
-+		// MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL QUERY
- 		// so we get RPL_ENDOFBANLIST as the last reply
- 		// and we know that the channel is in sync
- 
-@@ -326,7 +326,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
- 	{
- 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
- 		{
--			q->output(KVI_OUT_TQUERYTRACE,
-+			q->output(KVI_OUT_QUERYTRACE,
- 				__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"),&szNick,&szUser,
- 				&szHost,&channel);
- 			q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans);
-@@ -422,11 +422,11 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
- 			if(q)
- 			{
- 				if(!partMsg.isEmpty())
--					q->output(KVI_OUT_TQUERYTRACE,
-+					q->output(KVI_OUT_QUERYTRACE,
- 						__tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"),
- 						&szNick,&szUser,&szHost,&szChan,&partMsg);
- 				else
--					q->output(KVI_OUT_TQUERYTRACE,
-+					q->output(KVI_OUT_QUERYTRACE,
- 						__tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"),
- 						&szNick,&szUser,&szHost,&szChan);
- 				q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans);
-@@ -437,14 +437,14 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- //
--// TQUIT
-+// QUIT
- //
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- 
- void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
- {
--	// TQUIT
--	// :<source_mask> TQUIT :<quit message>
-+	// QUIT
-+	// :<source_mask> QUIT :<quit message>
- 	TQString szNick,szUser,szHost;
- 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
- 
-@@ -548,7 +548,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
- 					quitMsg.prepend("NETSPLIT ");
- 				}
- 
--				if(!msg->haltOutput())c->output(KVI_OUT_TQUIT,
-+				if(!msg->haltOutput())c->output(KVI_OUT_QUIT,
- 						__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"),
- 						&szNick,&szUser,&szHost,&quitMsg);
- 			}
-@@ -565,7 +565,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
- 			{
- 				quitMsg.prepend("NETSPLIT ");
- 			}
--			q->output(KVI_OUT_TQUIT,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"),
-+			q->output(KVI_OUT_QUIT,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"),
- 					&szNick,&szUser,&szHost,&quitMsg);
- 		}
- 	}
-@@ -684,7 +684,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
- 			{
- 				TQString szChans;
- 				int iChans = console->connection()->getCommonChannels(victim,szChans);
--				q->output(KVI_OUT_TQUERYTRACE,
-+				q->output(KVI_OUT_QUERYTRACE,
- 					__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
- 					&victim,&szVUser,&szVHost,&szChan,
- 					&szNick,&szUser,&szHost,&szKickMsg);
-@@ -886,7 +886,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
- 			query->userAction(szNick,szUser,szHost,KVI_USERACTION_PRIVMSG);
- 			// decrypt the message if needed
- 			KviStr szBuffer; const char * txtptr; int msgtype;
--			DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_TQUERYPRIVMSG,KVI_OUT_TQUERYPRIVMSGCRYPTED,szBuffer,txtptr,msgtype)
-+			DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_QUERYPRIVMSG,KVI_OUT_QUERYPRIVMSGCRYPTED,szBuffer,txtptr,msgtype)
- 			// trigger the script event and eventually kill the output
- 			TQString szMsgText = query->decodeText(txtptr);
- 			if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryMessage,query,szNick,szUser,szHost,szMsgText)) 
-@@ -922,7 +922,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
- 							TQString szMsg = TQStyleSheet::escape(szMsgText);
- 						#endif
- 						//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
--						g_pApp->notifierMessage(query,KVI_SMALLICON_TQUERYPRIVMSG,szMsg,1800);
-+						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,1800);
- 					}
- 				}
- 				console->outputPrivmsg(query,msgtype,szNick,szUser,szHost,szMsgText,iFlags);
-@@ -963,7 +963,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
- 					}
- 				}
- 
--				pOut->output(KVI_OUT_TQUERYPRIVMSG,"[PRIVMSG \r!nc\r%Q\r]: %Q",&szNick,&szMsgText);
-+				pOut->output(KVI_OUT_QUERYPRIVMSG,"[PRIVMSG \r!nc\r%Q\r]: %Q",&szNick,&szMsgText);
- 			}
- 		}
- 	} else {
-@@ -1252,7 +1252,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
- 			query->userAction(szNick,szUser,szHost,KVI_USERACTION_NOTICE);
- 			// decrypt it if needed
- 			KviStr szBuffer; const char * txtptr; int msgtype;
--			DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_TQUERYNOTICE,KVI_OUT_TQUERYNOTICECRYPTED,szBuffer,txtptr,msgtype)
-+			DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_QUERYNOTICE,KVI_OUT_QUERYNOTICECRYPTED,szBuffer,txtptr,msgtype)
- 			TQString szMsgText = query->decodeText(txtptr);
- 			// trigger the script event and eventually kill the output
- 			if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryNotice,query,szNick,szUser,szHost,szMsgText)) 
-@@ -1280,7 +1280,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
- 							TQString szMsg = TQStyleSheet::escape(szMsgText);
- 						#endif
- 						//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
--						g_pApp->notifierMessage(query,KVI_SMALLICON_TQUERYNOTICE,szMsg,1800);
-+						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,1800);
- 					}
- 				}
- 
-@@ -1313,7 +1313,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
- 					}
- 				}
- 
--				pOut->output(KVI_OUT_TQUERYNOTICE,"*\r!n\r%Q\r* %Q",&szNick,&szMsgText);
-+				pOut->output(KVI_OUT_QUERYNOTICE,"*\r!n\r%Q\r* %Q",&szNick,&szMsgText);
- 			}
- 		}
- 		return;
-@@ -1465,15 +1465,15 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
- 	}
- 	KviQuery * q = console->connection()->findQuery(szNick);
- 	// It CAN happen that szNewNick first queries us without being
--	// on any channel then he TQUITS , he reconnects , he joins
-+	// on any channel then he QUITS , he reconnects , he joins
- 	// a channel with szNick , queries us and changes nick to szNewNick : gotcha!
- 	// should merge the queries!
- 	KviQuery * old = console->connection()->findQuery(szNewNick);
- 	if(old && (old != q))
- 	{
--		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_TQUIET))
-+		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_QUIET))
- 		{
--		old->output(KVI_OUT_TQUERYTRACE,
-+		old->output(KVI_OUT_QUERYTRACE,
- 			__tr2qs("The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h\r%Q\r] changed his nickname to \r!n\r%Q\r"),
- 			&szNick,&szUser,&szHost,&szNewNick);
- 		}
-diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
-index efa5220..f3429d6 100644
---- a/src/kvirc/sparser/kvi_sp_numeric.cpp
-+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
-@@ -141,7 +141,7 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg)
- 		(chanmodes.occurences('t') != 1) || (chanmodes.occurences('n') != 1) ||
- 		(chanmodes.contains('.')) || (chanmodes.contains('-')) || (chanmodes.contains('(')))
- 	{
--		if(!_OUTPUT_TQUIET)
-+		if(!_OUTPUT_QUIET)
- 		{
- 			msg->console()->output(KVI_OUT_SYSTEMWARNING,__tr2qs(
- 				"One or more standard mode flags are missing in the server available modes.\n" \
-diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
-index e9e560b..6769d00 100644
---- a/src/kvirc/ui/kvi_console.cpp
-+++ b/src/kvirc/ui/kvi_console.cpp
-@@ -200,7 +200,7 @@ bool KviConsole::connectionInProgress()
- 
- KviConsole::~KviConsole()
- {
--	// FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /TQUIT $option() so the idents are parsed!"
-+	// FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /QUIT $option() so the idents are parsed!"
- 
- 	// Force connection close: it will just return if no connection is present
- 	context()->terminateConnectionRequest(true);
-@@ -267,7 +267,7 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p)
- 		p->insertSeparator();
- 		id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQT_SLOT(partAllChannels()));
- 		if(!cc)p->setItemEnabled(id,false);
--		id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries()));
-+		id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries()));
- 		if(!qc)p->setItemEnabled(id,false);
- 	}
- 
-@@ -728,7 +728,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
- 
- 	bool bIsChan = (wnd->type() == KVI_WINDOW_TYPE_CHANNEL);
- 	bool bIsNotice = ((type == KVI_OUT_CHANNELNOTICE)||(type == KVI_OUT_CHANNELNOTICECRYPTED) \
--		   ||(type == KVI_OUT_TQUERYNOTICE)||(type == KVI_OUT_TQUERYNOTICECRYPTED));
-+		   ||(type == KVI_OUT_QUERYNOTICE)||(type == KVI_OUT_QUERYNOTICECRYPTED));
- 
- 	TQString nick = daNick; // not that beautiful.. :/
- 	TQString user = daUser;
-@@ -882,7 +882,7 @@ void KviConsole::avatarChangedUpdateWindows(const TQString &nick,const TQString
- 	if(!connection())return; //ops...
- 
- 	// in quiet mode avoid bugging the user about avatar changes
--	bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_TQUIET)));
-+	bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_QUIET)));
- 
- 	for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
- 	{
-diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
-index 94afb59..1d5f12b 100644
---- a/src/kvirc/ui/kvi_input.cpp
-+++ b/src/kvirc/ui/kvi_input.cpp
-@@ -845,12 +845,12 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e)
- 		id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,TQT_SLOT(pasteClipboardWithConfirmation()));
- 		g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly);
- 		id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,TQT_SLOT(pasteSlow()));
--		if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_TQUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT))
-+		if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_QUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT))
- 			g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly);
- 		else 
- 			g_pInputPopup->setItemEnabled(id,false);
- 		id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,TQT_SLOT(pasteFile()));
--		if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_TQUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT))
-+		if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_QUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT))
- 			g_pInputPopup->setItemEnabled(id,false);
- 		else
- 			g_pInputPopup->setItemEnabled(id,!m_bReadOnly);
-@@ -2353,7 +2353,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
- 	}
- 	else
- 	{
--		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small);
-+		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),TQIconSet::Small);
- 		m_pHistoryButton->setIconSet(is1);
- 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
- 	}
-@@ -2639,7 +2639,7 @@ void KviInput::applyOptions()
- 	if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005
- 	{
- 		TQIconSet is1;
--		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small);
-+		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),TQIconSet::Small);
- 		m_pHistoryButton->setIconSet(is1);
- 		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
- 		m_pHistoryButton->disconnect(TQT_SIGNAL(clicked()));
-diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
-index 1ddf275..ec65b9c 100644
---- a/src/kvirc/ui/kvi_ircview.cpp
-+++ b/src/kvirc/ui/kvi_ircview.cpp
-@@ -2285,7 +2285,7 @@ found_command_escape:
- 									}
- 								}
- 							}
--							else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_TQUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c')
-+							else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_QUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c')
- 							{
- 								TQString m_szNick = TQString((TQChar*)next_cr,term_cr-next_cr);
- 								if(m_szNick==m_pKviWindow->connection()->currentNickName()) {
-@@ -2586,10 +2586,10 @@ check_emoticon_char:
- 		case KVI_OUT_CHANPRIVMSG:
- 		case KVI_OUT_ACTION:
- 		case KVI_OUT_OWNPRIVMSG:
--		case KVI_OUT_TQUERYPRIVMSG:
--		case KVI_OUT_TQUERYPRIVMSGCRYPTED:
--		case KVI_OUT_TQUERYNOTICE:
--		case KVI_OUT_TQUERYNOTICECRYPTED:
-+		case KVI_OUT_QUERYPRIVMSG:
-+		case KVI_OUT_QUERYPRIVMSGCRYPTED:
-+		case KVI_OUT_QUERYNOTICE:
-+		case KVI_OUT_QUERYNOTICECRYPTED:
- 		case KVI_OUT_CHANPRIVMSGCRYPTED:
- 		case KVI_OUT_CHANNELNOTICE:
- 		case KVI_OUT_CHANNELNOTICECRYPTED:
-@@ -4492,7 +4492,7 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
- 						KVS_TRIGGER_EVENT(KviEvent_OnChannelNickDefaultActionRequest,m_pKviWindow,pParams);
- 					} else bTrigger = true;
- 				break;
--				case KVI_WINDOW_TYPE_TQUERY:
-+				case KVI_WINDOW_TYPE_QUERY:
- 					if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText))
- 					{
- 						KVS_TRIGGER_EVENT(KviEvent_OnQueryNickDefaultActionRequest,m_pKviWindow,pParams);
-@@ -4695,7 +4695,7 @@ void KviIrcView::mouseRealPressEvent(TQMouseEvent *e)
- 									}
- 								} else bTrigger = true;
- 							break;
--							case KVI_WINDOW_TYPE_TQUERY:
-+							case KVI_WINDOW_TYPE_QUERY:
- 								if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText))
- 								{
- 									if(e->button() & Qt::RightButton)
-diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
-index 74bbbe7..d2104dd 100644
---- a/src/kvirc/ui/kvi_menubar.cpp
-+++ b/src/kvirc/ui/kvi_menubar.cpp
-@@ -222,8 +222,8 @@ void KviMenuBar::setupMainPopup()
- 	if(m_pFrm->activeContext())
- 		if(m_pFrm->activeContext()->state()==KviIrcContext::Connected)
- 		{
--			int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs("Disconnect"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
--			main->setItemParameter(id,KVI_INTERNALCOMMAND_TQUIT);
-+			int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
-+			main->setItemParameter(id,KVI_INTERNALCOMMAND_QUIT);
- 		}
- 	main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs("New &Connection To"),m_pRecentServersPopup);
- 
-@@ -242,7 +242,7 @@ void KviMenuBar::setupMainPopup()
- #ifndef Q_OS_MACX
- 	main->insertSeparator();
- 
--	main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
-+	main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
- #endif //Q_OS_MACX
- }
- 
-diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
-index 0d133bd..2c1e1b8 100644
---- a/src/kvirc/ui/kvi_query.cpp
-+++ b/src/kvirc/ui/kvi_query.cpp
-@@ -63,7 +63,7 @@
- #include "kvi_valuelist.h"
- 
- KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick)
--: KviWindow(KVI_WINDOW_TYPE_TQUERY,lpFrm,nick,lpConsole)
-+: KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole)
- {
- 
- 	m_iFlags = 0;
-@@ -118,7 +118,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick)
- KviQuery::~KviQuery()
- {
- 	m_pUserListView->partAll();
--	if(type() == KVI_WINDOW_TYPE_DEADTQUERY)
-+	if(type() == KVI_WINDOW_TYPE_DEADQUERY)
- 		context()->unregisterDeadQuery(this);
- 	else
- 		connection()->unregisterQuery(this);
-@@ -316,7 +316,7 @@ void KviQuery::notifyTargetChange(const TQString &oldNick,const TQString &oldUse
- 	TQString oldN = oldNick.isEmpty() ? TQString("*") : oldNick;
- 	TQString oldU = oldUser.isEmpty() ? TQString("*") : oldUser;
- 	TQString oldH = oldHost.isEmpty() ? TQString("*") : oldHost;
--	output(KVI_OUT_TQUERYTRACE,
-+	output(KVI_OUT_QUERYTRACE,
- 		__tr2qs("The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
- 		&oldN,&oldU,&oldH,&nick,&user,&host);
- 	updateLabelText();
-@@ -386,10 +386,10 @@ void KviQuery::notifyCommonChannels(const TQString &nick,const TQString &user,co
- 	static TQString star("*");
- 	if(iChans > 0)
- 	{
--		output(KVI_OUT_TQUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
-+		output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),
- 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host,&szChans);
- 	} else {
--		output(KVI_OUT_TQUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
-+		output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"),
- 			&nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host);
- 	}
- 	updateLabelText();
-@@ -514,7 +514,7 @@ void KviQuery::toggleListView()
- 
- void KviQuery::setDeadQuery()
- {
--	m_iFlags |= KVI_TQUERY_FLAG_DEAD;
-+	m_iFlags |= KVI_QUERY_FLAG_DEAD;
- 
- 	m_pUserListView->enableUpdates(false);
- 	m_pUserListView->partAll();
-@@ -522,7 +522,7 @@ void KviQuery::setDeadQuery()
- 	m_pUserListView->setUserDataBase(0);
- 	connection()->unregisterQuery(this);
- 	context()->registerDeadQuery(this);
--	setType(KVI_WINDOW_TYPE_DEADTQUERY);
-+	setType(KVI_WINDOW_TYPE_DEADQUERY);
- 
- 	updateIcon();
- 	updateCaption();
-@@ -531,9 +531,9 @@ void KviQuery::setDeadQuery()
- 
- void KviQuery::setAliveQuery()
- {
--	m_iFlags &= ~KVI_TQUERY_FLAG_DEAD;
-+	m_iFlags &= ~KVI_QUERY_FLAG_DEAD;
- 	m_pUserListView->setUserDataBase(connection()->userDataBase());
--	setType(KVI_WINDOW_TYPE_TQUERY);
-+	setType(KVI_WINDOW_TYPE_QUERY);
- 	context()->unregisterDeadQuery(this);
- 	connection()->registerQuery(this);
- 	// Update log file name
-@@ -553,7 +553,7 @@ void KviQuery::applyOptions()
- 
- TQPixmap * KviQuery::myIconPtr()
- {
--	return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADTQUERY : KVI_SMALLICON_TQUERY);
-+	return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY);
- }
- 
- void KviQuery::resizeEvent(TQResizeEvent *e)
-diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
-index 0caa698..275ab65 100644
---- a/src/kvirc/ui/kvi_query.h
-+++ b/src/kvirc/ui/kvi_query.h
-@@ -1,5 +1,5 @@
--#ifndef _KVI_TQUERY_H_
--#define _KVI_TQUERY_H_
-+#ifndef _KVI_QUERY_H_
-+#define _KVI_QUERY_H_
- //=============================================================================
- //
- //   File : kvi_query.h
-@@ -39,7 +39,7 @@ class KviConfig;
- class TQSplitter;
- class KviWindowToolPageButton;
- 
--#define KVI_TQUERY_FLAG_DEAD 1
-+#define KVI_QUERY_FLAG_DEAD 1
- 
- class KVIRC_API KviQuery : public KviWindow
- {
-@@ -65,7 +65,7 @@ protected:
- public:
- 	void setDeadQuery();
- 	void setAliveQuery();
--	bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; };
-+	bool isDeadQuery(){ return m_iFlags & KVI_QUERY_FLAG_DEAD; };
- 	virtual TQSize sizeHint() const;
- 	virtual const TQString & target(){ return windowName(); };
- 	virtual void applyOptions();
-diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h
-index f29351f..f8f26c4 100644
---- a/src/kvirc/ui/kvi_statusbarapplet.h
-+++ b/src/kvirc/ui/kvi_statusbarapplet.h
-@@ -54,7 +54,7 @@ class KVIRC_API KviStatusBarAppletDescriptor : public KviHeapObject
- 	friend class KviStatusBarApplet;
- protected:
- 	TQString                          m_szVisibleName;       // visible name of the applet
--	TQString                          m_szInternalName;      // UNITQUE name of the applet
-+	TQString                          m_szInternalName;      // UNIQUE name of the applet
- 	TQString                          m_szPreloadModule;     // name of the module that must be preloaded for this applet
- 	CreateAppletCallback             m_pProc;               // creation callback
- 	TQPixmap                        * m_pIcon;
-diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
-index 171e411..f4e8b4e 100644
---- a/src/kvirc/ui/kvi_taskbar.cpp
-+++ b/src/kvirc/ui/kvi_taskbar.cpp
-@@ -371,8 +371,8 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
- 		case KVI_WINDOW_TYPE_DEADCHANNEL:
- 			szText = ((KviChannel *)m_pWindow)->nameWithUserFlag();
- 		break;
--		case KVI_WINDOW_TYPE_TQUERY:
--		case KVI_WINDOW_TYPE_DEADTQUERY:
-+		case KVI_WINDOW_TYPE_QUERY:
-+		case KVI_WINDOW_TYPE_DEADQUERY:
- 			szText = m_pWindow->windowName();
- 		break;
- 		default:
-@@ -985,8 +985,8 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
- 				cRect.setLeft(cRect.left() + 17);
- 			}
- 		break;
--		case KVI_WINDOW_TYPE_TQUERY:
--		case KVI_WINDOW_TYPE_DEADTQUERY:
-+		case KVI_WINDOW_TYPE_QUERY:
-+		case KVI_WINDOW_TYPE_DEADQUERY:
- 			szText = m_pWindow->windowName();
- 			if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIcons))
- 			{
-diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
-index a66156c..7aa3944 100644
---- a/src/kvirc/ui/kvi_userlistview.cpp
-+++ b/src/kvirc/ui/kvi_userlistview.cpp
-@@ -230,7 +230,7 @@ void KviUserListView::emitRightClick()
- 	switch(m_pKviWindow->type())
- 	{
- 		case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickPopupRequest;  break;
--		case KVI_WINDOW_TYPE_TQUERY:   ev = KviEvent_OnQueryNickPopupRequest;    break;
-+		case KVI_WINDOW_TYPE_QUERY:   ev = KviEvent_OnQueryNickPopupRequest;    break;
- 		case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListPopupRequest;   break;
- 		default:                      ev = KviEvent_OnNickLinkPopupRequest;     break; // this should actually never happen
- 	}
-@@ -255,7 +255,7 @@ void KviUserListView::emitDoubleClick()
- 	switch(m_pKviWindow->type())
- 	{
- 		case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickDefaultActionRequest;  break;
--		case KVI_WINDOW_TYPE_TQUERY:   ev = KviEvent_OnQueryNickDefaultActionRequest;    break;
-+		case KVI_WINDOW_TYPE_QUERY:   ev = KviEvent_OnQueryNickDefaultActionRequest;    break;
- 		case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListDefaultActionRequest;   break;
- 		default:                      ev = KviEvent_OnNickLinkDefaultActionRequest;     break; // this should actually never happen
- 	}
-diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
-index e5dd8e8..98a1923 100644
---- a/src/kvirc/ui/kvi_window.cpp
-+++ b/src/kvirc/ui/kvi_window.cpp
-@@ -1377,8 +1377,8 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t
- 					(
- 						KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsgQueryToo) &&
- 						(
--							(msg_type == KVI_OUT_TQUERYPRIVMSG) || (msg_type == KVI_OUT_TQUERYTRACE) ||
--							(msg_type == KVI_OUT_TQUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_TQUERYNOTICE) || (msg_type == KVI_OUT_TQUERYNOTICECRYPTED)
-+							(msg_type == KVI_OUT_QUERYPRIVMSG) || (msg_type == KVI_OUT_QUERYTRACE) ||
-+							(msg_type == KVI_OUT_QUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_QUERYNOTICE) || (msg_type == KVI_OUT_QUERYNOTICECRYPTED)
- 						)
- 					)
- 					||
-diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
-index d5c2251..fb97692 100644
---- a/src/kvirc/ui/kvi_window.h
-+++ b/src/kvirc/ui/kvi_window.h
-@@ -77,7 +77,7 @@ class KviTalWidgetStack;
- 
- #define KVI_WINDOW_TYPE_CONSOLE 0
- #define KVI_WINDOW_TYPE_CHANNEL 1
--#define KVI_WINDOW_TYPE_TQUERY 2
-+#define KVI_WINDOW_TYPE_QUERY 2
- #define KVI_WINDOW_TYPE_HELP 3
- #define KVI_WINDOW_TYPE_TERM 4
- #define KVI_WINDOW_TYPE_EDITOR 5
-@@ -94,7 +94,7 @@ class KviTalWidgetStack;
- #define KVI_WINDOW_TYPE_OFFER 16
- #define KVI_WINDOW_TYPE_LOGVIEW 17
- #define KVI_WINDOW_TYPE_DEADCHANNEL 18
--#define KVI_WINDOW_TYPE_DEADTQUERY 19
-+#define KVI_WINDOW_TYPE_DEADQUERY 19
- #define KVI_WINDOW_TYPE_SCRIPTEDITOR 20
- #define KVI_WINDOW_TYPE_SCRIPTOBJECT 21
- #define KVI_WINDOW_TYPE_USERWINDOW 22
-diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
-index 9d3b0eb..41b8289 100644
---- a/src/modules/addon/libkviaddon.cpp
-+++ b/src/modules/addon/libkviaddon.cpp
-@@ -429,7 +429,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
- 		we will adhere to that naming in certain parts of the documentation too.
- 		[/p]
- 		[p]
--		Each script-based addon (a set of scripts) is identified by an UNITQUE
-+		Each script-based addon (a set of scripts) is identified by an UNIQUE
- 		<id>. Two addons with the same <id> can't co-exist in the same
- 		KVIrc installation (so be sure to choose a token characteristic enough
- 		to avoid collisions with others). The <id> itself is used only for
-diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
-index d020105..ce95e2c 100644
---- a/src/modules/aliaseditor/aliaseditor.cpp
-+++ b/src/modules/aliaseditor/aliaseditor.cpp
-@@ -436,7 +436,7 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
- 	m_pContextPopup->insertSeparator();
- 	
- 	id = m_pContextPopup->insertItem(
--			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
-+			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
- 			__tr2qs("Remove Selected"),
- 			this,TQT_SLOT(removeSelectedItems()));
- 	m_pContextPopup->setItemEnabled(id,bHasSelected);
-diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
-index 8386942..0ed81a5 100644
---- a/src/modules/avatar/libkviavatar.cpp
-+++ b/src/modules/avatar/libkviavatar.cpp
-@@ -186,7 +186,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
- 		KVSM_PARAMETER("avatar",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szAvatar)
- 	KVSM_PARAMETERS_END(c)
- 
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	TQString absPath;
- 
-@@ -275,7 +275,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
- 
- static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c)
- {
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(c->window()->connection()->currentNickName());
- 	if(!e)
-@@ -340,7 +340,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
- 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
- 	KVSM_PARAMETERS_END(c)
- 
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	kvs_int_t iTimeout = (kvs_int_t)KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs);
- 	if(KviKvsVariant * pTimeout = c->switches()->find('t',"timeout"))
-@@ -450,7 +450,7 @@ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c)
- 		KVSM_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
- 	KVSM_PARAMETERS_END(c)
- 	
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
- 
-@@ -494,7 +494,7 @@ static bool avatar_kvs_fnc_path(KviKvsModuleFunctionCall * c)
- 		KVSM_PARAMETER("path",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
- 	KVSM_PARAMETERS_END(c)
- 	
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
- 
-@@ -536,7 +536,7 @@ static bool avatar_kvs_cmd_query(KviKvsModuleCommandCall * c)
- 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szName)
- 	KVSM_PARAMETERS_END(c)
- 
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	KviTQCString target = c->window()->connection()->encodeText(szName);
- 	c->window()->connection()->sendFmtData("PRIVMSG %s :%cAVATAR%c",target.data(),0x01,0x01);
-diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
-index 03f5d30..de818ce 100644
---- a/src/modules/dcc/libkvidcc.cpp
-+++ b/src/modules/dcc/libkvidcc.cpp
-@@ -878,7 +878,7 @@ static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
- 		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szFileName)
- 	KVSM_PARAMETERS_END(c)
- 
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
- 	d->szNick            = szTarget;
-@@ -943,7 +943,7 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
- 		KVSM_PARAMETER("size",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
- 	KVSM_PARAMETERS_END(c)
- 
--	KVSM_RETQUIRE_CONNECTION(c)
-+	KVSM_REQUIRE_CONNECTION(c)
- 
- 	KviTQString::cutToLast(szFileName,'/');
- 
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-index d286d64..2820ce2 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
-@@ -164,7 +164,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
- 	m_pContextPopup->insertSeparator();
- 	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
- 	m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE);
--	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
-+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
- 	m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id);
- 	connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
- }
-@@ -554,7 +554,7 @@ void KviDockWidget::grabActivityInfo()
- 				case KVI_WINDOW_TYPE_CHANNEL:
- 					if(m_iChannels < iLevel) m_iChannels = iLevel;
- 				break;
--				case KVI_WINDOW_TYPE_TQUERY:
-+				case KVI_WINDOW_TYPE_QUERY:
- 					if(m_iQueries < iLevel) m_iQueries = iLevel;
- 				break;
- 				default:
-@@ -581,7 +581,7 @@ void KviDockWidget::grabActivityInfo()
- 					case KVI_WINDOW_TYPE_CHANNEL:
- 						if(m_iChannels < iLevel) m_iChannels = iLevel;
- 					break;
--					case KVI_WINDOW_TYPE_TQUERY:
-+					case KVI_WINDOW_TYPE_QUERY:
- 						if(m_iQueries < iLevel) m_iQueries = iLevel;
- 					break;
- 					default:
-diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-index 54033af..48555c7 100644
---- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
-@@ -108,7 +108,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm)
- 	m_pContextPopup->insertSeparator();
- 	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int)));
- 	m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE);
--	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
-+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit()));
- 	m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id);
- 	connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup()));
- 	
-@@ -412,7 +412,7 @@ void KviDockWidget::grabActivityInfo()
- 				case KVI_WINDOW_TYPE_CHANNEL:
- 					if(m_iChannels < iLevel) m_iChannels = iLevel;
- 				break;
--				case KVI_WINDOW_TYPE_TQUERY:
-+				case KVI_WINDOW_TYPE_QUERY:
- 					if(m_iQueries < iLevel) m_iQueries = iLevel;
- 				break;
- 				default:
-@@ -439,7 +439,7 @@ void KviDockWidget::grabActivityInfo()
- 					case KVI_WINDOW_TYPE_CHANNEL:
- 						if(m_iChannels < iLevel) m_iChannels = iLevel;
- 					break;
--					case KVI_WINDOW_TYPE_TQUERY:
-+					case KVI_WINDOW_TYPE_QUERY:
- 						if(m_iQueries < iLevel) m_iQueries = iLevel;
- 					break;
- 					default:
-diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
-index 3a6b6b2..8c13eac 100644
---- a/src/modules/eventeditor/eventeditor.cpp
-+++ b/src/modules/eventeditor/eventeditor.cpp
-@@ -156,7 +156,7 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
- 			//m_pContextPopup->setItemChecked(id,((KviEventHandlerListViewItem *)it)->m_bEnabled);
- 
- 			m_pContextPopup->insertItem(
--					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
-+					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
- 					__tr2qs("Re&move Handler"),
- 					this,TQT_SLOT(removeCurrentHandler()));
- 			m_pContextPopup->insertItem(
-diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
-index 84a6711..7efa17f 100644
---- a/src/modules/logview/logviewmdiwindow.cpp
-+++ b/src/modules/logview/logviewmdiwindow.cpp
-@@ -378,7 +378,7 @@ void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const TQ
- 	if(!it) return;
- 	if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
- 	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
--	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent()));
-+	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent()));
- 	popup->exec( TQCursor::pos() );
- }
- 
-diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
-index 31da503..11070b5 100644
---- a/src/modules/logview/logviewwidget.cpp
-+++ b/src/modules/logview/logviewwidget.cpp
-@@ -45,7 +45,7 @@ const TQPixmap * KviLogListViewItemType::pixmap(int col) const
- 		case KviLogFile::Channel:
- 			return g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL);
- 		case KviLogFile::Query:
--			return g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY);
-+			return g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY);
- 		case KviLogFile::DccChat:
- 			return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG);
- 		case KviLogFile::Console:
-diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
-index 7820dbb..c41b1ba 100644
---- a/src/modules/mediaplayer/mp_winampinterface.cpp
-+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
-@@ -156,7 +156,7 @@
- #define WINAMP_CMD_STOP WINAMP_BUTTON4
- #define WINAMP_CMD_NEXT WINAMP_BUTTON5
- 
--#define WINAMP_CMD_TQUIT 40001
-+#define WINAMP_CMD_QUIT 40001
- 
- #define KVIRC_WM_USER 63112
- 
-@@ -237,7 +237,7 @@ MP_WINAMP_WM_COMMAND(stop,WINAMP_CMD_STOP)
- MP_WINAMP_WM_COMMAND(next,WINAMP_CMD_NEXT)
- MP_WINAMP_WM_COMMAND(prev,WINAMP_CMD_PREV)
- MP_WINAMP_WM_COMMAND(pause,WINAMP_CMD_PAUSE)
--MP_WINAMP_WM_COMMAND(quit,WINAMP_CMD_TQUIT)
-+MP_WINAMP_WM_COMMAND(quit,WINAMP_CMD_QUIT)
- 
- 
- int KviWinampInterface::length()
-diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
-index bbc1298..6998912 100644
---- a/src/modules/notifier/notifierwindow.cpp
-+++ b/src/modules/notifier/notifierwindow.cpp
-@@ -1253,10 +1253,10 @@ void KviNotifierWindow::fillContextPopup()
- 	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQT_SLOT(disableFor30Minutes()));
- 	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQT_SLOT(disableFor60Minutes()));
- 	m_pDisablePopup->insertSeparator();
--	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted()));
--	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently()));
-+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted()));
-+	m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently()));
- 
--	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
-+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
- }
- 
- void KviNotifierWindow::disableFor15Minutes()
-diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
-index d6990c9..21c1192 100644
---- a/src/modules/options/optw_connection.cpp
-+++ b/src/modules/options/optw_connection.cpp
-@@ -76,11 +76,11 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
- #ifdef COMPILE_INFO_TIPS
- 	mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \
- 						"An unexpected disconnect is the <b>termination</b> of a <b>fully connected IRC session</b> " \
--						"that was <b>not requested by the user</b> by the means of the TQUIT message." \
--						"<p><b>Warning:</b> If you use /RAW to send a TQUIT message to the server, " \
-+						"that was <b>not requested by the user</b> by the means of the QUIT message." \
-+						"<p><b>Warning:</b> If you use /RAW to send a QUIT message to the server, " \
- 						"this option will not behave correctly, since does not detect the outgoing " \
- 						"QUIT message and will attempt to reconnect after the server has closed the connection. " \
--						"For this reason, always use the /TQUIT command to close your connections. " \
-+						"For this reason, always use the /QUIT command to close your connections. " \
- 						"This option may also behave incorrectly with bouncers that support " \
- 						"detaching, in this case a solution could be to prepare an alias that sends the " \
- 						"bouncer \"detach\" command immediately before the \"quit\" command.<br>" \
-diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
-index a6cee9d..71b6095 100644
---- a/src/modules/options/optw_irc.cpp
-+++ b/src/modules/options/optw_irc.cpp
-@@ -76,10 +76,10 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * parent)
- #ifdef COMPILE_INFO_TIPS
- 	mergeTip(b,
- 		__tr2qs_ctx("<center>This option causes KVIrc to close " \
--		"the connection immediately after sending the TQUIT message.<br>" \
-+		"the connection immediately after sending the QUIT message.<br>" \
- 		"When this option is disabled, KVIrc will wait for the server " \
- 		"to close the connection.<br>" \
--		"Note that if you use this, your TQUIT message may be not displayed.</center>","options"));
-+		"Note that if you use this, your QUIT message may be not displayed.</center>","options"));
- #endif
- 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname);    
- }
-diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
-index 215ba37..dde374f 100644
---- a/src/modules/options/optw_query.h
-+++ b/src/modules/options/optw_query.h
-@@ -1,5 +1,5 @@
--#ifndef _OPTW_TQUERY_H_
--#define _OPTW_TQUERY_H_
-+#ifndef _OPTW_QUERY_H_
-+#define _OPTW_QUERY_H_
- //
- //   File : optw_query.h
- //   Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
-@@ -24,7 +24,7 @@
- 
- #include "kvi_optionswidget.h"
- 
--#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_TQUERY
-+#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
- #define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
- #define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget KviIrcOptionsWidget
- #define KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget __tr2qs_no_lookup("chat")
-diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
-index dd1cf24..3402681 100644
---- a/src/modules/popupeditor/popupeditor.cpp
-+++ b/src/modules/popupeditor/popupeditor.cpp
-@@ -1101,7 +1101,7 @@ void KviPopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
- 
- 	m_pContextPopup->setItemEnabled(
- 		m_pContextPopup->insertItem(
--				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
-+				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
- 				__tr2qs("Re&move Popup"),
- 				this,TQT_SLOT(removeCurrentPopup())),
- 	it);
-diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
-index 123675b..4978726 100644
---- a/src/modules/raweditor/raweditor.cpp
-+++ b/src/modules/raweditor/raweditor.cpp
-@@ -158,7 +158,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
- 					__tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled()));
- 		
- 			m_pContextPopup->insertItem(
--					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),
-+					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
- 					__tr2qs("Re&move Handler"),
- 					this,TQT_SLOT(removeCurrentHandler()));
- 			m_pContextPopup->insertItem(
-diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
-index d5989c9..0fc0495 100644
---- a/src/modules/setup/libkvisetup.cpp
-+++ b/src/modules/setup/libkvisetup.cpp
-@@ -77,7 +77,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
- 		// Reset the quit message and the real name... if they contain the KVIrc version
- 		// then probably the user hasn't even edited them.
- 		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).find("KVIrc",0,false) != -1)
--			KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_TQUIT_MESSAGE;
-+			KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_QUIT_MESSAGE;
- 		// We deserve to change the user's part message in something nice :)
- 		KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE;
- 	
-diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
-index dd0e8a9..20ca97b 100644
---- a/src/modules/setup/setupwizard.cpp
-+++ b/src/modules/setup/setupwizard.cpp
-@@ -588,9 +588,9 @@ KviSetupWizard::KviSetupWizard()
- 	}
- 
- 	//mIRC import
--	#define TQUERY_BUFFER 2048
-+	#define QUERY_BUFFER 2048
- 	char* buffer;
--	DWORD len = TQUERY_BUFFER;
-+	DWORD len = QUERY_BUFFER;
- 	buffer = (char*)malloc(len*sizeof(char));
- 	HKEY hKey;
- 	TQString szMircDir;
-@@ -796,7 +796,7 @@ void KviSetupWizard::makeLink()
- 	// Dig in the registry looking up the Desktop path
-     if(RegOpenKeyEx(HKEY_CURRENT_USER,
- 		"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", 
--		0,KEY_TQUERY_VALUE,&hCU) == ERROR_SUCCESS)
-+		0,KEY_QUERY_VALUE,&hCU) == ERROR_SUCCESS)
- 	{
- 		RegQueryValueEx(hCU,"Desktop",NULL,&lpType,
-         (unsigned char *)&szLink,&ulSize);
-diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
-index d22fbb7..92a28a3 100644
---- a/src/modules/spaste/libkvispaste.cpp
-+++ b/src/modules/spaste/libkvispaste.cpp
-@@ -63,7 +63,7 @@ static KviWindow * spaste_kvs_find_window(TQString &win, KviKvsModuleCommandCall
- 		c->warning(__tr("Window with ID '%Q' not found"),&win);
- 		return 0;
- 	}
--	if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_TQUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
-+	if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
- 	c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
- 	return 0;
- }
-@@ -212,7 +212,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
-         
- 		if(!iId) //Delete all spaste's from the current window
- 		{
--			if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_TQUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
-+			if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
- 			{
- 				TQString szWinId = c->window()->id();
- 				c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
deleted file mode 100644
index ab633568b..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kvirc/admin/acinclude.m4.in.ORI	2011-11-25 19:57:17.296988361 +0100
-+++ kvirc/admin/acinclude.m4.in	2011-11-25 19:57:47.365665354 +0100
-@@ -2603,10 +2603,10 @@
- 	helpdir="\${globalkvircdir}/help/en"
- 	AC_SUBST(helpdir)
- 
--	pluglibdir="\${globalkvircdir}/modules"
-+	pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(pluglibdir)
- 
--	modulelibdir="\${globalkvircdir}/modules"
-+	modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(modulelibdir)
- 
- 	defscriptdir="\${globalkvircdir}/defscript"
---- kvirc/configure.in.ORI	2012-08-06 13:48:54.586710376 +0200
-+++ kvirc/configure.in	2012-08-06 13:50:31.344841522 +0200
-@@ -100,7 +100,7 @@
- 
- AC_SS_HEADER([Checking KDE])
- 
--SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h"
-+SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h include/kde/kwin.h"
- SS_KDE_INCLUDE_FILE_TO_SEARCH="kwin.h"
- 
- AC_SS_FIND_KDE
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch b/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
deleted file mode 100644
index d838ce911..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kvirc/admin/acinclude.m4.in.ORI	2012-08-06 12:20:40.350261853 +0200
-+++ kvirc/admin/acinclude.m4.in	2012-08-06 12:21:34.061121107 +0200
-@@ -2149,7 +2149,7 @@
- 	if test -n "$KDEDIR"; then
- 		ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
- 	fi
--	ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
-+	ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
- 
- 	AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
- 
-@@ -2524,7 +2524,7 @@
- 
- 	if test -n "$SS_OTHER_LIBDIRS"; then
- 		SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
--		$SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
-+		SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
- 		SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
- 	fi
- 
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
deleted file mode 100644
index a9e97af33..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kvirc/src/kvirc/build/Makefile.am.ORI	2011-11-26 22:37:04.065565368 +0100
-+++ kvirc/src/kvirc/build/Makefile.am	2011-11-26 22:37:17.139565032 +0100
-@@ -8,7 +8,7 @@
- AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
- $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
- 
--kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
-+kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio -lkdecore -lkdeui
- kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
- 
- bin_PROGRAMS = kvirc
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch b/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 55f2be2e7..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kvirc/src/kvilib/build/Makefile.am.ORI	2012-08-06 12:13:32.982315876 +0200
-+++ kvirc/src/kvilib/build/Makefile.am	2012-08-06 12:13:44.438073791 +0200
-@@ -9,7 +9,7 @@
- 
- lib_LTLIBRARIES      = libkvilib.la
- libkvilib_la_LDFLAGS = $(SS_LDFLAGS) -version-info 3:0:0 $(SS_LIBDIRS)
--libkvilib_la_LIBADD  = $(SS_LIBLINK)
-+libkvilib_la_LIBADD  = $(SS_LIBLINK) -lkio -lDCOP
- 
- #
- # Command useful to find out all the sources
---- kvirc/src/kvirc/build/Makefile.am.ORI	2011-11-26 22:37:04.065565368 +0100
-+++ kvirc/src/kvirc/build/Makefile.am	2011-11-26 22:37:17.139565032 +0100
-@@ -8,7 +8,7 @@
- AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
- $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
- 
--kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
-+kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio
- kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
- 
- bin_PROGRAMS = kvirc
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch
deleted file mode 100644
index 7f547d820..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kvirc/admin/acinclude.m4.in.ORI	2011-11-25 19:57:17.296988361 +0100
-+++ kvirc/admin/acinclude.m4.in	2011-11-25 19:57:47.365665354 +0100
-@@ -2603,10 +2603,10 @@
- 	helpdir="\${globalkvircdir}/help/en"
- 	AC_SUBST(helpdir)
- 
--	pluglibdir="\${globalkvircdir}/modules"
-+	pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(pluglibdir)
- 
--	modulelibdir="\${globalkvircdir}/modules"
-+	modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(modulelibdir)
- 
- 	defscriptdir="\${globalkvircdir}/defscript"
---- kvirc/configure.in.ORI	2012-08-06 13:48:54.586710376 +0200
-+++ kvirc/configure.in	2012-08-06 13:50:31.344841522 +0200
-@@ -100,7 +100,7 @@
- 
- AC_SS_HEADER([Checking KDE])
- 
--SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h"
-+SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h include/tde/kwin.h include/kde/kwin.h"
- SS_KDE_INCLUDE_FILE_TO_SEARCH="kwin.h"
- 
- AC_SS_FIND_KDE
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.1-fix_arts_detection.patch b/redhat/applications/kvirc/kvirc-3.5.13.1-fix_arts_detection.patch
deleted file mode 100644
index d48d0a0d4..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.1-fix_arts_detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kvirc-3.5.13.1/admin/acinclude.m4.in.ORI	2012-10-06 19:19:30.073415124 +0200
-+++ kvirc-3.5.13.1/admin/acinclude.m4.in	2012-10-06 19:19:42.785136998 +0200
-@@ -1105,7 +1105,7 @@
- 			ss_save_LIBS="$LIBS"
- 			CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
- 			CXXFLAGS="-O2 -Wall $CXXFLAGS"
--			LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
-+			LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -lmcop -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
- 			if test "$SS_LINK_TO_LIBDL" = "yes"; then
- 				LIBS="$LIBS -ldl";
- 			fi
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.1.spec b/redhat/applications/kvirc/kvirc-3.5.13.1.spec
deleted file mode 100644
index 2dae17287..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.1.spec
+++ /dev/null
@@ -1,230 +0,0 @@
-# Default version for this component
-%define kdecomp kvirc
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Trinity based next generation IRC client with module support
-Version:	3.4.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kvirc.net/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [kvirc] Modules do not install in correct folder [RHEL/Fedora]
-Patch0:		kvirc-3.5.13.1-directories.patch
-# [kvirc] FTBFS because of missing link libraries [Bug #991]
-Patch1:		kvirc-3.5.13-ftbfs.patch
-# [kvirc] Fix arts detection
-Patch2:		kvirc-3.5.13.1-fix_arts_detection.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:	%{name}-data = %{version}-%{release}
-
-%description
-A highly configurable graphical IRC client with an MDI interface,
-built-in scripting language, support for IRC DCC, drag & drop file
-browsing, and much more. KVIrc uses the KDE widget set, can be extended
-using its own scripting language, integrates with KDE, and supports
-custom plugins.
-
-If you are a developer and you want to write a custom module for KVIrc,
-you need to install the kvirc-dev package.
-
-%package data
-Group:		Applications/Utilities
-Summary:	Data files for KVIrc
-Requires:	%{name} = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent data needed by KVIrc in
-order to run, such as icons and images, language files, and shell scripts.
-It also contains complete reference guides on scripting and functions
-within KVIrc in its internal help format. Unless you want to use KVIrc only
-as a very simple IRC client you are likely to want to write scripts to
-tailor KVIrc to your needs.
-
-KVIrc is a graphical IRC client based on the KDE widget set which integrates
-with the K Desktop Environment version 3.
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for KVIrc
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-This package contains KVIrc libraries and include files you need if you
-want to develop plugins for KVIrc.
-
-KVIrc is a graphical IRC client based on the KDE widget set which integrates
-with the K Desktop Environment version 3.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .arts
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-# Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
-%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
-  -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g"
-%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
-  -e "s|/opt/kde3|%{tde_prefix}|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-./autogen.sh
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-fno-rtti --with-aa-fonts --with-big-channels \
-  --enable-perl --with-pic --enable-wall \
-  --with-ix86-asm \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} \
-  --with-kde-services-dir=%{tde_datadir}/services \
-  --with-kde-library-dir=%{tde_libdir} \
-  --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \
-  --with-qt-include-dir=${QTINC:-${QTDIR}/include} \
-  --with-qt-moc=${QTDIR}/bin/moc
-
-# Symbolic links must exist prior to parallel building
-%__make symlinks -C src/kvilib/build
-%__make symlinks -C src/kvirc/build
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
-%__mv \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog FAQ README TODO
-%{tde_bindir}/kvirc
-%{tde_libdir}/*.so.*
-%{tde_libdir}/kvirc/*/modules/*.so
-
-%files data
-%defattr(-,root,root,-)
-%{tde_bindir}/kvi_run_netscape
-%{tde_bindir}/kvi_search_help
-%{tde_libdir}/kvirc/*/modules/caps/
-%{tde_datadir}/applnk/Internet/kvirc.desktop
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/icons/hicolor/*/*/*.xpm
-%{tde_datadir}/kvirc
-%{tde_datadir}/mimelnk/text/*.desktop
-%{tde_datadir}/services/*.protocol
-%{tde_mandir}/man1/kvirc.1
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kvirc-config
-%{tde_includedir}/kvirc/
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/kvirc/*/modules/*.la
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-3
-- Initial release for TDE 3.5.13.1
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #32a249ba]
-- Remove additional unneeded tq method conversions [Commit #f9114981]
-- Rename obsolete tq methods to standard names [Commit #2dd6d32b]
-- Rename a few stragglers [Commit #1c00d6ff]
-- Fix FTBFS [Commits #ff96f491, #2285efe5]
-- Fix linear alphabet string errors [Commit #51bbe9e5]
-- Fix inadvertent "TQ" changes. [Commit #a24a8595]
-- Fix "acinclude.m4" file [Bug #980]
- 
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch
deleted file mode 100644
index 737ccaad6..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.2-fix_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-kvirc-3.5.13.2/configure.in.ORI	2013-06-04 00:16:19.407990544 +0200
-+++ trinity-kvirc-3.5.13.2/configure.in	2013-06-04 00:16:26.428844196 +0200
-@@ -20,7 +20,7 @@
- AM_MAINTAINER_MODE
- 
- AC_PREFIX_DEFAULT(/usr/local)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADER(src/config.h)
- 
- #------------------------------------------------------------------
- # HERE starts your real configure script
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch b/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
deleted file mode 100644
index 0c2b8e820..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in.ROI	2013-08-04 20:37:52.076477391 +0200
-+++ trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in	2013-08-04 20:37:57.402529614 +0200
-@@ -2603,10 +2603,10 @@
- 	helpdir="\${globalkvircdir}/help/en"
- 	AC_SUBST(helpdir)
- 
--	pluglibdir="\${globalkvircdir}/modules"
-+	pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(pluglibdir)
- 
--	modulelibdir="\${globalkvircdir}/modules"
-+	modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
- 	AC_SUBST(modulelibdir)
- 
- 	defscriptdir="\${globalkvircdir}/defscript"
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
deleted file mode 100644
index 32c340e5b..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ /dev/null
@@ -1,211 +0,0 @@
-# REMOVE KDELIBS4-DEVEL before building !!!!
-
-# Default version for this component
-%define tde_pkg kvirc
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Trinity based next generation IRC client with module support
-Version:		3.4.0
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://kvirc.net/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [kvirc] Modules do not install in correct folder [RHEL/Fedora]
-Patch0:			kvirc-3.5.13.2-fix_ftbfs.patch
-# [kvirc] FTBFS because of missing link libraries [Bug #991]
-Patch1:			kvirc-3.5.13-ftbfs.patch
-Patch2:			kvirc-3.5.13.2-install_directory.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Requires:		%{name}-data = %{version}-%{release}
-
-%description
-A highly configurable graphical IRC client with an MDI interface,
-built-in scripting language, support for IRC DCC, drag & drop file
-browsing, and much more. KVIrc uses the TDE widget set, can be extended
-using its own scripting language, integrates with TDE, and supports
-custom plugins.
-
-If you are a developer and you want to write a custom module for KVIrc,
-you need to install the kvirc-dev package.
-
-%package data
-Group:			Applications/Utilities
-Summary:		Data files for KVIrc
-Requires:		%{name} = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent data needed by KVIrc in
-order to run, such as icons and images, language files, and shell scripts.
-It also contains complete reference guides on scripting and functions
-within KVIrc in its internal help format. Unless you want to use KVIrc only
-as a very simple IRC client you are likely to want to write scripts to
-tailor KVIrc to your needs.
-
-KVIrc is a graphical IRC client based on the TDE widget set which integrates
-with the Trinity Desktop Environment version 3.
-
-%package devel
-Group:			Development/Libraries
-Summary:		Development files for KVIrc
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-This package contains KVIrc libraries and include files you need if you
-want to develop plugins for KVIrc.
-
-KVIrc is a graphical IRC client based on the TDE widget set which integrates
-with the K Desktop Environment version 3.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .installdir
-
-# Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
-%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
-  -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g"
-%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
-  -e "s|/opt/kde3|%{tde_prefix}|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-./autogen.sh
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR=%{tde_prefix}
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-wall \
-  \
-  --with-pic \
-  \
-  --with-big-channels \
-  --enable-perl \
-  --with-ix86-asm \
-  --with-kde-services-dir=%{tde_datadir}/services \
-  --with-kde-library-dir=%{tde_libdir} \
-  --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \
-  --with-qt-include-dir=${QTINC:-${QTDIR}/include} \
-  --with-qt-moc=${QTDIR}/bin/moc
-
-# Symbolic links must exist prior to parallel building
-%__make symlinks -C src/kvilib/build
-%__make symlinks -C src/kvirc/build
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
-%__mv \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog FAQ README TODO
-%{tde_bindir}/kvirc
-%{tde_libdir}/*.so.*
-%{tde_libdir}/kvirc/*/modules/*.so
-
-%files data
-%defattr(-,root,root,-)
-%{tde_bindir}/kvi_run_netscape
-%{tde_bindir}/kvi_search_help
-%{tde_libdir}/kvirc/
-%{tde_datadir}/applnk/Internet/kvirc.desktop
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/icons/hicolor/*/*/*.xpm
-%{tde_datadir}/kvirc
-%{tde_datadir}/mimelnk/text/*.desktop
-%{tde_datadir}/services/*.protocol
-%{tde_mandir}/man1/kvirc.1
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kvirc-config
-%{tde_includedir}/kvirc/
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/kvirc/*/modules/*.la
-
-
-%changelog
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.spec b/redhat/applications/kvirc/kvirc-3.5.13.spec
deleted file mode 100644
index cd63f4d00..000000000
--- a/redhat/applications/kvirc/kvirc-3.5.13.spec
+++ /dev/null
@@ -1,246 +0,0 @@
-# Default version for this component
-%define kdecomp kvirc
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Trinity based next generation IRC client with module support
-Version:	3.4.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://kvirc.net/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kvirc] Modules do not install in correct folder [RHEL/Fedora]
-Patch0:		kvirc-3.5.13-directories.patch
-# [kvirc] FTBFS because of missing link libraries [Bug #991]
-Patch1:		kvirc-3.5.13-ftbfs.patch
-
-# [kvirc] Rename old tq methods that no longer need a unique name [Commit #32a249ba]
-Patch2:		bp000-32a249ba.diff
-# [kvirc] Remove additional unneeded tq method conversions [Commit #f9114981]
-Patch3:		bp001-f9114981.diff
-# [kvirc] Rename obsolete tq methods to standard names [Commit #2dd6d32b]
-Patch4:		bp002-2dd6d32b.diff
-# [kvirc] Rename a few stragglers [Commit #1c00d6ff]
-Patch5:		bp003-1c00d6ff.diff
-# [kvirc] Fix FTBFS [Commits #ff96f491, #2285efe5]
-Patch6:		bp004-ff96f491.diff
-Patch7:		bp005-2285efe5.diff
-# [kvirc] Fix linear alphabet string errors [Commit #51bbe9e5]
-Patch8:		bp006-51bbe9e5.diff
-# [kvirc] Fix inadvertent "TQ" changes. [Commit #a24a8595]
-Patch9:		bp007-a24a8595.diff
-# [kvirc] Fix "acinclude.m4" file [Bug #980]
-Patch10:	kvirc-3.5.13-fix_acinclude_m4.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:	%{name}-data = %{version}-%{release}
-
-%description
-A highly configurable graphical IRC client with an MDI interface,
-built-in scripting language, support for IRC DCC, drag & drop file
-browsing, and much more. KVIrc uses the KDE widget set, can be extended
-using its own scripting language, integrates with KDE, and supports
-custom plugins.
-
-If you are a developer and you want to write a custom module for KVIrc,
-you need to install the kvirc-dev package.
-
-%package data
-Group:		Applications/Utilities
-Summary:	Data files for KVIrc
-Requires:	%{name} = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent data needed by KVIrc in
-order to run, such as icons and images, language files, and shell scripts.
-It also contains complete reference guides on scripting and functions
-within KVIrc in its internal help format. Unless you want to use KVIrc only
-as a very simple IRC client you are likely to want to write scripts to
-tailor KVIrc to your needs.
-
-KVIrc is a graphical IRC client based on the KDE widget set which integrates
-with the K Desktop Environment version 3.
-
-%package devel
-Group:		Development/Libraries
-Summary:	Development files for KVIrc
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-This package contains KVIrc libraries and include files you need if you
-want to develop plugins for KVIrc.
-
-KVIrc is a graphical IRC client based on the KDE widget set which integrates
-with the K Desktop Environment version 3.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-# Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
-%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
-  -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g"
-%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
-  -e "s|/opt/kde3|%{tde_prefix}|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-./autogen.sh
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export KDEDIR=%{tde_prefix}
-
-#export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir} -lqt-mt"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-fno-rtti --with-aa-fonts --with-big-channels \
-  --enable-perl --with-pic --enable-wall \
-  --with-ix86-asm \
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} \
-  --with-kde-services-dir=%{tde_datadir}/services \
-  --with-kde-library-dir=%{tde_libdir} \
-  --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-library-dir=${QTLIB} \
-  --with-qt-include-dir=${QTINC} \
-  --with-qt-moc=${QTDIR}/bin/moc
-
-# Symbolic links must exist prior to parallel building
-%__make symlinks -C src/kvilib/build
-%__make symlinks -C src/kvirc/build
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
-%__mv \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog FAQ README TODO
-%{tde_bindir}/kvirc
-%{tde_libdir}/*.so.*
-%{tde_libdir}/kvirc/*/modules/*.so
-
-%files data
-%defattr(-,root,root,-)
-%{tde_bindir}/kvi_run_netscape
-%{tde_bindir}/kvi_search_help
-%{tde_libdir}/kvirc/*/modules/caps/
-%{tde_datadir}/applnk/Internet/kvirc.desktop
-%{tde_datadir}/icons/hicolor/*
-%{tde_datadir}/kvirc
-%{tde_datadir}/mimelnk/text/*.desktop
-%{tde_datadir}/services/*.protocol
-%{tde_mandir}/man1/kvirc.1
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kvirc-config
-%{tde_includedir}/kvirc/
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/kvirc/*/modules/*.la
-
-
-%Changelog
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Rename old tq methods that no longer need a unique name [Commit #32a249ba]
-- Remove additional unneeded tq method conversions [Commit #f9114981]
-- Rename obsolete tq methods to standard names [Commit #2dd6d32b]
-- Rename a few stragglers [Commit #1c00d6ff]
-- Fix FTBFS [Commits #ff96f491, #2285efe5]
-- Fix linear alphabet string errors [Commit #51bbe9e5]
-- Fix inadvertent "TQ" changes. [Commit #a24a8595]
-- Fix "acinclude.m4" file [Bug #980]
- 
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec
deleted file mode 100644
index 42adc560b..000000000
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define kdecomp kvkbd
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Virtual keyboard for KDE [Trinity]
-Version:	0.4.8
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://pan4os.info/main/index.php
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-Virtual keyboard for KDE for use with accessibility. Application contains
-a systray widget as well as a dockwidget.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-    
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kvkbd
-%{tde_datadir}/applnk/Utilities/kvkbd.desktop
-%{tde_datadir}/apps/kvkbd/pics/dock.png
-%{tde_datadir}/apps/kvkbd/pics/tray.png
-%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec
deleted file mode 100644
index 0e66dd2ad..000000000
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-# Default version for this component
-%define tde_pkg kvkbd
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Virtual keyboard for TDE [Trinity]
-Version:		0.4.8
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/System
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://pan4os.info/main/index.php
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-Virtual keyboard for TDE for use with accessibility. Application contains
-a systray widget as well as a dockwidget.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-    
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kvkbd
-%{tde_datadir}/applnk/Utilities/kvkbd.desktop
-%{tde_datadir}/apps/kvkbd/pics/dock.png
-%{tde_datadir}/apps/kvkbd/pics/tray.png
-%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
-
-
-%changelog
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.spec
deleted file mode 100644
index 4421cbc1d..000000000
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-# Default version for this component
-%define kdecomp kvkbd
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Virtual keyboard for KDE [Trinity]
-Version:	0.4.8
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://pan4os.info/main/index.php
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-Virtual keyboard for KDE for use with accessibility. Application contains
-a systray widget as well as a dockwidget.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-    
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kvkbd
-%{tde_datadir}/applnk/Utilities/kvkbd.desktop
-%{tde_datadir}/apps/kvkbd/pics/dock.png
-%{tde_datadir}/apps/kvkbd/pics/tray.png
-%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 9b3adfbce..000000000
--- a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- piklab/src/common/common/range.h.ORI	2012-05-06 11:39:36.080834047 +0200
-+++ piklab/src/common/common/range.h	2012-05-06 11:39:43.239684938 +0200
-@@ -43,7 +43,7 @@
- {
- public:
-   GenericRangeVector() {}
--  GenericRangeVector(const RangeType &range) { append(range); }
-+  GenericRangeVector(const RangeType &range) { this->append(range); }
-   bool isEmpty() const {
-     uint nb = this->count();
-     for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false;
---- piklab/src/xml_to_data/device_xml_to_data.h.ORI	2012-05-06 11:45:56.824911257 +0200
-+++ piklab/src/xml_to_data/device_xml_to_data.h	2012-05-06 11:46:04.135759246 +0200
-@@ -76,7 +76,7 @@
-     TQValueList<DataType *> list;
-     for (it=_map.begin(); it!=_map.end(); ++it)
-       list.append(const_cast<DataType *>(static_cast<const DataType *>(it.data())));
--    uint size = toCppString(list, ts);
-+    uint size = this->toCppString(list, ts);
-     ts << ";" << endl;
-     ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
-     file.close();
---- piklab/src/devices/base/device_group.h.ORI	2012-05-06 11:47:08.950411718 +0200
-+++ piklab/src/devices/base/device_group.h	2012-05-06 11:47:17.607231757 +0200
-@@ -52,7 +52,7 @@
- {
- protected:
-   virtual void initSupported() {
--    TQValueList<DataType *> list = fromCppString(dataStream(), dataSize());
-+    TQValueList<DataType *> list = this->fromCppString(dataStream(), dataSize());
-     for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested);
-   }
-   virtual uint dataSize() const = 0;
diff --git a/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch b/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch
deleted file mode 100644
index b549b225b..000000000
--- a/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- piklab-3.5.13.1/src/progs/sdcdb/Makefile.am.ORI	2012-10-04 22:23:26.210470311 +0200
-+++ piklab-3.5.13.1/src/progs/sdcdb/Makefile.am	2012-10-04 22:23:30.531371664 +0200
-@@ -1,3 +1,3 @@
- INCLUDES = -I$(top_srcdir)/src $(all_includes)
- METASOURCES = AUTO
--SUBDIRS = base gui
-+SUBDIRS = base
diff --git a/redhat/applications/piklab/piklab-3.5.13.1.spec b/redhat/applications/piklab/piklab-3.5.13.1.spec
deleted file mode 100644
index fa08d970e..000000000
--- a/redhat/applications/piklab/piklab-3.5.13.1.spec
+++ /dev/null
@@ -1,161 +0,0 @@
-# Default version for this component
-%define kdecomp piklab
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	IDE for PIC-microcontroller development [Trinity]
-Version:	0.15.2
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [piklab] Do not build the 'gui' directory
-Patch1:		piklab-3.5.13.1-remove_gui_dir.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	readline-devel
-
-%description
-Piklab is an integrated development environment for applications based on
-Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
-
-Support for several compiler and assembler toolchains is integrated. The
-GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
-PICkit2 programmers, the PicStart+ programmer, and most direct programmers
-are supported. A command-line programmer and debugger are also available.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Incorrect extension on manpage
-%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/piklab
-%{tde_bindir}/piklab-coff
-%{tde_bindir}/piklab-hex
-%{tde_bindir}/piklab-prog
-%{tde_tdeappdir}/piklab.desktop
-%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
-%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
-%{tde_datadir}/apps/piklab
-%{tde_tdedocdir}/HTML/en/piklab
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-piklab.desktop
-%{tde_mandir}/man1/piklab-coff.1
-%{tde_mandir}/man1/piklab-hex.1
-%{tde_mandir}/man1/piklab-prog.1
-%{tde_mandir}/man1/piklab.1
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
-- Fix MAN directory location
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec
deleted file mode 100644
index 425bb42a5..000000000
--- a/redhat/applications/piklab/piklab-3.5.13.2.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define tde_pkg piklab
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		IDE for PIC-microcontroller development [Trinity]
-Version:		0.15.2
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	readline-devel
-
-%description
-Piklab is an integrated development environment for applications based on
-Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
-
-Support for several compiler and assembler toolchains is integrated. The
-GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
-PICkit2 programmers, the PicStart+ programmer, and most direct programmers
-are supported. A command-line programmer and debugger are also available.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-%if 0%{?rhel} == 5
-  --disable-libreadline \
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Incorrect extension on manpage
-%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/piklab
-%{tde_bindir}/piklab-coff
-%{tde_bindir}/piklab-hex
-%{tde_bindir}/piklab-prog
-%{tde_tdeappdir}/piklab.desktop
-%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
-%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
-%{tde_datadir}/apps/piklab
-%{tde_tdedocdir}/HTML/en/piklab
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-piklab.desktop
-%{tde_mandir}/man1/piklab-coff.1
-%{tde_mandir}/man1/piklab-hex.1
-%{tde_mandir}/man1/piklab-prog.1
-%{tde_mandir}/man1/piklab.1
-
-
-%changelog
diff --git a/redhat/applications/piklab/piklab-3.5.13.spec b/redhat/applications/piklab/piklab-3.5.13.spec
deleted file mode 100644
index 91aeea1e8..000000000
--- a/redhat/applications/piklab/piklab-3.5.13.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%define kdecomp piklab
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	IDE for PIC-microcontroller development [Trinity]
-Version:	0.15.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [piklab] Fix compilation with GCC 4.7 [Bug #958]
-Patch1:		piklab-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	readline-devel
-
-%description
-Piklab is an integrated development environment for applications based on
-Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
-
-Support for several compiler and assembler toolchains is integrated. The
-GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
-PICkit2 programmers, the PicStart+ programmer, and most direct programmers
-are supported. A command-line programmer and debugger are also available.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Incorrect extension on manpage
-%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/piklab
-%{tde_bindir}/piklab-coff
-%{tde_bindir}/piklab-hex
-%{tde_bindir}/piklab-prog
-%{tde_tdeappdir}/piklab.desktop
-%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
-%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
-%{tde_datadir}/apps/piklab
-%{tde_tdedocdir}/HTML/en/piklab
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-piklab.desktop
-%{tde_mandir}/man1/piklab-coff.1
-%{tde_mandir}/man1/piklab-hex.1
-%{tde_mandir}/man1/piklab-prog.1
-%{tde_mandir}/man1/piklab.1
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
-- Fix MAN directory location
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.1.spec b/redhat/applications/potracegui/potracegui-3.5.13.1.spec
deleted file mode 100644
index a41345cca..000000000
--- a/redhat/applications/potracegui/potracegui-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp potracegui
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDE frontend for potrace [Trinity]
-Version:	1.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://potracegui.sourceforge.net
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-
-
-%description
-A KDE interface for the commandline tracing tools potrace and/or autotrace. It
-supports drag and drop as well as all image types recognized by KDE, which are
-a lot more than the 4 recognized by the potrace commandline tool. Loading of
-remote files (web, ftp, ...) is also supported.  
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/potracegui
-%{tde_datadir}/applnk/Utilities/potracegui.desktop
-%{tde_datadir}/apps/potracegui/potraceguiui.rc
-%{tde_tdedocdir}/HTML/en/potracegui/common
-%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/potracegui/index.docbook
-%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png
-%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec
deleted file mode 100644
index d8b4709c7..000000000
--- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec
+++ /dev/null
@@ -1,122 +0,0 @@
-# Default version for this component
-%define tde_pkg potracegui
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE frontend for potrace [Trinity]
-Version:		1.3
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://potracegui.sourceforge.net
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-A TDE interface for the commandline tracing tools potrace and/or autotrace. It
-supports drag and drop as well as all image types recognized by TDE, which are
-a lot more than the 4 recognized by the potrace commandline tool. Loading of
-remote files (web, ftp, ...) is also supported.  
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/potracegui
-%{tde_datadir}/applnk/Utilities/potracegui.desktop
-%{tde_datadir}/apps/potracegui/potraceguiui.rc
-%{tde_tdedocdir}/HTML/en/potracegui/common
-%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/potracegui/index.docbook
-%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png
-%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo
-
-
-%changelog
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.spec b/redhat/applications/potracegui/potracegui-3.5.13.spec
deleted file mode 100644
index b6d62d09b..000000000
--- a/redhat/applications/potracegui/potracegui-3.5.13.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp potracegui
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	KDE frontend for potrace [Trinity]
-Version:	1.3
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://potracegui.sourceforge.net
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-A KDE interface for the commandline tracing tools potrace and/or autotrace. It
-supports drag and drop as well as all image types recognized by KDE, which are
-a lot more than the 4 recognized by the potrace commandline tool. Loading of
-remote files (web, ftp, ...) is also supported.  
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/potracegui
-%{tde_datadir}/applnk/Utilities/potracegui.desktop
-%{tde_datadir}/apps/potracegui/potraceguiui.rc
-%{tde_tdedocdir}/HTML/en/potracegui/common
-%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/potracegui/index.docbook
-%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png
-%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 596cddfd6..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-commit 15276f365c15527fbb10d42e3f5896f540de7413
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1334351761 -0500
-
-    Updated to build with gcc 4.7.
-
-diff --git a/src/base/Sets.h b/src/base/Sets.h
-index 4fe14d1..2a59ed0 100644
---- a/src/base/Sets.h
-+++ b/src/base/Sets.h
-@@ -287,7 +287,7 @@ AbstractSet<Element, Container>::initialise()
-     m_final = m_baseIterator;
-     sample(m_baseIterator, true);
- 
--    if (getAsEvent(m_baseIterator)->isa(Note::EventType)) {
-+    if (AbstractSet::getAsEvent(m_baseIterator)->isa(Note::EventType)) {
-         m_initialNote = m_baseIterator;
-         m_finalNote = m_baseIterator;
-     }
-@@ -300,7 +300,7 @@ AbstractSet<Element, Container>::initialise()
-     for (i = j = m_baseIterator; i != getContainer().begin() && test(--j); i = j){
-         if (sample(j, false)) {
-             m_initial = j;
--            if (getAsEvent(j)->isa(Note::EventType)) {
-+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
- 		m_initialNote = j;
- 		if (m_finalNote == getContainer().end()) {
- 		    m_finalNote = j;
-@@ -317,7 +317,7 @@ AbstractSet<Element, Container>::initialise()
-     for (i = j = m_baseIterator; ++j != getContainer().end() && test(j); i = j) {
-         if (sample(j, true)) {
-             m_final = j;
--            if (getAsEvent(j)->isa(Note::EventType)) {
-+            if (AbstractSet::getAsEvent(j)->isa(Note::EventType)) {
- 		m_finalNote = j;
- 		if (m_initialNote == getContainer().end()) {
- 		    m_initialNote = j;
-@@ -332,17 +332,17 @@ bool
- AbstractSet<Element, Container>::sample(const Iterator &i, bool)
- {
-     const Quantizer &q(getQuantizer());
--    Event *e = getAsEvent(i);
-+    Event *e = AbstractSet::getAsEvent(i);
-     timeT d(q.getQuantizedDuration(e));
-     
-     if (e->isa(Note::EventType) || d > 0) {
-         if (m_longest == getContainer().end() ||
--            d > q.getQuantizedDuration(getAsEvent(m_longest))) {
-+            d > q.getQuantizedDuration(AbstractSet::getAsEvent(m_longest))) {
- //          std::cerr << "New longest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
-             m_longest = i;
-         }
-         if (m_shortest == getContainer().end() ||
--            d < q.getQuantizedDuration(getAsEvent(m_shortest))) {
-+            d < q.getQuantizedDuration(AbstractSet::getAsEvent(m_shortest))) {
- //          std::cerr << "New shortest in set at duration " << d << " and time " << e->getAbsoluteTime() << std::endl;
-             m_shortest = i;
-         }
-@@ -352,12 +352,12 @@ AbstractSet<Element, Container>::sample(const Iterator &i, bool)
-         long p = get__Int(e, BaseProperties::PITCH);
- 
-         if (m_highest == getContainer().end() ||
--            p > get__Int(getAsEvent(m_highest), BaseProperties::PITCH)) {
-+            p > get__Int(AbstractSet::getAsEvent(m_highest), BaseProperties::PITCH)) {
- //          std::cerr << "New highest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
-             m_highest = i;
-         }
-         if (m_lowest == getContainer().end() ||
--            p < get__Int(getAsEvent(m_lowest), BaseProperties::PITCH)) {
-+            p < get__Int(AbstractSet::getAsEvent(m_lowest), BaseProperties::PITCH)) {
- //          std::cerr << "New lowest in set at pitch " << p << " and time " << e->getAbsoluteTime() << std::endl;
-             m_lowest = i;
-         }
-@@ -376,8 +376,8 @@ GenericChord<Element, Container, singleStaff>::GenericChord(Container &c,
-                                                             PropertyName stemUpProperty) :
-     AbstractSet<Element, Container>(c, i, q),
-     m_stemUpProperty(stemUpProperty),
--    m_time(q->getQuantizedAbsoluteTime(getAsEvent(i))),
--    m_subordering(getAsEvent(i)->getSubOrdering()),
-+    m_time(q->getQuantizedAbsoluteTime(GenericChord::getAsEvent(i))),
-+    m_subordering(GenericChord::getAsEvent(i)->getSubOrdering()),
-     m_firstReject(c.end())
- {
-     AbstractSet<Element, Container>::initialise();
-@@ -416,7 +416,7 @@ template <class Element, class Container, bool singleStaff>
- bool
- GenericChord<Element, Container, singleStaff>::test(const Iterator &i)
- {
--    Event *e = getAsEvent(i);
-+    Event *e = GenericChord::getAsEvent(i);
-     if (AbstractSet<Element, Container>::
- 	getQuantizer().getQuantizedAbsoluteTime(e) != m_time) {
- 	return false;
-@@ -452,7 +452,7 @@ bool
- GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
-                                                       bool goingForwards)
- {
--    Event *e1 = getAsEvent(i);
-+    Event *e1 = GenericChord::getAsEvent(i);
-     if (!e1->isa(Note::EventType)) {
-         if (goingForwards && m_firstReject == AbstractSet<Element, Container>::getContainer().end()) m_firstReject = i;
-         return false;
-@@ -472,7 +472,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
- 
-         if (AbstractSet<Element, Container>::m_baseIterator != AbstractSet<Element, Container>::getContainer().end()) {
- 
--            Event *e0 = getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
-+            Event *e0 = GenericChord::getAsEvent(AbstractSet<Element, Container>::m_baseIterator);
- 
-             if (!(m_stemUpProperty == PropertyName::EmptyPropertyName)) {
- 
-@@ -518,7 +518,7 @@ GenericChord<Element, Container, singleStaff>::sample(const Iterator &i,
-     }
- 
-     AbstractSet<Element, Container>::sample(i, goingForwards);
--    push_back(i);
-+    this->push_back(i);
-     return true;
- }
- 
-@@ -560,7 +560,7 @@ GenericChord<Element, Container, singleStaff>::getMarkCountForChord() const
- 
-     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
- 
--        Event *e = getAsEvent((*this)[i]);
-+        Event *e = GenericChord::getAsEvent((*this)[i]);
-         std::vector<Mark> marks(Marks::getMarks(*e));
- 
-         for (std::vector<Mark>::iterator j = marks.begin(); j != marks.end(); ++j) {
-@@ -580,7 +580,7 @@ GenericChord<Element, Container, singleStaff>::getMarksForChord() const
- 
-     for (unsigned int i = 0; i < std::vector<typename Container::iterator>::size(); ++i) {
- 
--        Event *e = getAsEvent((*this)[i]);
-+        Event *e = GenericChord::getAsEvent((*this)[i]);
-         std::vector<Mark> marks(Marks::getMarks(*e));
- 
- 
-@@ -607,9 +607,9 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
- 
-     for (typename std::vector<typename Container::iterator>::const_iterator
-              i = std::vector<typename Container::iterator>::begin(); i != std::vector<typename Container::iterator>::end(); ++i) {
--        if (getAsEvent(*i)->has(BaseProperties::PITCH)) {
-+        if (GenericChord::getAsEvent(*i)->has(BaseProperties::PITCH)) {
-             int pitch = get__Int
--                (getAsEvent(*i), BaseProperties::PITCH);
-+                (GenericChord::getAsEvent(*i), BaseProperties::PITCH);
-             if (pitches.size() > 0 && pitches[pitches.size()-1] == pitch) 
-                 continue;
-             pitches.push_back(pitch);
-@@ -641,7 +641,7 @@ GenericChord<Element, Container, singleStaff>::getPreviousNote()
-     while (1) {
-         if (i == AbstractSet<Element, Container>::getContainer().begin()) return AbstractSet<Element, Container>::getContainer().end();
-         --i;
--        if (getAsEvent(i)->isa(Note::EventType)) {
-+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
-             return i;
-         }
-     }
-@@ -655,7 +655,7 @@ GenericChord<Element, Container, singleStaff>::getNextNote()
-     Iterator i(AbstractSet<Element, Container>::getFinalElement());
-     while (  i != AbstractSet<Element, Container>::getContainer().end() &&
-            ++i != AbstractSet<Element, Container>::getContainer().end()) {
--        if (getAsEvent(i)->isa(Note::EventType)) {
-+        if (GenericChord::getAsEvent(i)->isa(Note::EventType)) {
-             return i;
-         }
-     }
-@@ -677,8 +677,8 @@ GenericChord<Element, Container, singleStaff>::PitchGreater::operator()(const It
-                                                            const Iterator &b)
- {
-     try {
--        long ap = get__Int(getAsEvent(a), BaseProperties::PITCH);
--        long bp = get__Int(getAsEvent(b), BaseProperties::PITCH);
-+        long ap = get__Int(GenericChord::getAsEvent(a), BaseProperties::PITCH);
-+        long bp = get__Int(GenericChord::getAsEvent(b), BaseProperties::PITCH);
-         return (ap < bp);
-     } catch (Event::NoData) {
-         std::cerr << "Bad karma: PitchGreater failed to find one or both pitches" << std::endl;
-diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
-index 3ec8e94..fab09c3 100644
---- a/src/document/RosegardenGUIDoc.cpp
-+++ b/src/document/RosegardenGUIDoc.cpp
-@@ -2106,15 +2106,15 @@ RosegardenGUIDoc::stopRecordingMidi()
- 
-         bool meaningless = true;
- 
--        for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
-+        for (Segment::iterator j = s->begin(); j != s->end(); ++j) {
- 
--            if ((*i)->isa(Clef::EventType)) continue;
-+            if ((*j)->isa(Clef::EventType)) continue;
- 
-             // no rests in the segment yet, so anything else is meaningful
-             meaningless = false;
- 
--            if (!haveMeaning || (*i)->getAbsoluteTime() < earliestMeaning) {
--                earliestMeaning = (*i)->getAbsoluteTime();
-+            if (!haveMeaning || (*j)->getAbsoluteTime() < earliestMeaning) {
-+                earliestMeaning = (*j)->getAbsoluteTime();
-             }
- 
-             haveMeaning = true;
-@@ -2149,13 +2149,13 @@ RosegardenGUIDoc::stopRecordingMidi()
-          ++i) {
- 
-         Segment *s = i->second;
--        Segment::iterator i = s->begin();
-+        Segment::iterator j = s->begin();
- 
--        if (i == s->end() || !(*i)->isa(Clef::EventType)) continue;
-+        if (j == s->end() || !(*j)->isa(Clef::EventType)) continue;
- 
--        if ((*i)->getAbsoluteTime() < meaningfulBarStart) {
--            Event *e = new Event(**i, meaningfulBarStart);
--            s->erase(i);
-+        if ((*j)->getAbsoluteTime() < meaningfulBarStart) {
-+            Event *e = new Event(**j, meaningfulBarStart);
-+            s->erase(j);
-             s->insert(e);
-         }
-     }
-diff --git a/src/gui/application/LircClient.cpp b/src/gui/application/LircClient.cpp
-index 7664b9e..8b20c84 100644
---- a/src/gui/application/LircClient.cpp
-+++ b/src/gui/application/LircClient.cpp
-@@ -36,6 +36,7 @@
- #include <tqsocketnotifier.h>
- #include <fcntl.h>
- #include <cstdlib>
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/application/LircCommander.cpp b/src/gui/application/LircCommander.cpp
-index e323539..61afaca 100644
---- a/src/gui/application/LircCommander.cpp
-+++ b/src/gui/application/LircCommander.cpp
-@@ -37,7 +37,7 @@
- #include "RosegardenGUIView.h"
- 
- #include <tqobject.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
-index b3147de..0744afa 100644
---- a/src/gui/application/main.cpp
-+++ b/src/gui/application/main.cpp
-@@ -22,6 +22,7 @@
- #include <tqtimer.h>
- #include <kapplication.h>
- #include <sys/time.h>
-+#include <unistd.h>
- #include "base/RealTime.h"
- 
- #include <kcmdlineargs.h>
-diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp
-index 6e4560d..2417c67 100644
---- a/src/gui/seqmanager/ControlBlockMmapper.cpp
-+++ b/src/gui/seqmanager/ControlBlockMmapper.cpp
-@@ -42,6 +42,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/seqmanager/SegmentMmapper.cpp b/src/gui/seqmanager/SegmentMmapper.cpp
-index b859aa6..29fe715 100644
---- a/src/gui/seqmanager/SegmentMmapper.cpp
-+++ b/src/gui/seqmanager/SegmentMmapper.cpp
-@@ -45,7 +45,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/seqmanager/SequencerMapper.cpp b/src/gui/seqmanager/SequencerMapper.cpp
-index eec66a0..3a051e3 100644
---- a/src/gui/seqmanager/SequencerMapper.cpp
-+++ b/src/gui/seqmanager/SequencerMapper.cpp
-@@ -40,7 +40,7 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <errno.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/studio/AudioPluginManager.cpp b/src/gui/studio/AudioPluginManager.cpp
-index 24b49f2..4457493 100644
---- a/src/gui/studio/AudioPluginManager.cpp
-+++ b/src/gui/studio/AudioPluginManager.cpp
-@@ -37,7 +37,7 @@
- #include <tqmutex.h>
- #include <tqstring.h>
- #include <tqthread.h>
--
-+#include <unistd.h>
- 
- namespace Rosegarden
- {
-diff --git a/src/gui/studio/AudioPluginOSCGUIManager.cpp b/src/gui/studio/AudioPluginOSCGUIManager.cpp
-index 13da726..7b8bbd3 100644
---- a/src/gui/studio/AudioPluginOSCGUIManager.cpp
-+++ b/src/gui/studio/AudioPluginOSCGUIManager.cpp
-@@ -25,6 +25,7 @@
- #ifdef HAVE_LIBLO
- 
- #include <lo/lo.h>
-+#include <unistd.h>
- 
- #include "AudioPluginOSCGUIManager.h"
- 
-diff --git a/src/sound/RingBuffer.h b/src/sound/RingBuffer.h
-index 0cc5dc6..6ea0d4e 100644
---- a/src/sound/RingBuffer.h
-+++ b/src/sound/RingBuffer.h
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <sys/mman.h>
-+#include <string.h>
- 
- #include "Scavenger.h"
- 
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch
deleted file mode 100644
index 99bbd7f17..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-fix_gcc47_compilation_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp.ORI	2012-05-06 12:31:01.464997883 +0200
-+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp	2012-05-06 12:31:19.271625694 +0200
-@@ -22,6 +22,7 @@
-     COPYING included with this distribution for more information.
- */
- 
-+#include <unistd.h>
- 
- #include "AudioPreviewUpdater.h"
- 
---- rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h.ORI	2012-05-06 12:32:47.222788008 +0200
-+++ rosegarden/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h	2012-05-06 12:33:01.046499259 +0200
-@@ -26,6 +26,7 @@
- #ifndef _RG_AUDIOPREVIEWUPDATER_H_
- #define _RG_AUDIOPREVIEWUPDATER_H_
- 
-+#include <unistd.h>
- #include <tqobject.h>
- #include <tqrect.h>
- #include <vector>
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch
deleted file mode 100644
index 6967f300c..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rosegarden/src/CMakeLists.txt.ORI	2011-11-26 23:09:57.776046683 +0100
-+++ rosegarden/src/CMakeLists.txt	2011-11-26 23:10:07.534844583 +0100
-@@ -148,6 +148,7 @@
- 
- TARGET_LINK_LIBRARIES(rosegarden
-     dl
-+    fontconfig
-     lo
-     ${QT_AND_KDECORE_LIBS} 
-     ${LIBLO_LIBS}
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
deleted file mode 100644
index f4e7d4b98..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rosegarden/src/CMakeLists.txt.ORI	2012-08-06 15:14:11.135307943 +0200
-+++ rosegarden/src/CMakeLists.txt	2012-08-06 15:14:13.950244825 +0200
-@@ -150,11 +150,11 @@
- TARGET_LINK_LIBRARIES(rosegarden
-     dl
-     lo
-+    ${XFT_LIBS}
-     ${QT_AND_KDECORE_LIBS} 
-     ${LIBLO_LIBS}
-     ${LRDF_LIBS}
-     ${FFTW3F_LIBS}
--    ${XFT_LIBS}
-     ${LIRC_LIBS}
-     ${JACK_LIBS}
-     kio
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
deleted file mode 100644
index 081bc5d98..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
+++ /dev/null
@@ -1,222 +0,0 @@
-# Default version for this component
-%define kdecomp rosegarden
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	1.7.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group: 	    Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-Patch0:		rosegarden-3.5.13-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
-BuildRequires:	liblo-devel
-BuildRequires:	liblrdf-devel
-BuildRequires:	fontconfig-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	lirc-devel
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-Requires:	lilypond
-Requires:	perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:	libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:	libsndfile
-%else
-Requires:	libsndfile-utils
-%endif
-%endif
-
-# LIRC does not exist on RHEL.
-%if 0%{?fedora} > 0
-BuildRequires:	lirc-devel
-%endif
-
-Requires:	%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-# Hard-coded path to TQT binaries spotted !!!
-%__sed -i CMakeLists.txt \
-	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-### FIXME FIXME FIXME !!! FTBFS on Mageia 2 / Mandriva 2011
-export LDFLAGS="${LDFLAGS} -lXft -lfontconfig -lkio -lkdeprint -llrdf -lfftw3f -llirc_client -ljack"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-  -DWANT_LIRC=ON \
-%else
-  -DWANT_LIRC=OFF \
-%endif
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
deleted file mode 100644
index 6a96604e9..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
+++ /dev/null
@@ -1,217 +0,0 @@
-# Default version for this component
-%define tde_pkg rosegarden
-%define tde_version 3.5.13.2
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		music editor and MIDI/audio sequencer [Trinity]
-Version:		1.7.0
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.rosegardenmusic.com/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	fftw-devel
-BuildRequires:	liblo-devel
-BuildRequires:	fontconfig-devel
-
-# DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	dssi-devel
-%endif
-
-# LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	liblrdf-devel
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-# LIRC support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
-%define with_lirc 1
-BuildRequires:	lirc-devel
-%endif
-
-Requires:		lilypond
-Requires:		perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:		libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:		libsndfile
-%else
-Requires:		libsndfile-utils
-%endif
-%endif
-
-
-Requires:		%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a TDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group:			Applications/Multimedia
-Requires:		%{name} == %{version}-%{release}
-Summary:		music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a TDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. %{_sysconfdir}/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-  %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%changelog
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.spec
deleted file mode 100644
index f80dc9573..000000000
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.spec
+++ /dev/null
@@ -1,222 +0,0 @@
-# Default version for this component
-%define kdecomp rosegarden
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	music editor and MIDI/audio sequencer [Trinity]
-Version:	1.7.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group: 	    Applications/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.rosegardenmusic.com/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-Patch0:		rosegarden-3.5.13-ftbfs.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Commit #15276f36]
-Patch1:		rosegarden-3.5.13-fix_gcc47_compilation.patch
-
-# [rosegarden] Updated to build with gcc 4.7. [Bug #958]
-Patch2:		rosegarden-3.5.13-fix_gcc47_compilation_2.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	fftw-devel
-BuildRequires:	dssi-devel
-BuildRequires:	liblo-devel
-BuildRequires:	liblrdf-devel
-BuildRequires:	fontconfig-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	lirc-devel
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-Requires:	lilypond
-Requires:	perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:	libsndfile
-%else
-Requires:	libsndfile-utils
-%endif
-%endif
-
-# LIRC does not exist on RHEL.
-%if 0%{?fedora} > 0
-BuildRequires:	lirc-devel
-%endif
-
-Requires:	%{name}-data == %{version}-%{release}
-
-%description
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group: 	    Applications/Multimedia
-Requires:	%{name} == %{version}-%{release}
-Summary:	music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a KDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# Hard-coded path to TQT binaries spotted !!!
-%__sed -i CMakeLists.txt \
-	-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-	-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-### FIXME FIXME FIXME !!! FTBFS on Mageia 2 / Mandriva 2011
-export LDFLAGS="${LDFLAGS} -lXft -lfontconfig -lkio -lkdeprint -llrdf -lfftw3f -llirc_client -ljack"
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-  -DWANT_LIRC=ON \
-%else
-  -DWANT_LIRC=OFF \
-%endif
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-for f in hicolor locolor; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
-- Updated to build with gcc 4.7. [Commit #15276f36]
-- Enables JACK support
-
-* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch b/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
deleted file mode 100644
index ce76facdc..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- smartcardauth/src/ckpasswd.c.ORI	2011-12-04 03:44:36.047000504 -0500
-+++ smartcardauth/src/ckpasswd.c	2011-12-04 03:44:47.450745795 -0500
-@@ -30,6 +30,7 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <getopt.h>
- 
- #define DB_DBM_HSEARCH 1
- #include <db.h>
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
deleted file mode 100644
index 4c3e28317..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# Default version for this component
-%define kdecomp smartcardauth
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
-Version:	1.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Patch0:		smartcardauth-3.5.13-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-#BuildRequires:	perl-PAR-Packer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		perl-pcsc-perl
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:		pcsc-perl
-%endif
-%if 0%{?suse_version}
-Requires:		perl-pcsc
-%endif
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt3.sh
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "src/Makefile" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-	-e "s|/usr/include/qt3|${QTINC}|g"
-
-%__sed -i "Makefile" \
-	-e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./build_ckpasswd
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__cp -Rp usr/*  %{buildroot}%{tde_prefix}
-
-%__mkdir_p %{buildroot}%{_sysconfdir}
-%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
deleted file mode 100644
index 18d214b2c..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
+++ /dev/null
@@ -1,138 +0,0 @@
-# Default version for this component
-%define tde_pkg smartcardauth
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		SmartCard Login and LUKS Decrypt, Setup Utility
-Version:		1.0
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/System
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-#BuildRequires:	perl-PAR-Packer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		perl-pcsc-perl
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:		pcsc-perl
-%endif
-%if 0%{?suse_version}
-Requires:		perl-pcsc
-%endif
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__sed -i "Makefile" \
-	-e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g"
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-
-./build_ckpasswd
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__cp -Rp usr/*  %{buildroot}%{tde_prefix}
-
-%__mkdir_p %{buildroot}%{_sysconfdir}
-%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
-
-
-%changelog
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
deleted file mode 100644
index 8143809d4..000000000
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
+++ /dev/null
@@ -1,144 +0,0 @@
-# Default version for this component
-%define kdecomp smartcardauth
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
-Version:	1.0
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Patch0:		smartcardauth-3.5.13-ftbfs.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-#BuildRequires:	perl-PAR-Packer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		perl-pcsc-perl
-%else
-Requires:		pcsc-perl
-%endif
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE3.x, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-%prep
-unset QTDIR; . /etc/profile.d/qt.sh
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "src/Makefile" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-	-e "s|/usr/include/qt3|${QTINC}|g"
-
-%__sed -i "Makefile" \
-	-e "s|/usr/lib/perl5/Chipcard|/usr/lib64/perl5/vendor_perl/Chipcard|g"
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-./build_ckpasswd
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-
-%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl
-%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd
-#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon
-%__cp -Rp usr/*  %{buildroot}%{tde_prefix}
-
-%__mkdir_p %{buildroot}%{_sysconfdir}
-%__cp -Rp etc/* %{buildroot}%{_sysconfdir}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_sysconfdir}/init/smartauthlogin.conf
-%{_sysconfdir}/smartauth/smartauth.sh.in
-%{_sysconfdir}/smartauth/smartauthmon.sh.in
-%{tde_bindir}/cryptosmartcard.sh
-%{tde_bindir}/scriptor.pl
-%{tde_bindir}/setupcard.sh
-%{tde_bindir}/setupslavecard.sh
-%{tde_bindir}/smartauth.sh
-%{tde_bindir}/smartauthckpasswd
-%{tde_bindir}/smartauthmon
-%{tde_datadir}/applications/smartcardauth.desktop
-%{tde_datadir}/applications/smartcardrestrict.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{tde_datadir}/initramfs-tools/hooks/cryptlukssc
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 03048f58d..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit b4c7fd481649eaa362dc426e6b5f8d23b0c9e836
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1335631847 -0500
-
-    GCC 4.7 fixes.
-
-diff --git a/smb4k/configdlg/smb4kshareoptions.cpp b/smb4k/configdlg/smb4kshareoptions.cpp
-index 24e309a..6627b51 100644
---- a/smb4k/configdlg/smb4kshareoptions.cpp
-+++ b/smb4k/configdlg/smb4kshareoptions.cpp
-@@ -40,6 +40,7 @@
- // system includes
- #include <sys/types.h>
- #include <pwd.h>
-+#include <unistd.h>
- 
- // applications specific includes
- #include "smb4kshareoptions.h"
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.1.spec b/redhat/applications/smb4k/smb4k-3.5.13.1.spec
deleted file mode 100644
index 9b6e0320b..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13.1.spec
+++ /dev/null
@@ -1,188 +0,0 @@
-# Default version for this component
-%define kdecomp smb4k
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A Samba (SMB) share advanced browser for Trinity
-Version:	0.9.4
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software 
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as 
-possible.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4kconfigdialog.la
-%{tde_tdelibdir}/libsmb4kconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-3
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec
deleted file mode 100644
index de9634699..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec
+++ /dev/null
@@ -1,174 +0,0 @@
-# Default version for this component
-%define tde_pkg smb4k
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		A Samba (SMB) share advanced browser for Trinity
-Version:		0.9.4
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-
-%description
-Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software 
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as 
-possible.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4kconfigdialog.la
-%{tde_tdelibdir}/libsmb4kconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-export KDEDIR="%{tde_prefix}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.spec b/redhat/applications/smb4k/smb4k-3.5.13.spec
deleted file mode 100644
index 8eba1163c..000000000
--- a/redhat/applications/smb4k/smb4k-3.5.13.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-# Default version for this component
-%define kdecomp smb4k
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A Samba (SMB) share advanced browser for Trinity
-Version:	0.9.4
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [smb4k] Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-Patch1:		smb4k-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Smb4K is a SMB (Windows) share browser for KDE. It uses the Samba software 
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as 
-possible.
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4kconfigdialog.la
-%{tde_tdelibdir}/libsmb4kconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/smb4k_shell.rc
-%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%Changelog
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
deleted file mode 100644
index 221f14ed2..000000000
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
+++ /dev/null
@@ -1,181 +0,0 @@
-# Default version for this component
-%define kdecomp soundkonverter
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	audio converter frontend for Trinity
-Version:	0.3.8
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Application/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://potracegui.sourceforge.net
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary:		audio converter frontend for Trinity (Amarok script)
-Group:			Application/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'soundkonverter-trinity' package for more information.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \
-  --enable-closure
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.8-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec
deleted file mode 100644
index c64351829..000000000
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-# Default version for this component
-%define tde_pkg soundkonverter
-%define tde_version 3.5.13.2
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		audio converter frontend for Trinity
-Version:		0.3.8
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Application/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://potracegui.sourceforge.net
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary:		audio converter frontend for Trinity (Amarok script)
-Group:			Application/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'soundkonverter-trinity' package for more information.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=/usr/include/cdda
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-
-%changelog
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
deleted file mode 100644
index 1e8955d15..000000000
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-# Default version for this component
-%define kdecomp soundkonverter
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	audio converter frontend for Trinity
-Version:	0.3.8
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Application/Multimedia
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://potracegui.sourceforge.net
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary:		audio converter frontend for Trinity (Amarok script)
-Group:			Application/Multimedia
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'soundkonverter-trinity' package for more information.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \
-  --enable-closure
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec b/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
deleted file mode 100644
index 3ca00a641..000000000
--- a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
+++ /dev/null
@@ -1,414 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-Name:		trinity-guidance
-Summary:	A collection of system administration tools for Trinity
-Version:	0.8.0svn20080103
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/guidance
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kde-guidance-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	trinity-pytdeextensions
-BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	python-trinity
-BuildRequires:	chrpath
-BuildRequires:	gcc-c++
-
-# SIP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-%endif
-%if 0%{?suse_version}
-BuildRequires:	python-sip-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	trinity-sip-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	sip-devel
-%endif
-
-# PYTHON-QT support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-Requires:	python-qt
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires:	trinity-PyQt-devel
-Requires:	trinity-PyQt
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	PyQt-devel
-Requires:	PyQt
-%endif
-
-
-Requires:		python-trinity
-Requires:		trinity-pytdeextensions
-Requires:		%{name}-backends
-Requires:		python
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		hwdata
-%endif
-
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts:	guidance-power-manager
-Conflicts:	kde-guidance-powermanager
-%endif
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o  userconfig - User and Group administration
- o  serviceconfig - Service/daemon administration
- o  mountconfig - Disk and filesystem administration
- o  wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings 
-or can be run as standalone applications.
-
-
-
-%package backends
-Group:		Applications/Utilities
-Summary:	collection of system administration tools for GNU/Linux [Trinity]
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	hwdata
-%endif
-Requires:	python
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-
-%package powermanager
-Group:		Applications/Utilities
-Summary:	HAL based power manager applet [Trinity]
-Requires:	%{name} = %{version}-%{release}
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n kde-guidance-3.5.13.1
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export KDEDIR=%{tde_prefix}
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-./setup.py build
-
-
-%install
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-./setup.py install \
-	--prefix=%{tde_prefix} \
-	--root=%{buildroot}
-
-# Fix building directories stored inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION 
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch}
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
-
-# fix the link properly
-%__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# (obsolete)  put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
-
-##### BACKENDS INSTALLATION
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-		$i > $i.temp;
-	if cmp --quiet $i $i.temp; then
-		rm -f $i.temp;
-	else
-		mv -f $i.temp $i;
-		chmod 755 $i;
-		echo "fixed interpreter: $i";
-	fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py 
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-#%{tde_bindir}/displayconfig
-#%{tde_bindir}/displayconfig-restore
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/ktimerdialog.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/servertestdialog.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%files -n trinity-guidance-backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/ScanPCI.py*
-%{python_sitearch}/%{name}/infimport.py*
-%{python_sitearch}/%{name}/displayconfigabstraction.py*
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
-%{python_sitearch}/%{name}/displayconfig-restore.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/execwithcapture.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/%{name}/xorgconfig.py*
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-4
-- Initial release for TDE 3.5.13.1
-
-* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.spec b/redhat/applications/tde-guidance/guidance-3.5.13.spec
deleted file mode 100644
index 3c7bcb7fe..000000000
--- a/redhat/applications/tde-guidance/guidance-3.5.13.spec
+++ /dev/null
@@ -1,390 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-Name:		trinity-guidance
-Summary:	A collection of system administration tools for Trinity
-Version:	0.8.0svn20080103
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/guidance
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	kde-guidance-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	trinity-pykdeextensions
-BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	python-trinity
-BuildRequires:	chrpath
-BuildRequires:	gcc-c++
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-BuildRequires:	python-qt
-Requires:	python-qt
-%else
-%if 0%{?rhel} == 5
-BuildRequires:	trinity-PyQt-devel
-BuildRequires:	trinity-sip-devel
-Requires:		trinity-PyQt
-%else
-BuildRequires:	PyQt-devel
-BuildRequires:	sip-devel
-Requires:		PyQt
-%endif
-%endif
-
-
-Requires:		python-trinity
-Requires:		%{name}-backends
-Requires:		hwdata
-Requires:		python
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts:	guidance-power-manager
-Conflicts:	kde-guidance-powermanager
-%endif
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o  userconfig - User and Group administration
- o  serviceconfig - Service/daemon administration
- o  mountconfig - Disk and filesystem administration
- o  wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings 
-or can be run as standalone applications.
-
-
-
-%package backends
-Group:		Applications/Utilities
-Summary:	collection of system administration tools for GNU/Linux [Trinity]
-Requires:	hwdata
-Requires:	python
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-
-%package powermanager
-Group:		Applications/Utilities
-Summary:	HAL based power manager applet [Trinity]
-Requires:	%{name} = %{version}-%{release}
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-
-%prep
-%setup -q -n applications/kde-guidance
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export KDEDIR=%{tde_prefix}
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-./setup.py build
-
-
-%install
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-./setup.py install \
-	--prefix=%{tde_prefix} \
-	--root=%{buildroot}
-
-# Fix building directories stored inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION 
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch}
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name}
-
-# fix the link properly
-%__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# (obsolete)  put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop
-
-##### BACKENDS INSTALLATION
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-		$i > $i.temp;
-	if cmp --quiet $i $i.temp; then
-		rm -f $i.temp;
-	else
-		mv -f $i.temp $i;
-		chmod 755 $i;
-		echo "fixed interpreter: $i";
-	fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-#find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \;
-
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo
-
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py 
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-#%{tde_bindir}/displayconfig
-#%{tde_bindir}/displayconfig-restore
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py 
-%{python_sitearch}/%{name}/SimpleCommandRunner.py
-%{python_sitearch}/%{name}/fuser.py
-%{python_sitearch}/%{name}/fuser_ui.py
-%{python_sitearch}/%{name}/grubconfig.py
-%{python_sitearch}/%{name}/ktimerdialog.py
-%{python_sitearch}/%{name}/mountconfig.py
-%{python_sitearch}/%{name}/servertestdialog.py
-%{python_sitearch}/%{name}/serviceconfig.py
-%{python_sitearch}/%{name}/sizeview.py
-%{python_sitearch}/%{name}/unixauthdb.py
-%{python_sitearch}/%{name}/userconfig.py
-%{python_sitearch}/%{name}/wineconfig.py
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%files -n trinity-guidance-backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py
-%{python_sitearch}/%{name}/ScanPCI.py
-%{python_sitearch}/%{name}/infimport.py
-%{python_sitearch}/%{name}/displayconfigabstraction.py
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-%{python_sitearch}/%{name}/displayconfig-restore.py
-%{python_sitearch}/%{name}/drivedetect.py
-%{python_sitearch}/%{name}/execwithcapture.py
-%{python_sitearch}/%{name}/wineread.py
-%{python_sitearch}/%{name}/winewrite.py
-%{python_sitearch}/%{name}/xf86misc.py
-%{python_sitearch}/%{name}/xorgconfig.py
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py
-%{python_sitearch}/%{name}/guidance-power-manager.py
-%{python_sitearch}/%{name}/powermanage.py
-%{python_sitearch}/%{name}/gpmhelper.py
-%{python_sitearch}/%{name}/powermanager_ui.py
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py
-%{python_sitearch}/%{name}/notify.py
-%{python_sitearch}/%{name}/tooltip.py
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-
-
-%Changelog
-* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch b/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch
deleted file mode 100644
index 9bb5fa5b4..000000000
--- a/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- kde-guidance/wineconfig/winewrite.py.wine	2010-08-12 05:25:24.000000000 +0200
-+++ kde-guidance/wineconfig/winewrite.py	2012-08-07 18:43:48.291577133 +0200
-@@ -60,14 +60,14 @@
-     SetShellLinks(drives[26:])
-             
- def SetShellLinks(shelllinks):
--    existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'])
-+    existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'])
-     set(existingshelllinks)
-     shellregistry = wineread.GetShellRegistry()
-     
-     for link in shelllinks:
-         createLink = False
-         if link[1] in existingshelllinks:	# The link exists
--            linkpath = wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1]
-+            linkpath = wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'] + "/" + link[1]
-             if link[2]:    # The folder is mapped
-                 # Compare for changes
-                 changed = False
-@@ -98,7 +98,7 @@
-                 continue
-             
-         if createLink:
--            os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1])
-+            os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/users/" + os.environ['USER'] + "/" + link[1])
-             if shellregistry.has_key(link[1]):
-                 SetShellRegistry(link)
-                 
-@@ -426,7 +426,7 @@
-     if not path:
-         path = wineread.default_winepath
-     
--    os.system("WINEPREFIX=" + path + " wineprefixcreate --wait")
-+    os.system("WINEPREFIX=" + path + " wineboot")
-     
- # ----- Theming -----
-             
-@@ -486,4 +486,4 @@
-         winport = ports_translation[port.rstrip("012345678")] +\
-             str(int(port.lstrip("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")) + 1)
-         os.symlink("/dev/" + port, wineread.winepath + "/dosdevices/" + winport)
--    
-\ Pas de fin de ligne à la fin du fichier
-+    
---- kde-guidance/wineconfig/wineread.py.ORI	2012-08-07 18:44:08.910051574 +0200
-+++ kde-guidance/wineconfig/wineread.py	2012-08-07 18:44:38.675294351 +0200
-@@ -23,7 +23,7 @@
- # Assumes the fake windows is installed in ~/.wine
- default_winepath = os.environ['HOME'] + "/.wine"
- winepath = default_winepath
--defaultwinfolderspath = "c:\\windows\\profiles\\" + os.environ['USER']
-+defaultwinfolderspath = "c:\\users\\" + os.environ['USER']
- 
- # Where the dll's are
- default_winebuildpath = "/usr/lib/wine"
-@@ -113,7 +113,7 @@
-     [30,"My Video","","","",""])
-     
- folder_nonexistent = "This folder does not exist, please map it."
--profilesdirectory = winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER']
-+profilesdirectory = winepath + "/dosdevices/c:/users/" + os.environ['USER']
-         
- def GetEmptyShellLinks():
-     """ Returns a list of important windows folders """
-@@ -537,7 +537,7 @@
-     if not path:
-         path = self.default_winepath
-     
--    return os.path.exists(path + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) and \
-+    return os.path.exists(path + "/dosdevices/c:/users/" + os.environ['USER']) and \
-         os.path.exists(path + "/dosdevices/c:/windows/system32") and \
-         os.path.exists(path + "/system.reg") and os.path.exists(path + "/userdef.reg") and \
-         os.path.exists(path + "/user.reg")
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch
deleted file mode 100644
index 34b15b791..000000000
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 3b6ac8e5301bb482b02af7e2b1f0ec613be61218
-Author: Francois Andriot <albator78@libertysurf.fr>
-Date:   1371158323 -0500
-
-    Work around mountconfig incorrectly handling LABEL tag
-    This resolves Bug 1545
-    Add ext4 support
-
-diff --git a/mountconfig/MicroHAL.py b/mountconfig/MicroHAL.py
-index 9ce8b83..9a913fa 100755
---- a/mountconfig/MicroHAL.py
-+++ b/mountconfig/MicroHAL.py
-@@ -669,6 +669,10 @@ class MicroHAL(object):
-                                 
-                                 if u"volume.label" in parsed_hash:
-                                     new_device.label = self._parseString(parsed_hash[u"volume.label"][0])
-+                                    # If HAL returns label beginning with '#', it usually means that the
-+                                    # actual label contains an Unix path. So we replace '#' with '/'.
-+                                    if len(new_device.label) and new_device.label[0]=='%':
-+                                        new_device.label = new_device.label.replace('%', '/')
-                                 
-                                 if u"volume.size" in parsed_hash:
-                                     size = parsed_hash[u"volume.size"][0]
-diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
-index eefa9fd..9c00b7d 100755
---- a/mountconfig/mountconfig.py
-+++ b/mountconfig/mountconfig.py
-@@ -82,6 +82,7 @@ Supported filesystems
- nfs
- ext2
- ext3
-+ext4
- reiserfs
- vfat
- ntfs
-@@ -1047,6 +1048,7 @@ class MountEntry(object):
- 
-         'ext2' : (MountEntryExtCommonUnixLocal,i18n("Ext2 - Second Extended FS")),
-         'ext3' : (MountEntryExtCommonUnixLocal,i18n("Ext3 - Third Extended FS")),
-+        'ext4' : (MountEntryExtCommonUnixLocal,i18n("Ext4 - Fourth Extended FS")),
-         'reiserfs' : (MountEntryExtCommonUnixLocal,i18n("ReiserFS")),
-         'reiser4' : (MountEntryExtCommonUnixLocal,i18n("Reiser4")),
-         'xfs' : (MountEntryExtCommonUnixLocal,i18n("XFS - SGI's journaling filesystem")),
-@@ -2389,6 +2391,7 @@ class MountEntryDialog(KDialogBase):
-     MountTypeEditorsDisk = {
-         'ext2' : MountEntryDialogOptionsCommonUnix,
-         'ext3' : MountEntryDialogOptionsCommonUnix,
-+        'ext4' : MountEntryDialogOptionsCommonUnix,
-         'reiserfs' : MountEntryDialogOptionsCommonUnix,
-         'reiser4' : MountEntryDialogOptionsCommonUnix,
-         'xfs' : MountEntryDialogOptionsCommonUnix,
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
deleted file mode 100644
index 7fbb91222..000000000
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ /dev/null
@@ -1,466 +0,0 @@
-# Default version for this component
-%define tde_pkg tde-guidance
-%define tde_version 3.5.13.2
-
-# REMOVE KDELIBS4-DEVEL before building !!!!
-
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-Name:			trinity-%{tde_pkg}
-Summary:		A collection of system administration tools for Trinity
-Version:		0.8.0svn20080103
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.simonzone.com/software/guidance
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [tde-guidance] Work around mountconfig incorrectly handling LABEL tag
-#  This resolves Bug 1545
-#  Add ext4 support
-Patch1:			tde-guidance-3.5.13.2-fix_mountconfig.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-pytdeextensions
-BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	trinity-python-trinity
-BuildRequires:	chrpath
-BuildRequires:	gcc-c++
-
-# SIP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-%endif
-%if 0%{?suse_version}
-BuildRequires:	python-sip-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	trinity-sip-devel
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	sip-devel
-%endif
-
-# PYTHON-QT support
-BuildRequires:	python-qt3-devel
-BuildRequires:	trinity-python-trinity-devel
-
-Requires:		python-qt3
-Requires:		trinity-python-trinity
-Requires:		trinity-pytdeextensions
-Requires:		python
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		hwdata
-%endif
-
-Requires:		%{name}-backends = %{version}-%{release}
-
-# POWERMANAGER support (requires HAL)
-%define with_powermanager 1
-
-# DISPLAYCONFIG support (deprecated)
-#define with_displayconfig 1
-
-Obsoletes:		trinity-guidance < %{version}-%{release}
-Provides:		trinity-guidance = %{version}-%{release}
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o  userconfig - User and Group administration
- o  serviceconfig - Service/daemon administration
- o  mountconfig - Disk and filesystem administration
- o  wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings 
-or can be run as standalone applications.
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%if 0%{?with_displayconfig}
-%{tde_bindir}/displayconfig
-%{tde_bindir}/displayconfig-restore
-%endif
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/ktimerdialog.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/servertestdialog.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
-
-# Files from powermanager
-%if 0%{?with_powermanager}
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%endif
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-##########
-
-%package backends
-Group:			Applications/Utilities
-Summary:		collection of system administration tools for GNU/Linux [Trinity]
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		hwdata
-%endif
-Requires:		python
-
-Obsoletes:		trinity-guidance-backends < %{version}-%{release}
-Provides:		trinity-guidance-backends = %{version}-%{release}
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-%files backends
-%defattr(-,root,root,-)
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/ScanPCI.py*
-%{python_sitearch}/%{name}/infimport.py*
-%if 0%{?with_displayconfig}
-%{python_sitearch}/%{name}/displayconfigabstraction.py*
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
-%{python_sitearch}/%{name}/displayconfig-restore.py*
-%endif
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/execwithcapture.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/%{name}/xorgconfig.py*
-%{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
-
-##########
-
-%if 0%{?with_powermanager}
-
-%package powermanager
-Group:			Applications/Utilities
-Summary:		HAL based power manager applet [Trinity]
-Requires:		%{name} = %{version}-%{release}
-Requires:		hal
-
-Obsoletes:		trinity-guidance-powermanager < %{version}-%{release}
-Provides:		trinity-guidance-powermanager = %{version}-%{release}
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts:	guidance-power-manager
-Conflicts:	kde-guidance-powermanager
-%endif
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch1 -p1 -b .mountconfig
-
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i "userconfig/unixauthdb.py" \
-  -e "s|self.first_uid = .*|self.first_uid = 500|" \
-  -e "s|self.first_gid = .*|self.first_gid = 500|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-export KDEDIR=%{tde_prefix}
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-# FTBFS on PCLOS ...
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
-fi
-
-./setup.py build
-
-
-%install
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-
-# For RHEL4 only
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-./setup.py install \
-	--prefix=%{tde_prefix} \
-	--root=%{buildroot}
-
-# Fix temporary build directories remaining inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-#%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
-#	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
-
-# Generates the startup scripts
-%__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# (obsolete)  put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-#%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop
-
-##### BACKENDS INSTALLATION
-# install displayconfig-hwprobe.py script
-#%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-#	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-%if 0%{?with_powermanager}
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/python-qt3
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-%else
-
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
-
-%endif
-
-# DISPLAYCONFIG (obsolete)
-%if 0%{?with_displayconfig}
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop
-
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-%else
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig*
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py*
-%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop
-%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png
-%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig
-%endif
-
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-		$i > $i.temp;
-	if cmp --quiet $i $i.temp; then
-		rm -f $i.temp;
-	else
-		mv -f $i.temp $i;
-		chmod 755 $i;
-		echo "fixed interpreter: $i";
-	fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec
deleted file mode 100644
index e2e128c2b..000000000
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec
+++ /dev/null
@@ -1,108 +0,0 @@
-# Default version for this component
-%define kdecomp kde-style-lipstik
-%define version 2.2.3
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Lipstik style for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Based on the plastik style, Lipstik is a purified style with many options to
-tune your desktop look.
-
-Lipstik also provides Lipstik-color-schemes
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_libdir}/kstyle_lipstik_config.la
-%{tde_libdir}/kstyle_lipstik_config.so
-%{tde_libdir}/plugins/styles/lipstik.la
-%{tde_libdir}/plugins/styles/lipstik.so
-%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{_datadir}/apps/kstyle/themes/lipstik.themerc
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec
deleted file mode 100644
index efd966e36..000000000
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec
+++ /dev/null
@@ -1,129 +0,0 @@
-# Default version for this component
-%define kdecomp kde-style-lipstik
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-style-lipstik
-Summary:	Lipstik style for TDE
-Version:	2.2.3
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-Obsoletes:		trinity-kde-style-lipstik
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Based on the plastik style, Lipstik is a purified style with many options to
-tune your desktop look.
-
-Lipstik also provides Lipstik-color-schemes
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_lipstik_config.la
-%{tde_tdelibdir}/kstyle_lipstik_config.so
-%{tde_tdelibdir}/plugins/styles/lipstik.la
-%{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec
deleted file mode 100644
index 3acbd7bf3..000000000
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-# Default version for this component
-%define kdecomp kde-style-lipstik
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-style-lipstik
-Summary:	Lipstik style for TDE
-Version:	2.2.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-Obsoletes:		trinity-kde-style-lipstik
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Based on the plastik style, Lipstik is a purified style with many options to
-tune your desktop look.
-
-Lipstik also provides Lipstik-color-schemes
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_lipstik_config.la
-%{tde_tdelibdir}/kstyle_lipstik_config.so
-%{tde_tdelibdir}/plugins/styles/lipstik.la
-%{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec
deleted file mode 100644
index 08e51de57..000000000
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define tde_pkg tde-style-lipstik
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-tde-style-lipstik
-Summary:		Lipstik style for TDE
-Version:		2.2.3
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:		trinity-kde-style-lipstik < %{version}-%{release}
-Provides:		trinity-kde-style-lipstik = %{version}-%{release}
-Obsoletes:		trinity-style-lipstik < %{version}-%{release}
-Provides:		trinity-style-lipstik = %{version}-%{release}
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-Based on the plastik style, Lipstik is a purified style with many options to
-tune your desktop look.
-
-Lipstik also provides Lipstik-color-schemes
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_lipstik_config.la
-%{tde_tdelibdir}/kstyle_lipstik_config.so
-%{tde_tdelibdir}/plugins/styles/lipstik.la
-%{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
-
-
-%changelog
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch
deleted file mode 100644
index d7e8df30c..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kde-style-qtcurve/CMakeLists.txt.ORI	2011-11-20 22:37:40.050443616 +0100
-+++ kde-style-qtcurve/CMakeLists.txt	2011-11-20 22:40:04.355439569 +0100
-@@ -46,7 +46,7 @@
-     if (QT_PLUGINS_DIR MATCHES NOTFOUND)
-       MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
-       SET(QT_INCLUDE_DIR "/usr/include/qt4")
--      SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib/trinity/plugins")
-+      SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins")
-     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
- endif (NOT QTC_QT_ONLY)
- 
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch
deleted file mode 100644
index 18c9e9ee7..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/config/qtcurveconfig.cpp.ORI	2012-08-29 22:09:16.845292598 +0200
-+++ a/config/qtcurveconfig.cpp	2012-08-29 22:13:35.992935999 +0200
-@@ -671,7 +671,7 @@
-     connect(activeTabAppearance, SIGNAL(activated(int)), SLOT(activeTabAppearanceChanged()));
-     connect(toolbarSeparators, SIGNAL(activated(int)), SLOT(updateChanged()));
-     connect(splitters, SIGNAL(activated(int)), SLOT(updateChanged()));
--    connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-+//    connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(fillSlider, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(sliderStyle, SIGNAL(activated(int)), SLOT(updateChanged()));
-     connect(roundMbTopOnly, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-@@ -749,10 +749,10 @@
-     connect(gtkButtonOrder, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(mapKdeIcons, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(passwordChar, SIGNAL(clicked()), SLOT(passwordCharClicked()));
--    connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-+//    connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(colorMenubarMouseOver, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(useHighlightForMenu, SIGNAL(toggled(bool)), SLOT(updateChanged()));
--    connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-+//    connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(fadeLines, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(menuIcons, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-     connect(stdBtnSizes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
-@@ -1436,7 +1436,7 @@
-     opts.shadeMenubarOnlyWhenActive=shadeMenubarOnlyWhenActive->isChecked();
-     opts.thinnerMenuItems=thinnerMenuItems->isChecked();
-     opts.thinnerBtns=thinnerBtns->isChecked();
--    opts.fixParentlessDialogs=fixParentlessDialogs->isChecked();
-+//    opts.fixParentlessDialogs=fixParentlessDialogs->isChecked();
-     opts.animatedProgress=animatedProgress->isChecked();
-     opts.stripedProgress=(EStripe)stripedProgress->currentItem();
-     opts.lighterPopupMenuBgnd=lighterPopupMenuBgnd->value();
-@@ -1526,11 +1526,11 @@
-     opts.gtkButtonOrder=gtkButtonOrder->isChecked();
-     opts.mapKdeIcons=mapKdeIcons->isChecked();
-     opts.passwordChar=toInt(passwordChar->text());
--    opts.framelessGroupBoxes=framelessGroupBoxes->isChecked();
-+//    opts.framelessGroupBoxes=framelessGroupBoxes->isChecked();
-     opts.customGradient=customGradient;
-     opts.colorMenubarMouseOver=colorMenubarMouseOver->isChecked();
-     opts.useHighlightForMenu=useHighlightForMenu->isChecked();
--    opts.groupBoxLine=groupBoxLine->isChecked();
-+//    opts.groupBoxLine=groupBoxLine->isChecked();
-     opts.fadeLines=fadeLines->isChecked();
-     opts.menuIcons=menuIcons->isChecked();
-     opts.stdBtnSizes=stdBtnSizes->isChecked();
-@@ -1575,7 +1575,7 @@
-     shadeMenubarOnlyWhenActive->setChecked(opts.shadeMenubarOnlyWhenActive);
-     thinnerMenuItems->setChecked(opts.thinnerMenuItems);
-     thinnerBtns->setChecked(opts.thinnerBtns);
--    fixParentlessDialogs->setChecked(opts.fixParentlessDialogs);
-+//    fixParentlessDialogs->setChecked(opts.fixParentlessDialogs);
-     animatedProgress->setChecked(opts.animatedProgress);
-     stripedProgress->setCurrentItem(opts.stripedProgress);
-     embolden->setChecked(opts.embolden);
-@@ -1651,7 +1651,7 @@
-     customCheckRadioColor->setColor(opts.customCheckRadioColor);
-     colorMenubarMouseOver->setChecked(opts.colorMenubarMouseOver);
-     useHighlightForMenu->setChecked(opts.useHighlightForMenu);
--    groupBoxLine->setChecked(opts.groupBoxLine);
-+//    groupBoxLine->setChecked(opts.groupBoxLine);
-     fadeLines->setChecked(opts.fadeLines);
-     menuIcons->setChecked(opts.menuIcons);
-     stdBtnSizes->setChecked(opts.stdBtnSizes);
-@@ -1678,7 +1678,7 @@
-     gtkButtonOrder->setChecked(opts.gtkButtonOrder);
-     mapKdeIcons->setChecked(opts.mapKdeIcons);
-     setPasswordChar(opts.passwordChar);
--    framelessGroupBoxes->setChecked(opts.framelessGroupBoxes);
-+//    framelessGroupBoxes->setChecked(opts.framelessGroupBoxes);
-     customGradient=opts.customGradient;
-     gradCombo->setCurrentItem(APPEARANCE_CUSTOM1);
- 
-@@ -1731,7 +1731,7 @@
-          shadeMenubarOnlyWhenActive->isChecked()!=currentStyle.shadeMenubarOnlyWhenActive ||
-          thinnerMenuItems->isChecked()!=currentStyle.thinnerMenuItems ||
-          thinnerBtns->isChecked()!=currentStyle.thinnerBtns ||
--         fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs ||
-+//         fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs ||
-          animatedProgress->isChecked()!=currentStyle.animatedProgress ||
-          stripedProgress->currentItem()!=currentStyle.stripedProgress ||
-          lighterPopupMenuBgnd->value()!=currentStyle.lighterPopupMenuBgnd ||
-@@ -1796,7 +1796,7 @@
-          splitters->currentItem()!=currentStyle.splitters ||
-          colorMenubarMouseOver->isChecked()!=currentStyle.colorMenubarMouseOver ||
-          useHighlightForMenu->isChecked()!=currentStyle.useHighlightForMenu ||
--         groupBoxLine->isChecked()!=currentStyle.groupBoxLine ||
-+//         groupBoxLine->isChecked()!=currentStyle.groupBoxLine ||
-          fadeLines->isChecked()!=currentStyle.fadeLines ||
-          menuIcons->isChecked()!=currentStyle.menuIcons ||
-          stdBtnSizes->isChecked()!=currentStyle.stdBtnSizes ||
-@@ -1819,7 +1819,7 @@
-          gtkComboMenus->isChecked()!=currentStyle.gtkComboMenus ||
-          gtkButtonOrder->isChecked()!=currentStyle.gtkButtonOrder ||
-          mapKdeIcons->isChecked()!=currentStyle.mapKdeIcons ||
--         framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes ||
-+//         framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes ||
- 
-          getSquareFlags()!=currentStyle.square ||
-          getWindowBorderFlags()!=currentStyle.windowBorder||
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch
deleted file mode 100644
index f328720a7..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- kde-style-qtcurve/cmake/QtCurveQt3.cmake.ORI	2012-08-29 19:47:59.470536207 +0200
-+++ kde-style-qtcurve/cmake/QtCurveQt3.cmake	2012-08-29 19:48:50.268522398 +0200
-@@ -1,5 +1,5 @@
- FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/)
--FIND_PATH(QT_PLUGINS_DIR imageformats
-+FIND_PATH(QT_PLUGINS_DIR designer
-   $ENV{QTDIR}/plugins
-   ${GLOB_PATHS_BIN}
-   /usr/local/qt/plugins
---- a/config/CMakeLists.txt.module	2011-08-22 00:39:00.000000000 +0200
-+++ a/config/CMakeLists.txt	2012-08-29 22:21:41.673500945 +0200
-@@ -4,9 +4,23 @@
-     set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp)
- endif (QTC_STYLE_SUPPORT)
- 
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
--trinity_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui)
--trinity_add_kpart(kstyle_qtcurve_config ${kstyle_qtcurve_config_PART_SRCS})
--trinity_automoc(${kstyle_qtcurve_config_PART_SRCS})
--target_link_libraries(kstyle_qtcurve_config ${QT_AND_KDECORE_LIBS} kio kdeui)
--install(TARGETS kstyle_qtcurve_config DESTINATION ${KDE3_LIB_DIR}/trinity)
-+include_directories(
-+	${CMAKE_SOURCE_DIR}
-+	${CMAKE_SOURCE_DIR}/common
-+	${CMAKE_CURRENT_BINARY_DIR}
-+	${CMAKE_BINARY_DIR}
-+	${TDE_INCLUDE_DIR}
-+	${QT_INCLUDE_DIR}
-+)
-+
-+link_directories(
-+	${TQT_LIBRARY_DIRS}
-+)
-+
-+tde_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui)
-+tde_add_kpart(kstyle_qtcurve_config 
-+	MODULE
-+	SOURCES ${kstyle_qtcurve_config_PART_SRCS}
-+	LINK ${QT_AND_KDECORE_LIBS} kio kdeui
-+	DESTINATION ${TDE_LIB_DIR}/trinity)
-+tde_automoc(${kstyle_qtcurve_config_PART_SRCS})
---- a/CMakeLists.txt.module	2012-08-29 20:30:59.679915086 +0200
-+++ b/CMakeLists.txt	2012-08-29 22:09:03.118576286 +0200
-@@ -3,7 +3,7 @@
- 
- set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
- set(CPACK_GENERATOR "DEB;RPM;TGZ")
--set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/KDE3")
-+set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/TDE")
- set(DEBIAN_PACKAGE_SECTION "kde")
- set(CPACK_SOURCE_GENERATOR "TBZ2")
- set(CPACK_PACKAGE_VERSION_MAJOR "1")
-@@ -16,39 +16,64 @@
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+##### include essential cmake modules ###########
-+
-+include( FindPkgConfig )
-+include( CheckIncludeFile )
-+include( CheckSymbolExists )
-+include( CheckFunctionExists )
-+include( CheckCSourceCompiles )
-+include( CheckCXXSourceCompiles )
-+include( CheckTypeSize )
-+include( CheckCSourceRuns )
-+include( CheckLibraryExists )
-+
-+##### include our cmake modules #################
-+
-+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
-+include( TDEMacros )
-+include( TDESetupPaths )
-+
-+##### setup and find essential stuff ############
-+
-+tde_setup_paths( )
-+find_package( TQt )
-+
-+
- if(COMMAND cmake_policy)
-     cmake_policy(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
- 
- if (QTC_BUILD_CONFIG_MODULE)
-     if (NOT QTC_QT_ONLY)
--        find_package(KDE3)
--        if (NOT KDE3_FOUND)
-+        find_package(TDE)
-+	if (NOT TDE_VERSION)
-             set(QTC_QT_ONLY true)
--            message("INFO: KDE3 not found! Compiling for Qt only! (Not building the config module)")
--        endif (NOT KDE3_FOUND)
-+            message("INFO: Trinity not found! Compiling for Qt only! (Not building the config module)")
-+    endif (NOT TDE_VERSION)
-     endif (NOT QTC_QT_ONLY)
- else (QTC_BUILD_CONFIG_MODULE)
-     set(QTC_QT_ONLY true)
- endif (QTC_BUILD_CONFIG_MODULE)
- 
- if (NOT QTC_QT_ONLY)
--    include(KDE3Macros)
-+    include(TDEMacros)
- else (NOT QTC_QT_ONLY)
--    if (NOT KDE3PREFIX)
--      SET(KDE3PREFIX "/opt/trinity")
--    endif (NOT KDE3PREFIX)
-+    if (NOT TDEPREFIX)
-+      SET(TDEPREFIX "/opt/trinity")
-+    endif (NOT TDEPREFIX)
-+endif (NOT QTC_QT_ONLY)
- 
-     set(QT_MT_REQUIRED TRUE)
-     find_package(Qt3 REQUIRED)
-     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
-     include(QtCurveQt3)
-+    set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
-     if (QT_PLUGINS_DIR MATCHES NOTFOUND)
-       MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
-       SET(QT_INCLUDE_DIR "/usr/include/qt4")
--      SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins")
-+      SET(QT_PLUGINS_DIR "${TDEPREFIX}/lib${LIB_SUFFIX}/trinity/plugins")
-     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
--endif (NOT QTC_QT_ONLY)
- 
- #if (NOT QTC_QT_ONLY)
- exec_program(kde-config
-@@ -56,18 +81,15 @@
-              OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX)
- #endif (NOT QTC_QT_ONLY)
- 
--SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
- 
- # NASTY HACK TO FORCE COMPILATION
- # REMOVE WHEN FIXED
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include")
- 
--SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "")
--SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "")
--
- exec_program(kde-config
-              ARGS --install locale --expandvars
--             OUTPUT_VARIABLE KDE3_LOCALE_PREFIX)
-+             OUTPUT_VARIABLE TDE_LOCALE_PREFIX)
- 
- file(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
- 
-@@ -87,31 +109,31 @@
- endif(KDE4_KDECONFIG_EXECUTABLE)
- 
- if(NOT KDE4PREFIX)
--    set(KDE4PREFIX ${KDE3PREFIX})
-+    set(KDE4PREFIX ${TDEPREFIX})
- endif(NOT KDE4PREFIX)
- 
- configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
- #if (NOT QTC_QT_ONLY)
--    add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})
--    include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDES})
-+    add_definitions(${QT_DEFINITIONS} ${TDE_DEFINITIONS})
-+    include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDES})
- #else (NOT QTC_QT_ONLY)
- #    add_definitions(${QT_DEFINITIONS})
- #    include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
- #endif (NOT QTC_QT_ONLY)
- 
--set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps)
-+set(DATA_INSTALL_DIR ${TDEPREFIX}/share/apps)
- 
--if(QTC_DEFAULT_TO_KDE3)
--    message("INFO: Defaulting to reading KDE3 settings if KDE_SESSION_VERSION is not set")
--else(QTC_DEFAULT_TO_KDE3)
-+if(QTC_DEFAULT_TO_TDE)
-+    message("INFO: Defaulting to reading TDE settings if KDE_SESSION_VERSION is not set")
-+else(QTC_DEFAULT_TO_TDE)
-     message("INFO: Defaulting to reading KDE4 settings if KDE_SESSION_VERSION is not set")
--endif(QTC_DEFAULT_TO_KDE3)
-+endif(QTC_DEFAULT_TO_TDE)
- 
- add_subdirectory(style)
- #if (NOT QTC_QT_ONLY)
-     if (QTC_BUILD_CONFIG_MODULE)
-         message("**************************************************************\n"
--                "Warning: The KDE3 config module is deprecated, and is no longer\n"
-+                "Warning: The TDE config module is deprecated, and is no longer\n"
-                 "         actively maintained. This module NO LONGER COMPILES!\n"
-                 "         It is recommended to use the KDE4 version instead.\n"
-                 "**************************************************************\n")
---- kde-style-qtcurve/po/CMakeLists.txt.ORI	2012-08-30 20:03:49.306967361 +0200
-+++ kde-style-qtcurve/po/CMakeLists.txt	2012-08-30 20:03:55.714827822 +0200
-@@ -18,7 +18,7 @@
-             add_custom_command(TARGET translations
-                     COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
-                     DEPENDS ${_poFile})
--            install(FILES ${_gmoFile} DESTINATION  ${KDE3_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
-+	    install(FILES ${_gmoFile} DESTINATION  ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
-         endif( _langCode )
-     endforeach(_poFile ${PO_FILES})
- endif(NOT GETTEXT_MSGFMT_EXECUTABLE)
---- kde-style-qtcurve/style/CMakeLists.txt.cmake	2011-08-22 00:39:00.000000000 +0200
-+++ kde-style-qtcurve/style/CMakeLists.txt	2012-08-30 20:20:04.645840572 +0200
-@@ -1,14 +1,25 @@
- if (NOT QTC_QT_ONLY)
-     set(qtcurve_SRCS qtcurve.cpp pixmaps.h)
-     add_definitions(-DQT_PLUGIN)
--    include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/common)
--    link_directories(${KDE3_LIB_DIR})
--    trinity_automoc(${qtcurve_SRCS})
--    add_library(qtcurve MODULE ${qtcurve_SRCS})
--    set_target_properties(qtcurve PROPERTIES PREFIX "")
--    target_link_libraries(qtcurve ${QT_LIBRARIES} kdefx)
--    install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/trinity/plugins/styles)
--    install(FILES qtcurve.themerc DESTINATION ${KDE3PREFIX}/share/apps/kstyle/themes)
-+    include_directories(
-+	    ${CMAKE_SOURCE_DIR}
-+	    ${CMAKE_CURRENT_BINARY_DIR}
-+	    ${CMAKE_BINARY_DIR}
-+	    ${TDE_INCLUDE_DIR}
-+	    ${QT_INCLUDE_DIR}
-+	    ${CMAKE_SOURCE_DIR}/common
-+    )
-+    link_directories(
-+	    ${TDE_LIB_DIR}
-+    )
-+    tde_add_library(qtcurve
-+	    MODULE
-+	    PROPERTIES PREFIX ""
-+	    SOURCES ${qtcurve_SRCS}
-+	    LINK ${QT_LIBRARIES} kdefx
-+	    DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles
-+    )
-+    install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes)
- else (NOT QTC_QT_ONLY)
-     set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h)
-     QTCURVE_QT_WRAP_CPP(qtcurve_MOC_SRCS ${qtcurve_MOC_CLASSES})
---- a/style/qtcurve.cpp.ORI	2012-08-30 20:57:36.256639146 +0200
-+++ a/style/qtcurve.cpp	2012-08-30 20:57:40.338552798 +0200
-@@ -8684,4 +8684,3 @@
-         resetHover();
- }
- 
--#include "qtcurve.moc"
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch
deleted file mode 100644
index c12fa1ebb..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch
+++ /dev/null
@@ -1,237 +0,0 @@
---- a/style/qtcurve.h.ORI	2012-08-30 20:50:02.179242022 +0200
-+++ a/style/qtcurve.h	2012-08-30 20:51:22.372546460 +0200
-@@ -1,5 +1,5 @@
--#ifndef __TQTCURVE_H__
--#define __TQTCURVE_H__
-+#ifndef __QTCURVE_H__
-+#define __QTCURVE_H__
- 
- /*
-   TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
-@@ -51,7 +51,7 @@
- */
- 
- #include "config.h"
--#ifdef TQTC_TQT_ONLY
-+#ifdef QTC_QT_ONLY
- #include "tqtc_kstyle.h"
- #else
- #include <kdeversion.h>
-@@ -68,7 +68,7 @@
- class TQTimer;
- class TQSlider;
- 
--#ifdef TQTC_TQT_ONLY
-+#ifdef QTC_QT_ONLY
- #define BASE_STYLE TQtCKStyle
- #else
- #define BASE_STYLE KStyle
-@@ -126,7 +126,7 @@
-         ENTRY_NONE
-     };
- 
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
-     TQtCurveStyle(const TQString &name=TQString());
- #else
-     TQtCurveStyle();
-@@ -278,7 +278,7 @@
-     mutable TQColor             itsColoredBackgroundCols[TOTAL_SHADES+1];
-     EApp                       itsThemedApp;
-     mutable TQCache<TQPixmap>    itsPixmapCache;
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-     bool                       itsIsTransKicker;
- #endif
-     EHover                     itsHover;
---- a/style/qtcurve.cpp.tqt	2012-08-30 21:28:00.664141509 +0200
-+++ a/style/qtcurve.cpp	2012-08-30 21:28:18.078781087 +0200
-@@ -62,7 +62,7 @@
- #include <tqtable.h>
- 
- #include "config.h"
--#ifndef TQTC_TQT_ONLY
-+#ifndef QTC_QT_ONLY
- #include <kdeversion.h>
- #endif
- #include <tqsettings.h>
-@@ -196,7 +196,7 @@
-                 ? atoi(sessionVersion)<4
-                     ? 3
-                     : 4
--#ifdef TQTC_DEFAULT_TO_KDE3
-+#ifdef QTC_DEFAULT_TO_KDE3
-                 : 3;
- #else
-                 : getenv("TDE_FULL_SESSION")
-@@ -292,7 +292,7 @@
-     return kdeHome[trinity ? 0 : 1];
- }
- 
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
- static void getStyles(const TQString &dir, const char *sub, TQStringList &styles)
- {
-     TQDir d(dir+sub);
-@@ -349,7 +349,7 @@
-         TQStringList list;
-         list << "TQtCurve";
- 
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
-         getStyles(kdeHome(useTQt3Settings()), list);
-         getStyles(kdeHome(!useTQt3Settings()), list);
-         getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list);
-@@ -363,7 +363,7 @@
-     {
-         return "qtcurve"==s.lower()
-                     ? new TQtCurveStyle
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
-                     : 0==s.find(THEME_PREFIX)
-                         ? new TQtCurveStyle(s)
- #endif
-@@ -375,7 +375,7 @@
- 
- #define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp)
- 
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
- #include <tqfile.h>
- #endif
- 
-@@ -393,7 +393,7 @@
- 
- #define DW_BGND 105
- 
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
- // Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
- 
- static bool kickerIsTrans()
-@@ -802,7 +802,7 @@
-     p->restore();
- }
- 
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
- TQtCurveStyle::TQtCurveStyle(const TQString &name)
- #else
- TQtCurveStyle::TQtCurveStyle()
-@@ -820,7 +820,7 @@
-               itsMdiColors(0L),
-               itsThemedApp(APP_OTHER),
-               itsPixmapCache(150000, 499),
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-               itsIsTransKicker(false),
- #endif
-               itsHover(HOVER_NONE),
-@@ -835,7 +835,7 @@
-               itsDragWidget(0L),
-               itsDragWidgetHadMouseTracking(false)
- {
--#ifdef TQTC_STYLE_SUPPORT
-+#ifdef QTC_STYLE_SUPPORT
-     TQString rcFile;
-     if(!name.isEmpty())
-     {
-@@ -1161,7 +1161,7 @@
-     if ("kicker"==appName || "appletproxy"==appName)
-     {
-         itsThemedApp=APP_KICKER;
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-         itsIsTransKicker=kickerIsTrans();
- #endif
-     }
-@@ -1196,7 +1196,7 @@
-     else if ("korn"==appName)
-     {
-         itsThemedApp=APP_KORN;
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-         itsIsTransKicker=kickerIsTrans();
- #endif
-     }
-@@ -1236,7 +1236,7 @@
- 
-     if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
-         opts.menuStripe=SHADE_NONE;
--#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-     if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde")))
-         opts.fixParentlessDialogs=false;
- #endif
-@@ -1762,7 +1762,7 @@
-         ((TQGroupBox *)widget)->setFlat(false);
-         ((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame);
-     }
--#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-     else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
-     {
-         TQDialog *dlg=(TQDialog *)widget;
-@@ -1931,7 +1931,7 @@
-     }
-     else if(widget->inherits("KTabCtl"))
-         widget->removeEventFilter(this);
--#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-     else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
-         widget->removeEventFilter(this);
- #endif
-@@ -2277,7 +2277,7 @@
-                     break;
-         }
- 
--#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
-     if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(object))
-     {
-         TQDialog *dlg=(TQDialog *)object;
-@@ -3152,7 +3152,7 @@
-                 if(flags&Style_Down)
-                     flags=((flags|Style_Down)^Style_Down)| Style_Sunken;
-                 flags|=Style_Enabled;
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
- #if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500
-                 if(HOVER_KICKER==itsHover && itsHoverWidget) //  && itsHoverWidget==p->device())
-                     flags|=Style_MouseOver;
-@@ -3161,7 +3161,7 @@
- #endif
-                 drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL,
-                                getFill(flags, use), use, true, false);
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-                 itsFormMode=false;
- #endif
-             }
-@@ -3313,7 +3313,7 @@
-                             ? cg.background().dark(DW_BGND)
-                             : */cg.background(),
-                            p, r, cg, glassMod ? flags : flags|Style_Horizontal,
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-                            (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) ||
- #endif
-                            operaMdi || mdi
-@@ -3345,7 +3345,7 @@
- 
-                 drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal,
-                                flags&CHECK_BUTTON
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-                                  || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe)
- #endif
-                                     ? ROUNDED_NONE : ROUNDED_ALL,
-@@ -5540,7 +5540,7 @@
-                     bflags|=NO_ETCH_BUTTON;
- 
-                 // If we're pressed, on, or raised...
--#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
-                 if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons)
- #else
-                 if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) ||
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec
deleted file mode 100644
index d039d84d3..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-# Default version for this component
-%define kdecomp kde-style-qtcurve
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-style-qtcurve
-Summary:	This is a set of widget styles for Trinity based apps
-Version:	0.55.2
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Obsoletes:		trinity-kde-style-qtcurve
-Provides:		trinity-kde-style-qtcurve
-
-%description
-This package together with gtk2-engines-qtcurve aim to provide a unified look
-and feel on the desktop when using TDE and Gnome applications.
-
-This package is most useful when installed together with 
-gtk2-engines-qtcurve.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-  -DQTC_QT_ONLY=false \
-  -DQTC_STYLE_SUPPORT=true \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang qtcurve
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f qtcurve.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_qtcurve_config.la
-%{tde_tdelibdir}/kstyle_qtcurve_config.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.la
-%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
-%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
-%{tde_datadir}/apps/QtCurve/*.qtcurve
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
-- Switch to v3.5.13-sru branch
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec
deleted file mode 100644
index 178acd051..000000000
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define kdecomp kde-style-qtcurve
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-style-qtcurve
-Summary:	This is a set of widget styles for Trinity based apps
-Version:	0.55.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	cmake-3.5.13.tar.gz
-
-# [qtcurve] Version 3.5.13-sru
-Patch0:		kde-style-qtcurve-3.5.13-sru-20120909.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Obsoletes:		trinity-kde-style-qtcurve
-Provides:		trinity-kde-style-qtcurve
-
-%description
-This package together with gtk2-engines-qtcurve aim to provide a unified look
-and feel on the desktop when using TDE and Gnome applications.
-
-This package is most useful when installed together with 
-gtk2-engines-qtcurve.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%setup -q -n applications/%{kdecomp} -a 1
-%__mv -f cmake-3.5.13/* cmake/
-
-%patch0 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-  -DQTC_QT_ONLY=false \
-  -DQTC_STYLE_SUPPORT=true \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang qtcurve
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f qtcurve.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_qtcurve_config.la
-%{tde_tdelibdir}/kstyle_qtcurve_config.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.la
-%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
-%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
-%{tde_datadir}/apps/QtCurve/*.qtcurve
-
-
-%Changelog
-* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
-- Switch to v3.5.13-sru branch
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec
deleted file mode 100644
index 562fb4510..000000000
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define tde_pkg tde-style-qtcurve
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-tde-style-qtcurve
-Summary:		This is a set of widget styles for Trinity based apps
-Version:		0.55.2
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Obsoletes:		trinity-kde-style-qtcurve < %{version}-%{release}
-Provides:		trinity-kde-style-qtcurve = %{version}-%{release}
-Obsoletes:		trinity-style-qtcurve < %{version}-%{release}
-Provides:		trinity-style-qtcurve = %{version}-%{release}
-
-%description
-This package together with gtk2-engines-qtcurve aim to provide a unified look
-and feel on the desktop when using TDE and Gnome applications.
-
-This package is most useful when installed together with 
-gtk2-engines-qtcurve.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR="%{tde_prefix}"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Error in "po/tr.po"
-%if 0%{?rhel} == 4
-%__rm -f "po/tr.po"
-%endif
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-  -DQTC_QT_ONLY=false \
-  -DQTC_STYLE_SUPPORT=true \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang qtcurve || touch qtcurve.lang
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f qtcurve.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kstyle_qtcurve_config.la
-%{tde_tdelibdir}/kstyle_qtcurve_config.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.la
-%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
-%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
-%{tde_datadir}/apps/QtCurve/*.qtcurve
-
-
-%changelog
diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
deleted file mode 100644
index d37d9ba13..000000000
--- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Laptops & Power
-Name[br]=Gremm
-Name[el]=Ισχύς
-Name[it]=Energia
-Name[mt]=Elettriku
-Name[nl]=Energie
-Name[pa]=ਊਰਜਾ(power)
-Name[pt_BR]=Energia
-Name[ru]=Управление питанием
-Name[sv]=Effekt
-Icon=energy
-OnlyShowIn=TDE;
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
deleted file mode 100644
index 0059bb744..000000000
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default version for this component
-%define kdecomp kde-systemsettings
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-systemsettings
-Summary:	easy to use control centre for TDE
-Version:	0.0svn20070312
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	kde-settings-laptops.directory
-
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-Requires:	trinity-guidance
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/kde/audioencoding.desktop
-%{tde_datadir}/applications/kde/defaultapplication.desktop
-%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
-%{tde_datadir}/applications/kde/medianotifications.desktop
-%{tde_datadir}/applications/kde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial release for TDE 3.5.13.1
-
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
deleted file mode 100644
index 926efcf41..000000000
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp kde-systemsettings
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-systemsettings
-Summary:	easy to use control centre for TDE
-Version:	0.0svn20070312
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kde-settings-laptops.directory
-
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-Requires:	trinity-guidance
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/kde/audioencoding.desktop
-%{tde_datadir}/applications/kde/defaultapplication.desktop
-%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
-%{tde_datadir}/applications/kde/medianotifications.desktop
-%{tde_datadir}/applications/kde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-
-
-%Changelog
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
deleted file mode 100644
index c06af35f6..000000000
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# Default version for this component
-%define tde_pkg tde-systemsettings
-%define tde_version 3.5.13.2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-tde-systemsettings
-Summary:		easy to use control centre for TDE
-Version:		0.0svn20070312
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	kde-settings-laptops.directory
-
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-Provides:	trinity-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-systemsettings < %{version}-%{release}
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Requires:		trinity-guidance
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR="%{tde_prefix}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-laptops.directory
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/kde/audioencoding.desktop
-%{tde_datadir}/applications/kde/defaultapplication.desktop
-%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
-%{tde_datadir}/applications/kde/medianotifications.desktop
-%{tde_datadir}/applications/kde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-
-
-%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
deleted file mode 100644
index b83b3f3ad..000000000
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI	2013-07-29 11:26:26.740982531 +0200
-+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp	2013-07-29 11:26:53.970250335 +0200
-@@ -143,10 +143,10 @@
-  */
- 
- static const TQString
--  html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
-+  html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
-                   "<table class=\"query\">\n");
- static const TQString
--  html_form_end("<tr>\n"
-+  html_form_end_apt("<tr>\n"
-                 "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
-                 "</tr>\n"
-                 "</table>\n"
-@@ -197,7 +197,7 @@
-   if (online)
-     stream << "<table class=\"queryform\"><tr><td>\n";
- 
--  stream << html_form_begin;
-+  stream << html_form_begin_apt;
-   stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
-   stream << make_html_form_line("search", i18n("Package search"));
-   if (ext_form)
-@@ -206,7 +206,7 @@
-       stream << make_html_form_line("fsearch", i18n("File search"));
-     stream << make_html_form_line("show", i18n("Package info"));
-   }
--  stream << html_form_end.arg( i18n("Search") );
-+  stream << html_form_end_apt.arg( i18n("Search") );
- 
-   if (online)
-   {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
deleted file mode 100644
index e45848c73..000000000
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define tde_pkg tdeio-apt
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		An apt-cache ioslave for Trinity
-Version:		0.13.2
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://lpnotfr.free.fr/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:			tdeio-apt-3.5.13.2-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-tdeio-apt is an ioslave which provides the apt:/ protocol. It
-integrates apt-cache functionalities into Konqueror, making
-browsing the packages easier. It provides:
- - apt-cache search: apt:/search?expression
- - apt-cache show: apt:/show?package . The show? target
-   prints the policy too.
- - apt-cache policy: apt:/policy?package
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kio-apt
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kio-apt.lang
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-%{tde_tdelibdir}/kio_apt.la
-%{tde_tdelibdir}/kio_apt.so
-%{tde_datadir}/apps/kio_apt/kdedeb_logo.png
-%{tde_datadir}/apps/kio_apt/kio_apt.css
-%{tde_datadir}/services/apt+http.protocol
-%{tde_datadir}/services/apt.protocol
-%{tde_datadir}/services/searchproviders/apt-file.desktop
-%{tde_datadir}/services/searchproviders/apt-files.desktop
-%{tde_datadir}/services/searchproviders/apt-search.desktop
-
-
-%changelog
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
deleted file mode 100644
index 83bfc919b..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
+++ /dev/null
@@ -1,111 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	kio-slave for the locate command [Trinity]
-Version:	0.4.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-# [kio-locate] Fix compilation with GCC 4.7
-Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	scons
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-#patch1 -p1 -b .install
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export CXXFLAGS="-I%{tde_includedir}/tqt ${CXXFLAGS}"
-scons configure
-scons
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 00ca8561c..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kio-locate/src/SConscript.ORI	2012-05-02 00:23:36.637608539 +0200
-+++ kio-locate/src/SConscript	2012-05-02 00:23:44.142459165 +0200
-@@ -28,7 +28,7 @@
-     pattern.cpp
- """
- obj.libs='tqt kio'
--obj.linkflags='-module' # add more link flags
-+#obj.linkflags='-module' # add more link flags
- obj.execute()
- 
- # Install the protocol files
---- kio-locate/admin/kde.py.install	2011-07-07 08:10:05.000000000 +0200
-+++ kio-locate/admin/kde.py	2012-05-06 20:29:48.236024293 +0200
-@@ -337,7 +337,7 @@
- 		opts.Save(cachefile, env)
- 
- 	## set default variables, one can override them in sconscript files
--	env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ],
-+	env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ],
- 			LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ])
- 	
- 	env['QT_AUTOSCAN'] = 1
-@@ -773,7 +773,7 @@
- 		## Define this to 1 if you are writing documentation else to 0 :)
- 		#if lenv.has_key('i_am_a_documentation_writer'):
- 		for file in docbook_list:
--			lenv.Depends( folder+'index.cache.bz2', nodefile )
-+			lenv.Depends( folder+'index.cache.bz2', file )
- 
- 		if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder)
- 
-@@ -781,7 +782,7 @@
- 		lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
- 		
- 		if env['_INSTALL']:
--			dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
-+			dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
- 			comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
- 			lenv.Execute(comp)
- 
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
deleted file mode 100644
index 24f010d15..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	kio-slave for the locate command [Trinity]
-Version:	0.4.5
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
deleted file mode 100644
index a43cea13a..000000000
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
+++ /dev/null
@@ -1,113 +0,0 @@
-# Default version for this component
-%define kdecomp kio-locate
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	kio-slave for the locate command [Trinity]
-Version:	0.4.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [kio-locate] Fix compilation with GCC 4.7
-Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
-
-Patch2:		kio-locate-3.5.13-downgrade_3512.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires:	scons
-
-%description
-Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1 -b .install
-%patch2 -p7
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "admin/kde.py" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-scons configure
-scons
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Fix compilation with GCC 4.7
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec
deleted file mode 100644
index 508da013b..000000000
--- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define tde_pkg tdeio-locate
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		kio-slave for the locate command [Trinity]
-Version:		0.4.5
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-
-Obsoletes:		trinity-kio-locate < %{version}-%{release}
-Provides:		trinity-kio-locate = %{version}-%{release}
-
-%description
-Adds support for the "locate" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang kio-locate
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f kio-locate.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/kio_locate.la
-%{tde_tdelibdir}/kio_locate.so
-%{tde_tdedocdir}/HTML/en/kio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-%changelog
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
deleted file mode 100644
index b13800f97..000000000
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-# Default version for this component
-%define kdecomp kio-umountwrapper
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	progress dialog for safely removing devices in Trinity.
-Version:	0.2
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://frode.kde.no/misc/kio_umountwrapper/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-Source1:	media_safelyremove.desktop
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-Wrapper around kio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post
-for f in konqueror d3lphin; do
-%if 0%{?suse_version}
-  update-alternatives --install \
-%else
-  alternatives --install \
-%endif
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_${f} \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
-    20
-done
-
-  
-%postun
-if [ $1 -eq 0 ]; then
-  for f in konqueror d3lphin; do
-%if 0%{?suse_version}
-    update-alternatives --remove \
-%else
-    alternatives --remove \
-%endif
-      media_safelyremove.desktop_${f} \
-      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-  done
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
deleted file mode 100644
index 968f3cab9..000000000
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define kdecomp kio-umountwrapper
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	progress dialog for safely removing devices in Trinity.
-Version:	0.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://frode.kde.no/misc/kio_umountwrapper/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	media_safelyremove.desktop
-
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-Wrapper around kio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post
-for f in konqueror d3lphin; do
-  alternatives --install \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_${f} \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
-    20
-done
-
-  
-%postun
-if [ $1 -eq 0 ]; then
-  for f in konqueror d3lphin; do
-    alternatives --remove \
-      media_safelyremove.desktop_${f} \
-      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-  done
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-%Changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
deleted file mode 100644
index 22903f422..000000000
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define tde_pkg tdeio-umountwrapper
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		progress dialog for safely removing devices in Trinity.
-Version:		0.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://frode.kde.no/misc/tdeio_umountwrapper/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		media_safelyremove.desktop
-
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Obsoletes:		trinity-kio-umountwrapper < %{version}-%{release}
-Provides:		trinity-kio-umountwrapper = %{version}-%{release}
-
-%description
-Wrapper around kio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-%post
-for f in konqueror d3lphin; do
-  update-alternatives --install \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_${f} \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
-    20
-done
-
-%postun
-if [ $1 -eq 0 ]; then
-  for f in konqueror d3lphin; do
-    update-alternatives --remove \
-      media_safelyremove.desktop_${f} \
-      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-  done
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
-
-
-%changelog
diff --git a/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch b/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch
deleted file mode 100644
index fa36c7341..000000000
--- a/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch
+++ /dev/null
@@ -1,26417 +0,0 @@
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am kradio-3.5.13.1/kradio3/presets/australia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/australia/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,18 +1,19 @@
- SUBDIRS =
--EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "sydney2.krp" "sydney.krp"
-+EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "melbourne-antenna.krp" "sydney2.krp" "sydney.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/"
-+	$(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/brisbane-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/brisbane.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp"
--	$(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp"
-+	$(INSTALL_DATA) "$(srcdir)/melbourne-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/sydney2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp"
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,161 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+        <stationlist>
-+                <format>kradio-1.0</format>
-+                <info>
-+                        <creator>kradio-snapshot-2006-11-12-r497</creator>
-+                        <maintainer>Peter D. 
-+&lt;p13@g-node.com.au&gt;</maintainer>
-+                        <changed>2007-12-12T17:01:51</changed>
-+                        <country>Australia</country>
-+                        <city>Melbourne</city>
-+                        <media>Antenna</media>
-+                        <comments>Radio Stations for Melbourne, Australia
-+ Contains merged Data</comments>
-+                </info>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974366782D0E540F17C02C9C4E20988BCD2C0C7100B2FC5ED1319E83350C0E4C0563EF35</stationID>
-+                        <name>3LIGHT FM community</name>
-+                        <shortname>light</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>89.9252</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436698FF15BCA070FB6227B18EBB68B9715621C393D7AF82C80F67F6E80CAB666759EC</stationID>
-+                        <name>3SYN FM comminity</name>
-+                        <shortname>syn</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>90.7002</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436719C0EC401C5D0333A6E5B547782E8121B1901809FFD98F727201ADE6DB74303AE2</stationID>
-+                        <name>3VEGA FM</name>
-+                        <shortname>vega</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>91.5253</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436737017BC3859256567C06F74FC6AD3F7B1915F042A77FF112BED373F401AC4028B4</stationID>
-+                        <name>3ZZZ FM comminity</name>
-+                        <shortname>zzz</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>92.3003</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436756249596085B3207542A09E11A9C8C74ACB46070D13973A137F67B4136EE86C962</stationID>
-+                        <name>3SBS FM</name>
-+                        <shortname>sbs</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>93.1254</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436810A51A6903E91CFB581EF498645A805CD95387B9E149D05F4F5C0E57C69CFE6AB5</stationID>
-+                        <name>3GOLDEN DAY FM community</name>
-+                        <shortname>G&apos; Day</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>95.6755</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119743691153837110B029B161953DDE804D73EA2E5861F76E507D7DA97C4FAFF5BEC1C2ED</stationID>
-+                        <name>3NOVA FM</name>
-+                        <shortname>nova</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>100.326</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974369293DC812D3A5A7BF790997A673EDAAEFEDD1A50135D09CEC74C0F2841593C9BBC8</stationID>
-+                        <name>3MIX FM</name>
-+                        <shortname>mix</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>101.101</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197436948238C94F5ED52E042F96B82ED364BFECD1DE876F7DB212F590ADDA1BEBC6D7FE3</stationID>
-+                        <name>3FOX FM</name>
-+                        <shortname>fox</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>101.926</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197437931AB81E5CE2324D406F215FA19A0B8C1927CD558960CFD9313FBE47E47A749C011</stationID>
-+                        <name>3RRR FM</name>
-+                        <shortname>rrr</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>102.751</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974379481316966853D5FF30386493899394FFC3B3A8FAE73B28F93DD5E7DBB61F8CAC3E</stationID>
-+                        <name>3MBS FM classical</name>
-+                        <shortname>mbs</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>103.476</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1197437004F27F07648029E5F0A761C4BBBF1408C189B69DCA872F9FDB68E6BCE1B3F8952A</stationID>
-+                        <name>3GOLD FM</name>
-+                        <shortname>gold</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>104.301</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974370239B06749375C9E77BB6AC1CADEAC4566B123E8E0C903EE4B9DB0C00A192400277</stationID>
-+                        <name>3MMM FM</name>
-+                        <shortname>mmm</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>105.151</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974370423878D22E02EDF44D97ACEC2419689134C4700903D136AF45C56CE08F7D3E1CFE</stationID>
-+                        <name>ABC FM classical</name>
-+                        <shortname>abc classic</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>105.926</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119743706068B59CCAFF4E0462729EE829A55E3311AD32AEFFEF1067064919CCBD6AD1C465</stationID>
-+                        <name>3PBS FM community</name>
-+                        <shortname>pbs</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>106.701</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11974380497211583134DCDBC719C69479C5454C567A662FA3CC75A2EC69DECB6C4D440E7E</stationID>
-+                        <name>3JJJ FM</name>
-+                        <shortname>jjj</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>107.526</frequency>
-+                </FrequencyRadioStation>
-+        </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp kradio-3.5.13.1/kradio3/presets/belarus/brest.krp
---- kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/belarus/brest.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,258 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.1-rc1</creator>
-+			<maintainer>Blaze</maintainer>
-+			<changed>2010-08-08T09:00:13</changed>
-+			<country>Belarus</country>
-+			<city>Brest</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1207729347B95CF236E42587F6871F53D00304A13643B98948622764D589238FDFE6F550A1</stationID>
-+			<name>Першы нацыянальны</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>70.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120772620854C001667C47982987BFB58FF2B485A2C828F99A875C28AD6C2A5FC61D587D2B</stationID>
-+			<name>Культура</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>71.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207726041C55D9585D3A616D7E90CDB8AB1B343638DA19EFFB7DC7557602C2D76F312A07F</stationID>
-+			<name>радыё Сталiца</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>72.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207725781B1CE695E03A103A33EA30C2AEE33B4FDB5757DAF907F0964F5A1EA23C553A8AD</stationID>
-+			<name>radio 1 Polska</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1195418551882952DFC8A3913F8D3C68504C0E93BF72377B5CD67E045D20F27280F00F25E1</stationID>
-+			<name>Культура</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11954185650FE254953641925E551685E06E70EAD8660CF8C010FF4B5446BAFB8FB597D918</stationID>
-+			<name>radio 3 Polska</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1194713996F0E7E992470C24D4CE8060E398D7B24CF79C675808B56A957BA315E32BA9D3A2</stationID>
-+			<name>RMF FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1194713863838DF5C3D87638EA1BC0C2F69C8A18EBEC793462C87EB1097DDDB0DC02663030</stationID>
-+			<name>Новое радио</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.8004</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1194713867D9F544C68EE0C5E183652BAB20149AB9DD906EE04173894C48A482E29C744AB5</stationID>
-+			<name>radio Belarus</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12077294984C448D1D756B4422108C36E16C7249BF7B2ABEFA33119A5CB5BAEE6C417DAB58</stationID>
-+			<name>радыё Рацыя</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207687158AC1EFA6C9DD0FFFCEB20D5C4A1422DB3DB9EAA460E874326A65D4A9D1CC34C3E</stationID>
-+			<name>Першы нацыянальны</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.9998</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>128051385121F1B431D096F125FCAF235ECCA45C414ABE8DC64C8F2E3D0A41A4C9A843</stationID>
-+			<name>радио Минск</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1227190558E55550FD0D68E6DDC089D3DFF7FB85A40F0D37900E0680BF1A78667166E99C21</stationID>
-+			<name>Альфа радио</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1202244062D3B1BD6E67E93C3D3186F73B8AE89D4FCCD9E3ECDD51E328F65036A365381747</stationID>
-+			<name>радио Рокс</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.201</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207729844804970DB985A067502CCD04CDB8CF67CDE973A3AC5C311998F80CA6212141C2D</stationID>
-+			<name>radio Podlaśia</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1202244168B63FB1467284BF12B788C73B54412EA827276731841EA311E5DB412E3D67CA73</stationID>
-+			<name>Unistar</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12171720541E9003C323E0451C23BA71BA9F04DA8800CD68AFCD2F7ECCD5D5D1DA9609C3D2</stationID>
-+			<name>radio 2 Polska</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1202245059AE9EBED37F3B7BA219E0733F6FEA9A2D2E4CE4A9D006BFC4723557997AF0D836</stationID>
-+			<name>Pilot fm</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1202292997527C0FCFE4DA7276A2330178ECA3662FAF3EA3011796C416CABF38144D1033D2</stationID>
-+			<name>Radio dla ćiebię</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120224528899157BF6DA7064D0D1325986522D67E3DB3D58B772CA8BF58F0EA566FE32BD74</stationID>
-+			<name>Радиус fm</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1217172241D354DFEB01909925C0A8B485DBB22A3CC748619A388FF492F225D71D178C9C51</stationID>
-+			<name>radio 3 Polska</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12171722879ACB44A1C2A18FFC543900D4F9C57067C662618247DD7BB7EE8FBC35FFAB0BB9</stationID>
-+			<name>radio Maria</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1202245826D98B15CBF4743EBD4AC7C3244B952B551AB6CBBE876309603D97FFED2F1D5F05</stationID>
-+			<name>радио Брест</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1194714022A97BEC079991179A7F6AB786705AB0DF6B834ED0C23B271D19E19CD7D702EF35</stationID>
-+			<name>radio Zet</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1194714205A5F11E788B848B143CFA9E2350F74BD56902514359C51CD39AC07D1FC0FD786A</stationID>
-+			<name>радио &quot;ba&quot;</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1281248050E5DD39785E5EFE11D82C9436E6AA3A48E0F6D1B19CF029CF43EAA6922846</stationID>
-+			<name>радио Мир</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>121717241561F47D14C239BC8C669D47D567F9F82EF98251001C54207E8DD9AB2177D5D58E</stationID>
-+			<name>radio Maria</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.7</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,9 @@
-+SUBDIRS =
-+EXTRA_DIST = "brest.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/"
-+	$(INSTALL_DATA) "$(srcdir)/brest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,133 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer></maintainer>
-+			<changed>2008-05-01T21:00:03</changed>
-+			<country>Belgium</country>
-+			<city>Antwerpen</city>
-+			<media>Antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1209668864D2A04359F84AB8D3733E1CCF1279310F0493587FB93BF7F74A854DC9EE0557BC</stationID>
-+			<name>VRT Radio 1</name>
-+			<shortname>Radio 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12096688808089E6109077979C4D5922F72F137891BE7D38EDB299D525C158F7327D572466</stationID>
-+			<name>VRT Radio 2</name>
-+			<shortname>Radio 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966879513F8100817BD88AA03A7C918008327682640E59AD2246DBBED22C6DB52078977</stationID>
-+			<name>VRT Radio Klara</name>
-+			<shortname>Klara</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966874819E4357D2D5E93338F402C2507FFEBCA071AB41A30CC5F896C6952354A73E2B3</stationID>
-+			<name>VRT Radio Donna</name>
-+			<shortname>Donna</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1209668807766DF511EEBD78100CFC98FEEEBA67E6406CDCC92F0A81653F9A0C095C98C7FB</stationID>
-+			<name>VRT Studio Brussel</name>
-+			<shortname>StuBru</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966871597D85D822EE8C9D809E676A272FC62AC0E3F341DB79144F45C256253BA386310</stationID>
-+			<name>Q-Music</name>
-+			<shortname>Q-Music</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12096693197B8AC6F5BEF2CADB6CE975EA1905FC7A036C26B395D8F124021E86496E3E5C31</stationID>
-+			<name>4FM</name>
-+			<shortname>4FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966910628654CADD557C4BD8BD8F1562939C077433F6221B369C63BE717942C856647D7</stationID>
-+			<name>Radio Minerva</name>
-+			<shortname>Minerva</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966920982AE695B3C21D74EDB282A0D8BF32564BFFDD15F67D640AF26D2AD24DD74329B</stationID>
-+			<name>Radio Nostalgie</name>
-+			<shortname>Nostalgie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1209669397A89F41C973ECA289106883F6D088775F413EC43F9682C7AA854800F994C25DEA</stationID>
-+			<name>Crooze FM</name>
-+			<shortname>Crooze FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1209669501A71E45127C44908BA58078E5F433C86E1A50E77981BDB0E7961CFCAF66B6BEFC</stationID>
-+			<name>Be One</name>
-+			<shortname>Be One</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12096695556FC4775E17AE0D976314928CB5B8097E33C695491B12A46CBD634F996C11376F</stationID>
-+			<name>Cool FM Antwerpen</name>
-+			<shortname>Cool FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120966965615DC568C10D8100275FBAB0E32892335B8627A158E0EFEBBBF6CDFE608D03FB3</stationID>
-+			<name>Radio Echo (TOPRadio)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp
---- kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,205 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Roeland Moors</maintainer>
-+			<changed>2008-07-05T14:57:10</changed>
-+			<country>Belgie</country>
-+			<city>Bilzen</city>
-+			<media></media>
-+			<comments> Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1082619533D0EF312578B2C12F4D76EE3E45054110BED5B081ABF144AEAE7E0E23E51FCEB6</stationID>
-+			<name>Radio1 (VRT)</name>
-+			<shortname>Radio1 (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>94.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>121526266366A4F91967AAFD7340DFA2354AB1E0B0953070B481BD60DE45EB158429D9CE11</stationID>
-+			<name>Radio2 (VRT)</name>
-+			<shortname>Radio2 (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215262732B6CFFDFD9EE3DDA03BC69D81B3607BEE359C5782A6C5CF2600670A3476067C19</stationID>
-+			<name>Donna (VRT)</name>
-+			<shortname>Donna (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215262778F380B95C0963A856E4BCA4758D380E971B58C807E61054FED586B5697679FC06</stationID>
-+			<name>Studio Brussel (VRT)</name>
-+			<shortname>Stubru (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152628270707ED8F73E3365F315BF3F0197030E52CAE0AA84042712972E9FA0CC9C77D0A</stationID>
-+			<name>Radio Vlaanderen Internationaal (VRT)</name>
-+			<shortname>RVI (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215262923ED9EC63654C6B06E16F90402F226CF58E3DCD28F8955F98C8379907DA2BD3547</stationID>
-+			<name>Klara (VRT)</name>
-+			<shortname>Klara (VRT)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>121526295602E09EEAB3D203004C4EFF337334F8F2CD1F5EB215BD3B9CE0C2D15CB1380E0A</stationID>
-+			<name>Radio1 (NL)</name>
-+			<shortname>Radio1 (NL)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152630627C3408C0B9033C392BDBCDDCF6DDD41503B56474238AD1B7888BF535D0D327F0</stationID>
-+			<name>Radio2 (NL)</name>
-+			<shortname>Radio2 (NL)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152635620BF54DC6411AD7AC204ECF8D99A6C6539146C49BFDF75E9363996EC938AB9302</stationID>
-+			<name>Radio3 (NL)</name>
-+			<shortname>Radio3 (NL)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215263237792D55D9D3007EC6934A83E8A91906B3A011C9E11CD71882074A1F2CBF4F07EE</stationID>
-+			<name>Radio4 (NL)</name>
-+			<shortname>Radio4 (NL)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152633215918E45416B70B36915C5447EF08FC2D698B1ADBB26FFDBE0E8B8C4BA60617C9</stationID>
-+			<name>4FM</name>
-+			<shortname>4FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152633665237A15C2EDF4B82DCAD1414FB185F88EE629C94CB4201F4482B25DC9E55F893</stationID>
-+			<name>Q-music</name>
-+			<shortname>Q-music</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215263397F320B0728B535D76E996EE0D6F5C0F9540BEBF2B8FAED6E9CF66AEDF356E1CD8</stationID>
-+			<name>BBC World</name>
-+			<shortname>BBC World</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215263435410BB4AA6ABE12E2C3C9DB5D0DB850F7D3C415A3289A2D2B29509C1B6491A181</stationID>
-+			<name>BBC 2</name>
-+			<shortname>BBC 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152634678854A21F1A0C01FFA3A5E6E235B37C0C306FAF5617F305D5F924E739B15D430C</stationID>
-+			<name>BBC3</name>
-+			<shortname>BBC3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152632098F327814F8708422B8670F872234946D641AAFFA5A67C46947398C3CA7910071</stationID>
-+			<name>Classic 21 (RTBF)</name>
-+			<shortname>Classic 21 (RTBF)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152638141A9295AB35F2F119D0F5CB6EC63BA523A8256BB0A1E41432016D03B4BFB61BD7</stationID>
-+			<name>Musique 3 (RTBF)</name>
-+			<shortname>Musique 3 (RTBF)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152638542B98B42A3DD4AF0FB042498092849D753A1A6A9C28E098C5A4A498AD7AB94A46</stationID>
-+			<name>Viva Cite (RTBF)
-+</name>
-+			<shortname>Viva Cite (RTBF)
-+</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215263895E17E4FC1BB559557C961B24DD5F77A1BA5CDB57891797D2B0D5E27E91C36ABC3</stationID>
-+			<name>Viva Cite</name>
-+			<shortname>Viva Cite</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12152640255FAE61BC958F1D9B0B77400462FB6309D5AC1BE3DB309A956FD09B034B9DA6E6</stationID>
-+			<name>BRF
-+</name>
-+			<shortname>BRF
-+</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1215264045475CC0A5EB09DBC99EFF53CE27532E793FF6A9EFF69CB86BCBC4A99A5BC6E78F</stationID>
-+			<name>Deutsche Welle
-+</name>
-+			<shortname>Deutsche Welle
-+</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>121526350496BB70933EDA4409C2127EB51B05C994C2D679D5A87C0B0DB93066F0B8ECFA2A</stationID>
-+			<name>La premiere (RTBF)</name>
-+			<shortname>La premiere (RTBF)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>121526407469366F46B22C57462B698052BE78CB8947776AEBA38AA7CB78857EEC834466B3</stationID>
-+			<name>Sporza</name>
-+			<shortname>Sporza</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,14 +1,17 @@
- SUBDIRS =
--EXTRA_DIST = "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp"
-+EXTRA_DIST = "antwerpen-antenna.krp" "bilzen.krp" "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/"
-+	$(INSTALL_DATA) "$(srcdir)/antwerpen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bilzen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp"
-+	$(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/ieper-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/limburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp"
--
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp
---- kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,159 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0-rc2</creator>
-+			<maintainer>Hélio Polessi &lt;hcpcamp@gmail.com&gt;</maintainer>
-+			<changed>2010-02-14T23:00:00</changed>
-+			<country>Brazil</country>
-+			<city>Campinas-SP</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>126618494637241F4F8061AEF9182D981F7B7468052284DFB1E6618F268A85B9341A9E</stationID>
-+			<name>Notícia FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126618501643BEDF9B833C1844F4BF68530E3D71D64610CEDCE25933824EF0941AA8B0</stationID>
-+			<name>Vox FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12372390231F7155089C8FC8A96366D96D657AA4EAF8023A2F46C14594141F50B5C9E6</stationID>
-+			<name>Educadora</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123723906031FBA978DAFC484F7EAEB3333FDD4CFFB2DDC7C832F26D2E60EB8510D26D</stationID>
-+			<name>Cidade</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237239087A51A3D3B08532CFEDEE91EFCA74C037C11F14827452DB492C680B081C40C</stationID>
-+			<name>Laser</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12661850370C13437F6FF803AFE53C2E06EE0DA14DE34FAA8CFE0AD0EA744556CC3B92</stationID>
-+			<name>Oi FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12661850830E51099D751D008F7F1AAFBBF4D5066EE30E30A7A174895460903AFDFBC5</stationID>
-+			<name>Mundial FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123723911232AFC94ED9C86FE77C42754DEFF95019FF96C018B6F9E266ADF4CC311141</stationID>
-+			<name>CBN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12661851107493B0A58FD97F214400B5FCF30959E762E4FEB5A55FEC934F7EE1D78389</stationID>
-+			<name>Educativa</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237239133465FE65E06B9C09990FF2CF85417CDB3FD0442A38B6C0D761828F7F35AE0</stationID>
-+			<name>Nova FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237239162D54181C9DF565AEB384BEE8AB15519B0A0F537442B7B4FF6FC829DEAFDAB</stationID>
-+			<name>Dumon FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237239193D67830A2911A6C35CA0949D66AFA4DBDF491A365682C4614B789A1C6D9C3</stationID>
-+			<name>105 FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12372392300091B35163BBF9C7C389AE885EA8131E1D519647A0A17E1FD0C580E4FA3B</stationID>
-+			<name>Onda Livre</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12661851466F2B4913E272B35C34ADF28EB2287050FF7A47A68A31CD45C82BCA63629D</stationID>
-+			<name>Band News FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12372392551C50902A4785BC42C95B2C4903991FFDBC61D0D328E517864920C8DF3003</stationID>
-+			<name>Antena 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237239273DF9EC3314BAA3D7EF50884AB0B3BC0F7D929B9DCA4BD3A750A9663650B21</stationID>
-+			<name>Kiss FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,14 +1,20 @@
- SUBDIRS =
--EXTRA_DIST = "brasilia.krp" "rio-de-janeiro.krp" "sao-paulo.krp"
-+EXTRA_DIST = "brasilia.krp" "campinas-sp.krp" "rio-de-janeiro2.krp" "rio-de-janeiro.krp" "sao-paulo2.krp" "sao-paulo.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/"
-+	$(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/campinas-sp.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp"
-+	$(INSTALL_DATA) "$(srcdir)/rio-de-janeiro2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/rio-de-janeiro.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp"
-+	$(INSTALL_DATA) "$(srcdir)/sao-paulo2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/sao-paulo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp"
--	$(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp"
--
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp
---- kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,529 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.5</creator>
-+			<maintainer>Paulo Roma</maintainer>
-+			<changed>2012-04-26T07:20:16</changed>
-+			<country>Brasil</country>
-+			<city>Rio de Janeiro</city>
-+			<media>FM</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>110852260463B1FF53E1CD96CF530D5073BBDC2E5E6D4E3CAB9B34065943518B4BAD5410A9</stationID>
-+			<name>Rede TV</name>
-+			<shortname>Rede TV</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522606CF0E16071B00E33871043B85546C70AA2AF543A71B4C24B9B04E1817131E5CCC</stationID>
-+			<name>Rádio Globo</name>
-+			<shortname>Globo</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11085226079713E38261AB9287D23763C4D825CBFAB4756409F233A41E405EDAAFF360E6CA</stationID>
-+			<name>MPB</name>
-+			<shortname>MPB</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522610E1E698C5DE74602CACD88D4BD92DB5A333FF31F77FACA15E10ACA36575E5B882</stationID>
-+			<name>CBN</name>
-+			<shortname>CBN</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>110852261107A4883E351F621F0ADEBADCF0BD45E7877F69B1DB48282598F8F6D0556C88BA</stationID>
-+			<name>93 FM</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1143339804A5D28DF1EE170111D80B121BD62FEB305F0930127C1CC62B221F686E2ACF14A7</stationID>
-+			<name>Roquette Pinto</name>
-+			<shortname>Roquete</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11085226135301AB1B95E41ACE07478D6F2C86942A06944D1BDD11C73CED9D3A56D0850081</stationID>
-+			<name>Band News FM</name>
-+			<shortname>BandNews</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522621C91B5E7DFEC5C77575BF0B195FD21551C5BBB8A413C1CF0A129C7004CC7D7163</stationID>
-+			<name>Paradiso</name>
-+			<shortname>Paradiso</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522615798A0B2E248B18387E6433FD51190E66587E9A13EEA19E005588B98DAFEFC51F</stationID>
-+			<name>Tupi</name>
-+			<shortname>Tupi</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>96.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11433383473BEC1138AFC3903343768372D4EB8FA0B5AB2718054CDE6B0F901A2DFE8CEA8C</stationID>
-+			<name>Beat98</name>
-+			<shortname>Beat 98</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>110852261861A65E9E025217236634A2FED71D33BA90B39E7DBB47F575E638DDD14D6AA426</stationID>
-+			<name>Rádio MEC</name>
-+			<shortname>MEC</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522619C23DF4E4945D4514733F38BD25957B583A8AE4F1BB703CFCE6E675892585D4FB</stationID>
-+			<name>JB FM</name>
-+			<shortname>JB</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>99.7008</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11433391060DF3E724233493F9D3C1C37F9136C26F8E9C32956A1CD4AA89929794DD7E2E28</stationID>
-+			<name>FM O Dia</name>
-+			<shortname>O Dia</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1143339296D7F1D09A3AFAB2EBE6D36E9EFD26D78FE78FF7C9BBA969AAA9661E754898F806</stationID>
-+			<name>Transamérica Pop</name>
-+			<shortname>Transamérica</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11085226228543DC58DACD263E20C489701FB95A1815555AB77BDA2BEF2D8F524D2CDC0680</stationID>
-+			<name>Mix</name>
-+			<shortname>Mix</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522623AA9FD006C835CEB5488A4806543277E5A79D0C98EB07A1A0C4D39E223B5636D0</stationID>
-+			<name>Jovem Pan</name>
-+			<shortname>JP</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522624E2D9B6ED883B4EAB1CE5CF9F97016D7D3AD176F6E2998D9765721D682E0937C2</stationID>
-+			<name>Nativa</name>
-+			<shortname>Nativa</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522625CCA35BA2EE3A557BCCB3286C12658116BBC858D6673C1D88CA89B156851EE570</stationID>
-+			<name>RádioCom</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>104.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1108522628F19FBF0FD0B62A4A7781AF7D8603BEB1215F1819E5028AA008748BBABFC34D39</stationID>
-+			<name>Catedral</name>
-+			<shortname>Católica</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11085226298BC8211EE7A66460385578D487B6729DA83550DF85F2517F514D9C019A93FF34</stationID>
-+			<name>Gospel</name>
-+			<shortname>Evangélica</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1335605678EE85AF1020B8DF8362741004FE16087079630F7DB4CB0CFB62DD2CD05FE0</stationID>
-+			<name>_______________________________</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>0</frequency>
-+		</FrequencyRadioStation>
-+		<InternetRadioStation>
-+			<stationID>132964209102A9E373176AC345769BF95FCDDAED10FB54E88137B307776909426B6C56</stationID>
-+			<name>Rádio MEC AM 800</name>
-+			<shortname></shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://radioslivres.radiobras.gov.br:8080/mecam.mp3</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1336644686598A6CE56A5C9830626FA81717D9A01E731EC60FA3B6AF59CD4AB5B3A732</stationID>
-+			<name>Tamoio AM 900</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://187.110.226.22:8038/</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13284779563ADDF256BA86B8FC0F07902C774D4E69BF5C55175E5516936186668A1E0A</stationID>
-+			<name>Rádio Nacional AM 1130</name>
-+			<shortname>Nacional</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://radioslivres.radiobras.gov.br:8080/nacionalrio.mp3</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1238681020F4AA90589682D934172A4DB15EC4A4C4A424EDA082486D4B12937E556280</stationID>
-+			<name>Globo AM 1220</name>
-+			<shortname></shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>mms://wm-sgr-live.globo.com/sgr_off_globoamrj_live.wma</url>
-+			<decoderclass>asf</decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13356057218399B5BC913429CADDBA31F3BFA6BAC21E8937216AB392FE91E9809A7809</stationID>
-+			<name>_______________________________</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>0</frequency>
-+		</FrequencyRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1241912811385B06FDB95068194C12F870D6E306E21E52A93991673FD9A33EFD54FE66</stationID>
-+			<name>MPB FM 90.3</name>
-+			<shortname>MPB</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>http://69.31.54.133:3690/MPBFM903AAC</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13374327174E01A225AE834F813CF5FDB60EEEB0412AE69F60A691A52776326CD37649</stationID>
-+			<name>Bradesco Esportes FM</name>
-+			<shortname>Bradesco</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://208.80.54.47:3690/94_1FMAAC</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>133522364599C458AA2A85B35A918926F023F98BE5BB28B91CF0D8694A0555EC9F538B</stationID>
-+			<name>93 FM</name>
-+			<shortname>93</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://208.80.52.116:3690/FM93AAC</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1335405280FCCDE167E4908818F689FA3D41031FA10768F902A5ABCC2876A5EED361AA</stationID>
-+			<name>CBN 92.5</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://wm-sgr-live.globo.com/sgr_off_cbnfmrj_live.wma</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1241911980183645EA2E4C247D327AD84BF532AF96F33271106F18B8882403861A32E4</stationID>
-+			<name>Roquette Pinto 94.1</name>
-+			<shortname></shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://roquette.94fm.rj.gov.br:8000/</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13353557754B5172FDD46B8EB4D8BA35E9154441E9EC339FA9CD0A197374035E482AAE</stationID>
-+			<name>Band News FM 94.9</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://69.31.54.135:3690/NEWSRIOAAC</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>124191172671DC04E508F9A1D3362A912E1F854FA07FDB3ADA063131E4DD0AB040D5BB</stationID>
-+			<name>Paradiso FM 95.7</name>
-+			<shortname>Paradiso</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>mms://p.mm.uol.com.br/paradisofm</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>132964185813145D4AD44B972E36DB138819AAE5DBF3CE5BB3473D7344BEB83F1A0ED8</stationID>
-+			<name>Rádio Nacional FM 96.1</name>
-+			<shortname>Nacional</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>http://radioslivres.radiobras.gov.br:8080/nacionalfm.mp3</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13355333701F162639AD78EE2E18697712D5F192ADF258987197C411D5AE1A34B9292E</stationID>
-+			<name>Super Rádio Tupi AM 1280 + FM 96.5</name>
-+			<shortname>Tupi</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://174.122.109.90:8888/;stream.nsv</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13355348680B1FB972724DB59A39863C1C5D9B21EF95FF4EA1C3C90D39AC2E0D2842DE</stationID>
-+			<name>Melodia 97.5</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://streaming3.joinhost.com.br:80/radio_melodia</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13352238428A36568CBE8FE46E0C6B2CBD31197D3F5E6BDB12916A4A49F98165C43283</stationID>
-+			<name>Beat98 FM 98.1</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://wm-sgr-live.globo.com/sgr_off_98fmrj_live.wma</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1244201041C189FB35391781907985642BA71B78711FC0CAE3A34D1F0D608D045257B3</stationID>
-+			<name>Rádio MEC FM 98.9</name>
-+			<shortname>MEC</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>http://radioslivres.radiobras.gov.br:8080/mecfm.mp3</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>123868105729D7E1299035CBCBA570A5A24F356BE7D9D223BCA0C3BDDD6ECCCA2AE11B</stationID>
-+			<name>JB FM 99.7</name>
-+			<shortname>JB</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>http://5923.live.streamtheworld.com:80/JBFMAAC1</url>
-+			<decoderclass>acc</decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1335529955E1A22D934A874936D0D88353FBDFA33AF011B13156DD75C64F4C5483BCD5</stationID>
-+			<name>FM O Dia 100.5</name>
-+			<shortname>O DIa</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://208.80.54.128/FMODIAAAC</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13352190307C9B15684F734B7E4B18D36C631B14DF9E09A38B8727354C2584CF33712E</stationID>
-+			<name>Mix FM 102.1</name>
-+			<shortname>Mix</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://p.mm.uol.com.br/mixriofm</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1335353779649713E5D0A6BB8A85BC827406176719BCCB1B51AC83755B450738B932AA</stationID>
-+			<name>Nativa FM 103.7</name>
-+			<shortname>Nativa</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://174.122.109.82:8886/</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13355282288C45165B0BBDECB759392355069E5BE468AD7A55C30A1F1514358A762CB6</stationID>
-+			<name>RádioCom 104.5 FM</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://67.23.248.77:8000/aovivo.m3u</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1335699232EAD8EF7FB5319FA0106BBDE01E023AFCA7617548C0BED9720F656C7038FA</stationID>
-+			<name>Aleluia 105.1 FM</name>
-+			<shortname>Aleluia</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://servidor5.crossdigital.com.br:8016/;stream.nsv</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1335698861C025BAFB1EF74C6A2C8DA652B1C34CDB5B75B799E3B2F86AA23B42A00FCA</stationID>
-+			<name>Catedral FM 106.7</name>
-+			<shortname>Catedral</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://67.205.76.171:8092</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13356959814BA482B505F6D897EC382C8B7815ABE593C6D2F0CF52E8A1934E32DE2212</stationID>
-+			<name>Gospel 107.9 FM</name>
-+			<shortname>Gospel</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://173.192.184.70:8358/live</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>133560574414161FAD76ADBCF1007E27A277E0AD8217CC4ED0A0E9F0171F236180826C</stationID>
-+			<name>_______________________________</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>0</frequency>
-+		</FrequencyRadioStation>
-+		<InternetRadioStation>
-+			<stationID>126182762802DF5F4526D4D07BB0BC6E56A040A7C4C9C7EC8CB2701522EB06BEA69A8F</stationID>
-+			<name>Antena 1</name>
-+			<shortname>Antena 1</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://a1rj.streams.com.br:7801/stream</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1238680874AB4FA8C5EA96C4654CBFE110206A226CFCB5B48C6941FE5D9453ECE7B65C</stationID>
-+			<name>Globo FM</name>
-+			<shortname></shortname>
-+			<volumepreset>0.3</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>mms://wm-sgr-live.globo.com/sgr_off_globofmrj_live.wma</url>
-+			<decoderclass>asf</decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13352802088D62569EA16EC2CD29B6F997067230DEC4294CFA2274B1253F297B47948D</stationID>
-+			<name>Oi FM</name>
-+			<shortname>Oi</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://173.236.58.98:9470/;stream.mp3</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1238681086AABDFCAFFEDB4F0B52BCC889E6BDD5AC00AADB1DB9FF67CCA23685633656</stationID>
-+			<name>Transamérica</name>
-+			<shortname></shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<url>mms://wmedia.telium.com.br/transrjpop</url>
-+			<decoderclass>asf</decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13284445512FDABAA1CA058AEAAD0E7A618DAAF8A3694549C7B185EB9291D3F1D3A55B</stationID>
-+			<name>Tupi FM</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>mms://servidor10.crossdigital.com.br:8000/tupifm</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+		<InternetRadioStation>
-+			<stationID>13283722598C2F9B55731F7F7A4313A4F3A75BC13B5B983DFFFCA7B153803582085B0E</stationID>
-+			<name>WestDeutscher Rundfunk</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://www.wdr.de/wdrlive/media/wdr5.m3u</url>
-+			<decoderclass></decoderclass>
-+			<playlistclass>auto</playlistclass>
-+			<metadata_encoding>auto</metadata_encoding>
-+		</InternetRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp
---- kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,375 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.2</creator>
-+			<maintainer>Igor Isaias Banlian &lt;igorisaiasbanlian@gmail.com&gt;</maintainer>
-+			<changed>2011-06-21T16:25:53</changed>
-+			<country>Brazil</country>
-+			<city>São Paulo</city>
-+			<media></media>
-+			<comments>Fonte das informações: http://pt.wikipedia.org/wiki/Anexo:Lista_de_rádios_do_Brasil#S.C3.A3o_Paulo</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851063A4998A78195FDC4F511AD5E39A77EDF4A99545FEFEE1BA09A5159FB2DFC85</stationID>
-+			<name>Gazeta (Popular)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851FA44B51067379B772E91D69C3F36BFD1BE373BFAAB02FB267BB9E79745D094DD</stationID>
-+			<name>Fast 89 FM (Antiga Rádio Rock) (Pop, Black, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854485192E7A1C2D349D37CBD77495D3ADB558CD7D921C3160003AE475BF39F3F0CA024</stationID>
-+			<name>Nova Brasil FM (MPB)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851D8831804C6159634263FC359AE57CB8B96FF009B4FB4CB79FF39DB2CBF31EEBF</stationID>
-+			<name>Gospel FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448518D7B45F6186E596C2A56A3F91C4FC1B773F7133E30BC2AA6FE1898DB34D5F4BA</stationID>
-+			<name>CBN (Jornalismo)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448519B29A95C1A4F8B221A919B011D9296D15B5227225A5A7E27C9DA6703B1E3469A</stationID>
-+			<name>Rádio Bandeirantes (Jornalismo, Esportes)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448517DD84085761847C094F78696B91D9B023BA80862F534827883165058CD06133E</stationID>
-+			<name>Rádio Disney Brasil (Jovem, Pop, Rock, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851707ADA489310244DA5D4FAB004D99CD01601FA9FF7F5424A4660A53D88D5ECBE</stationID>
-+			<name>Rádio SulAmérica Trânsito (Trânsito de SP)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851C9201AFEE47247B9A616E705AEAB7E3DAE707A43BD1824390AE427C12EB9B9FB</stationID>
-+			<name>Mitsubishi FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851C5394861FBDFCE6794363776BC90E7F84124E8816818200879AD3CA2859D9632</stationID>
-+			<name>Estadão ESPN (Antiga Eldorado) (Jornalismo, Adulto)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851D0289AC2B0AEFDED22C4D9341F534BF08DF140FE238FEA37C8A72639352C846D</stationID>
-+			<name>USP FM (MPB, Alternativas, Informação)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851F9AFD5FC0F3384511069DC8DCF2220A0F7A12D5501388F4D66F8A72180CF7873</stationID>
-+			<name>Oi FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448518696F96431246C0E8811A76A86CE07D3ADEF74C0D19B888A8B826160DBFD203C</stationID>
-+			<name>Rede Antena 1 (Flashback, Pop Romântico)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851A8F04BB0725196CA919E38D5B9EF9A0DF5F0FF0C920636BFE7466E5C6FAF623E</stationID>
-+			<name>Nativa FM (Popular, Sertanejo)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448512EF7D6A7AF70B101A36763BE25A3FB5C486C40C0B9BC29B17EBF2EA27536562E</stationID>
-+			<name>Mundial (Esotérica)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448518BB559FF1125C773021E9DE13BA19BED84E488D4B73448D879DE9ECFF21C5DE7</stationID>
-+			<name>Band FM (Popular, Black, Pop, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854485184EF62D3E00617144EDB7EF0E3160F9A94464D4E529D28B4E160C5A0B44A45D8</stationID>
-+			<name>Rádio Vida FM (Gospel)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448515838BB6F8E6831C577DB6BEF8B55E18F5A2179AE031EC4C4A76B809918137072</stationID>
-+			<name>BandNews FM (Jornalismo)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851337DE5C347B8E19FF0E880A2B9E38392C48EE37BEF918272CCCCF4E084AFE46F</stationID>
-+			<name>Energia 97 (Dance, House, Black, D&amp;B, Techno)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448513711C1C26ADA91953A177554A9796A2B4BF879C198A82715BAB4D241F0BB73E6</stationID>
-+			<name>IMPD 98.1 FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448516A0B12A86C5DAD2C72F95B4991D5A9B5D1A490DFF605544AD7972C0A484A0A5A</stationID>
-+			<name>Metropolitana (Pop, Black, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851AF15E6AD95800F485702F159914B0A93E46E5CD68DDB11EB583B3C37F08F02F4</stationID>
-+			<name>Rádio Terra FM (Sertanejo)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685448519842A5E231775F250B013D3604832F184655D2BCEA1CFD1DCA1B572B9F26A4B3</stationID>
-+			<name>Rede Aleluia (Evangélica)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854485168590AD0DB7DB99C33772D5B362AB8C2575DB634C5F44FE18158E50FDD895B3B</stationID>
-+			<name>Transamérica (Pop, Black, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851BDAF9DFE698BB91435D5C87510098BC54A6B834354B76112E5DB9F191BA03DAC</stationID>
-+			<name>Jovem Pan 2 FM (Pop, Dance, Black)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851218C33FE44396A6CDD072A46BFE3A2F19DF815140048DD499C8AF8CEFE4A2A70</stationID>
-+			<name>Alpha FM (Flashback, Pop Romântico, MPB)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068544851D6B3C38519AC4F100AFBFF40437A2A057346EDF60B8807F52960204DD1CE389D</stationID>
-+			<name>Kiss FM (Classic Rock)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13086474014771276F6D1BA9B00AFB695144042EDED6BB404D402F81B027F40384964F</stationID>
-+			<name>Imprensa (Forró, Música Regional)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130864745047ED7EFBBF90962261A79A431A64CB0ECD2EAAABF66F8E5311C226B6A5A1</stationID>
-+			<name>Scalla FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647468484F8C0F98D8735571D9B96214477C9DAB79D700CF25B9881D22115226FC</stationID>
-+			<name>Cultura (Clássico, Jazz)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130864748710A1608AF577C02453814307DFD3655C0E861E79F78791ACD6CE495C96BB</stationID>
-+			<name>Tupi FM (Sertanejo)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647494E822E4E85F316E1C17F8EC537A030FC331E04BAAF0CBBA6810992A66AE7B</stationID>
-+			<name>Dumont FM (Pop, Rock, Dance, Black)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647510BDB203D6312D5A3BCC630E7BB8B0A4BC78BFEF1379F8F6199D24A09278A3</stationID>
-+			<name>Transcontinental (Pagode, Black)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647524F17E6261EFB800C8F3C8ADF362AFA88B11F34592467EEC7664D775156F51</stationID>
-+			<name>105 FM (Samba, Pagode, Black, Soul, Rap)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130864754047125139D3E46F3A0C763A2BE51930358CEB355F4519F848AF19119760FE</stationID>
-+			<name>Musical (Gospel)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130864756116CA5CC9C506A3261D2D4A41BB16A6AACC553A25126997731A6D0FE37FBE</stationID>
-+			<name>Mix FM (Pop, Black, Dance)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130864756972F0365E169147F735A06E5B9725A745726FB42524895A11269E28536CF6</stationID>
-+			<name>RBR (Rede Brasil de Radiodifusão) (Popular)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647624EE4ABB9AA1AA1DEDFBFAA05A523E62E6CEE3DBB91670F11484C7C906FCC9</stationID>
-+			<name>Nossa Rádio FM (Evangélica)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1308647642AA11EFF0E0E71AB18CFCAB5956BD81E12BF480CDDB6410C67926DA129328</stationID>
-+			<name>Rádio Eldorado (Antiga Brasil 2000) (Pop, Rock)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13086476879578B3D1BB9352761178E199CF7CE9A3070997936A161A0B366E2F30DBFE</stationID>
-+			<name>Tropical (Popular)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,12 +1,16 @@
- SUBDIRS =
--EXTRA_DIST = "sofia.krp" "stara-zagora.krp"
-+EXTRA_DIST = "plovdiv-antenna.krp" "sofia.krp" "stara-zagora.krp" "varna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/"
--	$(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp"
-+	$(INSTALL_DATA) "$(srcdir)/plovdiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/sofia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp"
--
--
-+	$(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp"
-+	$(INSTALL_DATA) "$(srcdir)/varna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/varna.krp"
-+	
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,222 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Peter Georgiev</maintainer>
-+			<changed>2008-08-16T00:00:37</changed>
-+			<country>Bulgaria</country>
-+			<city>Plovdiv</city>
-+			<media>FM Radio Stations</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218755983103051C38B8B249D2344A212E4BBAC4C8252F16C03DBB01C2DBBB225CB1D23B4</stationID>
-+			<name>BNR Horizont</name>
-+			<shortname>Horizont</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>88.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121875619304FD8AEAF0436E6E3F68691C3A88479AFE09B9BD072600BCFCC2B541E1E28911</stationID>
-+			<name>FM+</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756211F3F3933BDE80E7AA3C470335E9E28ABF237083FA40CF476A6A4DF1A68EA0488C</stationID>
-+			<name>Focus</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121875622134469FC01380505EAB32A823EC8AC6A57A03CF7C46293BC75F9A63522650C86E</stationID>
-+			<name>NRJ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756506728FE149E449E172DA3CB5CEB06BB61319A661E1A678DB8F15BC5247159F639B</stationID>
-+			<name>City</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187562445C4F4905B8D44257C83BE277C97E6C2CEB00D605E60FE1B34B677A38145BF53F</stationID>
-+			<name>BNR Hristo Botev</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756259D8B0B6FD38E46BA38AB996A5CC11308B08ED929A778D35EEB1A2727DA55EFB79</stationID>
-+			<name>Veronnica</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187562782B98DD0067A9F9BD9B433FA0A26DAD119D6B6720083F7382883AA06DA294A07C</stationID>
-+			<name>BNR Plovdiv</name>
-+			<shortname>Plovdiv</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187562909F31EB8EA5C45271C58C673B169FD86C76D84B4C5CD8A6C5FEB302CE57A564A3</stationID>
-+			<name>BG Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756302BF3B89A8D4F7A36486490CCD7CA317A83507E5FEAA8B25795E9D48A45768FAA6</stationID>
-+			<name>Radio 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187563157326C5907EFECE6A9812E710B63BAAEEE132ABE1B71A7F3F71E985AE56E7F0BE</stationID>
-+			<name>Vitosha</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756328DBB067CCDA069586C783D62CA7C81D48EEE4A006509008FB7086CFD553314FA2</stationID>
-+			<name>Atlantic</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756337F1AC64F857AC04B4F13C7DAC79FF75C2013396341C1C2010DCDF11AFA47C95FF</stationID>
-+			<name>Focus</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187563503316E105C2302EDA39CC05C368D8ADD46203A5F7256547BB31695448E6E45F1E</stationID>
-+			<name>Katra FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121875636546F1F7FED4FE10744198F3AB02D08D11B45112BD598346417ECD0B60C6294277</stationID>
-+			<name>BNR Horizont</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756375FC8B5BAA8FAA6D96CA42868CFF96EC5717CBB4B06F0E316E1423CF84F5410A7B</stationID>
-+			<name>N-JOY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756390D22E5095442D86638C8C0B2271F17C138E8FCA2BA92A3CEA1B324646BA3428EB</stationID>
-+			<name>Star FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756400104A27C8E187BC595602C7F4C7A99006883D31C6B41FAD0424275806C4DE7F50</stationID>
-+			<name>Fresh!</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756409BB2AD6C9ED6AFB914064F854E57C2A96E8ACBEF1CFC62114A3D5E76F7C670822</stationID>
-+			<name>Z-Rock</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187564528FE4024BA8FF5D3A386E31BF6B3020DD542D510B1BBB8D15E65E8DDA41DE3E12</stationID>
-+			<name>Radio 1 Rock</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12187564747011B06D9E28650DD839FA3B76A1FA6A021AF3D0083AFDB9AF63D5526242B601</stationID>
-+			<name>Darik</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1218756491255B3BDC321998858D18DF9504D6B6F81431FACFE60073CB6754903B6B26030B</stationID>
-+			<name>The Voice</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12377236317EDEEEAEEA0ACF5224257DB772ECB06DEDD8763D3E15F8393C685BC0819D072B</stationID>
-+			<name>Vesselina</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp
---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,198 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Velislav Kolev</maintainer>
-+			<changed>2006-10-31T20:30:38</changed>
-+			<country>Bulgaria</country>
-+			<city>Varna</city>
-+			<media></media>
-+			<comments> Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162318601827F4BDBFB0362A1D195E998F26869054B35EB2A4133F2B068DE1E87351E98CB</stationID>
-+			<name>�����</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5002</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231862165D42300AC75574DAD46E7381F9C93EB1FD9F04C49732B1B31BD89E352AA96DA</stationID>
-+			<name>N-JOY</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231898247C9A0A9FA6F41FA374BF8D9FADA75EB293AE78E20F5044AE5989F6AB16B638C</stationID>
-+			<name>NRJ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11623190256F1A743C47333B5DBAC8EC95970F73319C494DFBE0D90199F853F6CC77959659</stationID>
-+			<name>����</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319025C18D07591DBE40AE364CC03F7559CCE3EB0DBF667E767D0AB8D4A0B572D3086F</stationID>
-+			<name>������</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231902528FD115D22B4CAB0F75E43F2C449518602931232AEFC4E9F643DA5B723D70152</stationID>
-+			<name>����� 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319020974CF47AAC09D713E9BDE91F99518F10803F0CA237492B4D045A00B63D341151</stationID>
-+			<name>F�+</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231852111FB56C8F8E8D463ADE5DA5176AEED10ECBCA3EC2F6EB9B73D6E4785BE1D33D1</stationID>
-+			<name>Z Rock</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9005</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319026415C16452006790E85B0DB4FF2B600523F6F47D47235EEF7081EF3B29C18E700</stationID>
-+			<name>Bravo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319149B07AE40DE4E3B3C221C45C92834103E19B2EAE290F54417383AA9A6CB8C185C2</stationID>
-+			<name>����</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231852883AA85312F5A295E668B26009730955AB1B1A006FAAB7FC788B061F504CDAB40</stationID>
-+			<name>�� �����</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.8257</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319151D21DAE9E87577C193EE4B1212F61FE7A1C8C169D13FBEFDEE1E17D678D6A2CDB</stationID>
-+			<name>�ity</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319151367F929877E122D879FEF5A43C27ADACCE22CD433A2A898F7F2B73D662E67DF7</stationID>
-+			<name>�����</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162318536AE9D3E77D17C2E559FD9B91C654BB0F5380041C8FE423F92F76050D7A55EEDC9</stationID>
-+			<name>Fresh!</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.351</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319152F38CD5CCDABC8831D587FEE4D112D376BFFF6826DA0B7FF13B1725470CE93D92</stationID>
-+			<name>�������� ���</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11623186397EA1E3928F80CB55F77E8896255E9F314E389BA20FB7236EFE21484D7B0387E7</stationID>
-+			<name>Retro</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.501</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116231854791205EADF3CF6B3AB1B99504DFB800EB833FA840E32C324838B9CC809CA8E6D0</stationID>
-+			<name>����� ���</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.426</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162318554BADC777E26831193C2AE2EFD0DC856441F623AF5C44A753914372AD84FDF486A</stationID>
-+			<name>����</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319336A868FA0C3FF819F5F337E69A1A8CC90031DB64DFA4E828ACC791FBAEC19D8194</stationID>
-+			<name>�������</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162319337ACD11AA2581E8EDCD9F7C4E20B2FF6639118CDEFBA59900D1503B896CBE6D72F</stationID>
-+			<name>�����</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Alberta</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853787DD40C1BEEE3947B3134F34252210E517164CC5FDE203EAA19C29972D39B139B</stationID>
-+			<name>News/Talk @ CHQR-AM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>0.77</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378FE7442F39084CB89C3B5E38960A058F0B9D6B0AFC789AB4AF3EF8EC5470FE06F</stationID>
-+			<name>Country @ CKGY-AM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>1.17</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,126 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Alberta</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853778674CD580E00787E07AC1528B7CE8861157AB80B1ACBE1285D16CF68661D1EB9</stationID>
-+			<name>Country @ CFWE-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>89.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853774ABE9752541CE4B9628567B81024E05450628AB02E5E25E6942B9046C41F9ACF</stationID>
-+			<name>Rhythmic Oldies @ CJSW-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>90.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537733E08552CF2DFD0C7925003F6EC2B02D2801E37F0C694335DB228F2E39CF35EE</stationID>
-+			<name>Rock @ CJAY-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853776C25F86C70CCD31CEA23564BB708A57EF5F9085A7688B43DC6FD872014910FFB</stationID>
-+			<name>Alternative @ CKNG-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853772A8F9E92C1CB29A7A59350909BED4BBFDF7F39660C352B878D9113D14013712D</stationID>
-+			<name>Classic Hits @ CHHK-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>93.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853773611391247EE7FA954C7D9B66FF417A1608BCDB991260EC536CF043E5908BF78</stationID>
-+			<name>Country @ CHLB-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>95.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385377096D0B37514F6B02B594995C4461722DF8DEB8C60824F18245CA27A729986A3C</stationID>
-+			<name>CHR @ CHFM-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853775B02D76F9E43FA4A53B9795FF14D1A1D22A970EDA59D3D43C9F507E715EE112E</stationID>
-+			<name>CHR @ CJTS-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>97.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853770337181A7624FFA5AC1B478A0805106E22AB7FBAFB49A68C7D7AEE9534A97007</stationID>
-+			<name>Classic Rock @ CIRK-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>97.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385377A83A6C70A32728E42BE200437F2605AAFF3BFB342F0A7596AA60C88442F49700</stationID>
-+			<name>Hot AC @ CFGP-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>97.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537734C34BAC629451F47196D3C1E703AC8E6513CDD2740FBBFFA54CD6995FC0B642</stationID>
-+			<name>Classic Rock @ CFBR-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>100.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853770976EAE07E91233E016FB68C6D0EC2ECAEEB6662F974C444D3CA59F2958C9118</stationID>
-+			<name>New Country @ CISN-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853773DEE94D38AB8333A773EDFB9ADE76F0F8161D381D1A7AA36906EAD1DC10D39EF</stationID>
-+			<name>AC @ CFMG-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853776C4C04904D4EBF1B4B6CF03AD5B98DF21541D8AF56F763E7D6935D45D34CDC64</stationID>
-+			<name>Rock @ CKIK-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>107.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,142 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Alberta</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853780FAE1C6C25061440A80A603674BE0548BE72CF9FA55F35ED9EE4D5BD8C0363A0</stationID>
-+			<name>Country @ CFWE-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>89.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378C0AADE85A43442C43CE31F22BFA5F05EAB2CEBE52AC7A0CA28965C42A8061F66</stationID>
-+			<name>Rhythmic Oldies @ CJSW-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>90.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853783A71CA9D83193792249CEE100AB8927715CAEA722FA7240A6744558DCB6C319F</stationID>
-+			<name>Rock @ CJAY-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378AD37014EE4E733A5ACA31247FE51168ACD129E2B22CE7FC884C06561EF1B22D2</stationID>
-+			<name>Alternative @ CKNG-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853785F2EB74C8B58F3AA9BCD474B30D7C13A78DB847009E914B1E0EB3F3D8C1A175A</stationID>
-+			<name>Classic Hits @ CHHK-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>93.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378F6E51ED3C76252FA6524D27E5109BFA743791D5C56A86B11AE5E14E4E9A254A6</stationID>
-+			<name>Country @ CHLB-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>95.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853787B2AA8D76B6F7627D521207BE1E1727C415C3CBCAC18CA22E29B5A83E60E973E</stationID>
-+			<name>CHR @ CHFM-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378CDF63872C81ED21D08337FC844CD89E7C95F5FB5AF367A8BE45F277B8A473423</stationID>
-+			<name>CHR @ CJTS-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>97.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853784B3D9C8D49E1503081AFEAF9F4E1AA3F4D00062F4711C58FDBED37A190BD7B53</stationID>
-+			<name>Classic Rock @ CIRK-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>97.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853780D4C3A7F642534552322E8E2D5BE2F913D8E94568FCE9B9A93B5A586740F4ABF</stationID>
-+			<name>Hot AC @ CFGP-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>97.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378A60ECF6358DA10AD893E14FF5F6EA521FEBC59BD8F4BD26CE0E041DBFF56C4F7</stationID>
-+			<name>Classic Rock @ CFBR-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>100.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378312FBB264D4A90BBA83EF41FF6D5FB60F1933C759111D733CCC46D8010F38D48</stationID>
-+			<name>New Country @ CISN-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537844B72671AA9A88CA5D5934C4C15852741904DE3B6F7B93BDE3A49E88F270EC49</stationID>
-+			<name>AC @ CFMG-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378FE4CE6C37EB5F1811CD58132512AE292849E04893DB76F057732703C8D64F89E</stationID>
-+			<name>Rock @ CKIK-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>107.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385378E0379B23681449EB8C901A44454F0E59D23ED3B51D872513A1C89CD13F68E3EB</stationID>
-+			<name>News/Talk @ CHQR-AM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>0.77</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853783FC783D1673373FF08C16C68DD4930E57F3DE24D1289E2E31D08EC123E749EAD</stationID>
-+			<name>Country @ CKGY-AM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>1.17</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,118 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>British Columbia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359E5A2DBA3F6BFD77DD674D149FC604C4F7A0936A253710318B042B49A09995ABF</stationID>
-+			<name>CHR @ CKPG-AM</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<frequency>0.55</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359DEECE66A5C95CE02E6FA5674424B3AFD9E4814AB5DC04DC6EDDDAFADF5429A72</stationID>
-+			<name>Country @ CJCI-AM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<frequency>0.62</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359427537B107932F2983F3D1D0D44CA2506DCC66A5F53C1B83DE6045B010B40B97</stationID>
-+			<name>Oldies @ CISL-AM</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<frequency>0.65</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359F44A29C1C5F4DA4F3D073EF63EF6A55861CB5EA72D75EFAD5FF2881F33636C35</stationID>
-+			<name>Country @ CKQR-AM</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<frequency>0.76</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535922F1BC67CE0B8A3E32521C82ACFDEB520AE5E4218C6632F10B598F407879ADD1</stationID>
-+			<name>CHR @ CKKC-AM</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<frequency>0.88</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853599EFD17AD0095E71E572E37BB8B56588EBF6CAC82FA4065A5A2D29E663E9CD565</stationID>
-+			<name>News/Talk @ CJVI-AM</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853596D496E7338CACD5A2A0D5823FEBC25DF8D3037DB3D5DF4D6CAC3C441322C98F4</stationID>
-+			<name>News/Talk @ CKNW-AM</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853592EE5091A6A34B19E2C4A6EF25D0E241096F3F31DDF66F588E5033BF9D208F0D4</stationID>
-+			<name>Classic Hits @ CKST-AM</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<frequency>1.04</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359AC95EB6E19BCCA350D209B8BE4B23F27B5776EC48ADBC1E9396A50D6CF916DF5</stationID>
-+			<name>News/Talk @ CFAX-AM</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<frequency>1.07</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359C31F7F7ED4DE20DAB0166BA881C584F64C6E6E4330F234B5252BB1CFFED8F348</stationID>
-+			<name>News/Talk @ CKWX-AM</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<frequency>1.13</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359658EB256EC4AD36DD8F6A61BD1DE02EBA0814619463FC7B6D744D4D480E63268</stationID>
-+			<name>AC @ CJAV-AM</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<frequency>1.24</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359228FDE7DCE8C430CCF137F5F5AB3D1EB7AA95E1092A8EEE04F9264DB2F335185</stationID>
-+			<name>News/Talk @ CHMB-AM</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<frequency>1.32</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853593F73FB4F279E229596A57660ABB5C7392D69FF785C19F2B362EAB67C1CD5F4D5</stationID>
-+			<name>Country @ CKGF-AM</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<frequency>1.34</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,190 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>British Columbia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853590D470913EFF51B2E353F3ADE718349C4AF7C0AFD4222586C8074F52E97281DAE</stationID>
-+			<name>AC @ CJSU-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>89.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853598DEB5D6CCB6220FB51C87F8542D06F962F8F46FCEA7369CC6C62C7A1C1542EA7</stationID>
-+			<name>Country @ CJJR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>93.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359EC9F32C83C8CD51CA92EE014B64585F70B4795EF42F6F9BAE724190A2D382FD4</stationID>
-+			<name>Various @ CJSF-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>93.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359407D77C53DC9D578813E568E34073FA92102C995570DC6FF13C7D015986B18F1</stationID>
-+			<name>Rock @ CIRX-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535932CD0CFF6C389736FA7CD3248111742DFC335DFF2D743DD5F272B85BEC177541</stationID>
-+			<name>CHR @ CKZZ-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>95.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853593166C89AD687C9854C5F92E569B032E78677E0E3BA1562B1913FC8ADA5541CE1</stationID>
-+			<name>CHR @ CJAT-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>95.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359F067608C6F11E5DA3F31447A8AF5783D28BFB5C46A6FBB5A94B913FF77E399FC</stationID>
-+			<name>AC @ CKKS-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>96.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853591D4B72FC5F5F6A0287A2933BAFD58E30CAAB997576EEE3665370CDB53101163B</stationID>
-+			<name>Hot AC @ CJMG-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>97.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359D582AA50D1BC56FC1064A087A25684950DDED72ECC3B54ED2A112A9925001C01</stationID>
-+			<name>AC @ CIOC-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>98.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853592D38CA7610711D5D51231A8AE8DE0EF88AAB7C9A24955420EB51A122C060EC32</stationID>
-+			<name>Rock @ CFOX-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>99.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359B22CAF40A16FFC20B1BA2BB6F7D61336072726150F9DEE61FEF2241CD82C7D94</stationID>
-+			<name>CHR @ CHSU-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535902A7FCBBE58AAFD8D958D2E9661731AFA87E565A7F9CA40D72FF247BCCC79CF2</stationID>
-+			<name>Rock @ CKKQ-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>100.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853598C23C12C9F97E562E09D3EAF8173F6E28B6C129B84FBD940BB519FA1241D56DD</stationID>
-+			<name>Classic Rock @ CFMI-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535998E0E628C51AB2DCBFD1061E392851023B8EB9B207D8D781F04CBFE0653606C9</stationID>
-+			<name>Hot AC @ CKKN-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>101.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359680649EC02D1E110145649B23CCB744C33FA008846AD78598CD46CDABE40BA50</stationID>
-+			<name>Nostalgia @ CFUV-FM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>101.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359DBCEAA7F0DC6E8C73261E912CAC0BFE60FC66692BC44BCBC8225B365CA17CFE2</stationID>
-+			<name>CHR @ CISW-FM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>102.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359B368E35C2BBD3F01B51027029FCBDF631CE9B019CA9D58B55499ADA58E812C9E</stationID>
-+			<name>Ethnic @ CKMO-FM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853599BD2AE95C3F9AB2B89997A030A18FFD39CCB35072A4945807960B8BEC5E06E51</stationID>
-+			<name>AC @ CHQM-FM</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<frequency>103.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359B54D9766475D0D613D1C5604ADDE7D0F49E91F7B56C22E524D94F156373CFCD9</stationID>
-+			<name>AC @ CKSR-FM</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535905B485F99B1F3D8448C8EF1D69BE9473F472F7D58D47160F90E1668A570D7D1A</stationID>
-+			<name>Classical @ CBU-FM</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<frequency>105.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359123885D3FDDD740756AD138F88B2676EB0D6324453529C5BB1F5C826090A2018</stationID>
-+			<name>AC @ CISQ-FM</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<frequency>107.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853595E73E741DA155239CA2CD23C6BDEA442B856714F6CF309C70E573B062CD88A1C</stationID>
-+			<name>AC @ CKIS-FM</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<frequency>107.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,294 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>British Columbia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359D5F2CDD6F12A5F08FF862B6F04EA76E90E0991B9C7D7458CF70C393634632D94</stationID>
-+			<name>AC @ CJSU-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>89.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359F6AC17F18E655860B8E7A65E0ACEA3DCEAF1CFBC707956A527D23FEF188F82E1</stationID>
-+			<name>Country @ CJJR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>93.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359F097F1B15886BD01849C57468F86A3DF45DB5CB8C9C99029C95731643002E89D</stationID>
-+			<name>Various @ CJSF-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>93.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535915DBA56B6EDE5B843C04601D2FE4268B3268753DCF93F5163A854CCF922AC458</stationID>
-+			<name>Rock @ CIRX-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853593BCA4073FFDA7F36A62A318B05925FA115E4ACFBC36E577C9B117D7EA141D92D</stationID>
-+			<name>CHR @ CKZZ-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>95.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359A7EAAC3B45AA6CE4523502CD83FEC0F72BE631F30D8E4678C3BF3378233805B0</stationID>
-+			<name>CHR @ CJAT-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>95.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853592A292C842356FD1D291AEFD315BD4D7783C877CA847D3E3653A6388A4C9D1238</stationID>
-+			<name>AC @ CKKS-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>96.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535948C956430AA3776A8778C16544612BB332ED8200CA7E8AC3E75D1390F39F4E67</stationID>
-+			<name>Hot AC @ CJMG-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>97.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853598906ADEE03A37745D1E98FD6E7381F0EF6AB1263856188CD3DC3A69275AA5148</stationID>
-+			<name>AC @ CIOC-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>98.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359BC752064BB4DCA331A9A0069107485A8F1D01BFDC7F65A9EDF34F798421C8CB6</stationID>
-+			<name>Rock @ CFOX-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>99.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359560FB9E2053F54D71A04853510FD008F006060176BFE043D77BE11F5CD486A44</stationID>
-+			<name>CHR @ CHSU-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853594FDBC3B886FDCDBFF49FEE354B2BC4821D5689BEA38809EE8273D58BE6A3DB8B</stationID>
-+			<name>Rock @ CKKQ-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>100.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535969D7D59575FFD8F0EC4CBF739E4639BDA43AE5C2EBAC6EAD9BC7D623D157DF4F</stationID>
-+			<name>Classic Rock @ CFMI-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535995DF4F9F6E889895A10D733C97DFBBF922DF50AD582DF00330002ED3CED541AF</stationID>
-+			<name>Hot AC @ CKKN-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>101.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359CD92F5B64E70F31826D15141911D3765A9E610892208309C26C6C60294BD2BCD</stationID>
-+			<name>Nostalgia @ CFUV-FM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>101.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359A3CF06A48F737C1199BBDDF557FE48C66ECE84796B92EA76A29BA5B84B89BE19</stationID>
-+			<name>CHR @ CISW-FM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>102.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535959DDAA60D9DE068BC3EBD8D39F2D64376F3CD34B7E4DB871D99E4E90E7326900</stationID>
-+			<name>Ethnic @ CKMO-FM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359E9D75073B921265DB610B1AC0E4EC4984B42A155EEECDFC4CE2F021F83984BE1</stationID>
-+			<name>AC @ CHQM-FM</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<frequency>103.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359A86C3AEDCD0A5B0F28BBEF316913D1B5DC58E60348B09D8A18E1F35B00498736</stationID>
-+			<name>AC @ CKSR-FM</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359D542249A6C677F5F03CE3A40DD5A2EE487CA792B44BEC9CFD7D3D2C73CF38FBF</stationID>
-+			<name>Classical @ CBU-FM</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<frequency>105.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853599FF38288DD86E0286B6161E6F3479C02B06D69B4286D4B7E95B6B0AF3EEB5DF0</stationID>
-+			<name>AC @ CISQ-FM</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<frequency>107.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853597B45BBF753EF6A529D838E94FBFED83E44AA192B4ABC6B9653AFA84BCC6702D2</stationID>
-+			<name>AC @ CKIS-FM</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<frequency>107.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359C551EE7983FBE6F50676A1589616E8776CD1440F3A9CC531C77EA7D83E1B46C4</stationID>
-+			<name>CHR @ CKPG-AM</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<frequency>0.55</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535928ECE0C3208B4C9F52EE381CAFEEC6DB8F5AF2C3167DD9D50932DCEA0BB8FCD9</stationID>
-+			<name>Country @ CJCI-AM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<frequency>0.62</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359CE6FEA4D0940467DCAC059101954593CFF0BD234C58D8857B9527E9E4F3A03EC</stationID>
-+			<name>Oldies @ CISL-AM</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<frequency>0.65</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359701D86995E780498A6FC3FD0772E8F5599BBC17FA8FF9EB7C202DE12D4ECFCF0</stationID>
-+			<name>Country @ CKQR-AM</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<frequency>0.76</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359740D66F68A08A73502B36460F77D6168494179F8C928CE9DA4104AAD5423E8A2</stationID>
-+			<name>CHR @ CKKC-AM</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<frequency>0.88</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535962BD3E066AE7DBD6DDE0011ED9F372CB301FEAE8D57C38B065A5AA56081D69D7</stationID>
-+			<name>News/Talk @ CJVI-AM</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359EBEFAE79981DC478EDB0BAD7EF80A1206C7638F975AAFCDCE0627C6F724952DE</stationID>
-+			<name>News/Talk @ CKNW-AM</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359349E399273A6FE830A43975752CDD50BC23546EDBE9075D597F25119DD274E4B</stationID>
-+			<name>Classic Hits @ CKST-AM</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<frequency>1.04</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359B2E704463BC0D4C38CF3F3EAC9EB6E370FC9F6EB41BBC238539318D425E9F117</stationID>
-+			<name>News/Talk @ CFAX-AM</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<frequency>1.07</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359899124E77D5F886672AB575E45B1155B6F318E584D613582DF9CB2A2C0F52476</stationID>
-+			<name>News/Talk @ CKWX-AM</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<frequency>1.13</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535953AE20D883ED79AB9F258DCAEF6D01D97445E45412C6397C06F7A2AA8F5B079A</stationID>
-+			<name>AC @ CJAV-AM</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<frequency>1.24</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359A28D4D85FFC1AC307A2CA461DC1244D6C80D781E090AC6B6EED2D427563048AC</stationID>
-+			<name>News/Talk @ CHMB-AM</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<frequency>1.32</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385359278A3675076B786C676F1819843CFD9EC039C049A15DE1EE2CC3EF87FD3AAC97</stationID>
-+			<name>Country @ CKGF-AM</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<frequency>1.34</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am kradio-3.5.13.1/kradio3/presets/canada/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/canada/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,10 +1,64 @@
- SUBDIRS =
--EXTRA_DIST = "montreal-antenna.krp"
-+EXTRA_DIST = "Alberta_am.krp" "Alberta_fm.krp" Alberta.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "montreal-antenna.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp"
- 	$(INSTALL_DATA) "$(srcdir)/montreal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp"
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp"
-+	
-\ Pas de fin de ligne à la fin du fichier
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,54 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Manitoba</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372567FAEECC546FCB8B698C0DED0B9B7FC373F54964E7269E6F2097D2F6321EC32</stationID>
-+			<name>Rock @ CFAR-AM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>0.59</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372679E852386AF719E9EC2C0601E13253D76516464D916D13E2E2218A53E35BA4D</stationID>
-+			<name>News/Talk @ CJOB-AM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>0.68</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372202F08C60092B519D009A5E700CAF1C11B3C09E77CE91F77E76455ADDB9DADBF</stationID>
-+			<name>Country @ CKDM-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>0.73</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372B5DA577EE59D667B19180D54335E981108E68BC90E0919C8CBA341B41CBC7893</stationID>
-+			<name>Ethnic @ CKJS-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>0.81</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372AD587F819284AD479EEB5F9DC22F6E9943725A1B1D4947CC648E60D33D351EC9</stationID>
-+			<name>News/Talk @ CIFX-AM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>1.29</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,78 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Manitoba</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338537233399A62D25D77EA4D8FCC8451783B38A249F29DAF3B7B03FAD172B65B4414FC</stationID>
-+			<name>Rock @ CITI-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>92.0</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372DFE8BDBA148E3963997DEF32EB5D5E93B957D65BB9ECFAF940EA366559D2CCE1</stationID>
-+			<name>Hot AC @ CHIQ-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372D0B0F1A1389C0B2AB983EBD8A2C2CCAC76562832487F17212C24E460130E789F</stationID>
-+			<name>Modern AC @ CKLF-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372F0903CAA44A0BE6DEC41C707F448B54EC32CC456A7EF3BD8181D9F99FEFA2C46</stationID>
-+			<name>Rock @ CJKR-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>97.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853725B4397003ED0D58C0716AA707AFC1514FBD02743786B8046E096CE1EAB1F79AE</stationID>
-+			<name>Classic Hits @ CFWM-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372DA36B4034B53FC9324D0610397E9822DE88345715E3F76F05540630E30D84965</stationID>
-+			<name>CHR @ CKXA-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372396A871B304FBF1790A2A9C8BDE4E0115996BB60EFB0A30F342E1AF1092E8F27</stationID>
-+			<name>CHR @ CKMM-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853725038DB07B1019C3E2BC42E00FD6F0B6ACCE0E4B964D44D13B9167B31185B0DDF</stationID>
-+			<name>Country @ CFQX-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>104.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,118 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Manitoba</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338537235DE40FE931DDE7AB4ACE93C959304E7BFA062E7E5B078E9E2A01CF696F2C8A7</stationID>
-+			<name>Rock @ CITI-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>92.0</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372BE099D03BC51FBEBDE20CBC70FC10423AD5E613054C0DDF72E787FF8CF0E4F0B</stationID>
-+			<name>Hot AC @ CHIQ-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537209A1EFF7611EAFD085F8936930DA9BBA09B829C7A6E6FD9BBE8C74694407A208</stationID>
-+			<name>Modern AC @ CKLF-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853728D66D9EE218394C91355E5D110E08F362D8B68BBD1F281EAD0F96C16A0BDED62</stationID>
-+			<name>Rock @ CJKR-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>97.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372C40013266B5DD98E82519FBE4A396847FA9B64C7A303AE48FCA527F959CD69FD</stationID>
-+			<name>Classic Hits @ CFWM-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372D6F63A9BFC233D2F9662065C4724A4C512492F510295A78A5629A0292F4B4C02</stationID>
-+			<name>CHR @ CKXA-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537265D6BD981E58BCA3B70DD320903417E3E9FF7641AC4171E60AD659F904793636</stationID>
-+			<name>CHR @ CKMM-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537215E89F1BD490A98711E71261CFB0CF5DE9A9FF96DD0C3449E30AEC487EA1C7C0</stationID>
-+			<name>Country @ CFQX-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>104.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853723C92632B65EAA085F8ADA5C1A7E22F1B6B92B68D36C334D43C2356640AC20A59</stationID>
-+			<name>Rock @ CFAR-AM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>0.59</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372D6D1E62FC77378744328333B87F77C3F55ED107D2104BFE45F4E2413407747A4</stationID>
-+			<name>News/Talk @ CJOB-AM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>0.68</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853729BE68A608EB4852F2FB94CFE385841CC1A8CCF6C0A2FD4821CFBABB967998978</stationID>
-+			<name>Country @ CKDM-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>0.73</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372B082179F3FC50164F20D1A2EFB2BB65907F17A40B9D05FEE0D6EAACFBFC11252</stationID>
-+			<name>Ethnic @ CKJS-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>0.81</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385372ADE418EAF6819DDE4859A0610BCC0D3EE140129A23EBA859986E76B7EBF718AA</stationID>
-+			<name>News/Talk @ CIFX-AM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>1.29</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>New Brunswick</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385355CF17CC34E34861B4F07366466A551EFDCD3C87604508C1C731313F6A1D69874C</stationID>
-+			<name>Country @ CKCW-AM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>1.22</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,54 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>New Brunswick</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338537563FF343F7028276A4D0BFF553004AAF1257E6C11F66596198596FDFE45456169</stationID>
-+			<name>Pop/Alt @ CKUM-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>93.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385375B1927CA7E6D2FD84C8C6FDD9B726EF1EF99751E38B86269C516642CE4B375A34</stationID>
-+			<name>CHR @ CHSR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>97.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853752D3E8314F46B5E97EA4E77C8FF16C17EDDDBF8D32F0D52DBE7B354746497682D</stationID>
-+			<name>Rock @ CJMO-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385375B19B7BE82B799670C8A81C520BBFA43073BE523360FEDCD3C77EFB1A3E5DEAA3</stationID>
-+			<name>Country @ CFQM-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853757DD605858EE796661C1F97538865E8065BF849CA2F8440D084118B0B434F3A1E</stationID>
-+			<name>Alternative @ CHMA-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>106.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,62 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>New Brunswick</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385376727BBC1B83D1C2F21F016FA3C6FE07FF94C5943890D6204C290509F65F6F0106</stationID>
-+			<name>Pop/Alt @ CKUM-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>93.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385376925157412BAB49F3429F192B5B21AB1143E5E47CEF2AB3AD13FA2060D36B0816</stationID>
-+			<name>CHR @ CHSR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>97.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537685E1131CEC97874856FC0B0C909388AD46A2E1BCB6A030DAB5B599F000DA370A</stationID>
-+			<name>Rock @ CJMO-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385376F66B38C11B08AD05960B95CA93F34DBF9F296F090FB64E493B961D9F7870E86D</stationID>
-+			<name>Country @ CFQM-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385376BD5CE49E5E3B5B55B5BACD887351669D2E469BC93AA63A6C900638D0E40D69A8</stationID>
-+			<name>Alternative @ CHMA-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>106.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338537661A9F1D1C79A49DA630E16FBB7B98E764266736BEE7B3E8EA404537E60E6C747</stationID>
-+			<name>Country @ CKCW-AM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>1.22</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Newfoundland</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Newfoundland</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338537789B29E90B35F99179A0AA91933650FC46E824CA5B6BF68F576B3182B55DD9056</stationID>
-+			<name>Rock @ CHOZ-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:53 2003</changed>
-+			<country>USA</country>
-+			<city>Newfoundland</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385377D11D9B16595E641E697405179F8C6D5B562D2D0A7D84F70287AD185594E0FA2B</stationID>
-+			<name>Rock @ CHOZ-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Nova Scotia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853835DC9A764A70C2E9080B031E63EAFD6F705632BEC8F8F43860CFB55EA53C20AE5</stationID>
-+			<name>News/Talk @ CJCH-AM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>0.92</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Nova Scotia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853833F7B08CF4B773E874FD58D80B7FA0043373DB324A256C12C866E5244AD386EB0</stationID>
-+			<name>Various @ CJLS-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>96.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853833C8F899020527563BD1F5DA705ED43D2A3FA9B43391135053FBBB273A7C0B3D0</stationID>
-+			<name>CHR @ CFRQ-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>104.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Nova Scotia</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385383878D2D92A7691A444275FCF3189047A309CB29737D425D132E3C8976E9C05A4B</stationID>
-+			<name>Various @ CJLS-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>96.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853839ECF21389639F415BDA39F7E8FBEFD0C6F5579F10594475BA801BD9CB1EED5C5</stationID>
-+			<name>CHR @ CFRQ-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>104.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538376D203B4C09F3B3B261D56F2F0617A7D339FD7432DD788E6D85A850461D0E6F0</stationID>
-+			<name>News/Talk @ CJCH-AM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>0.92</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,222 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Ontario</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387734E601B33CF7FEF66FC8FCC05F0446D3C26E705D641C4085E63983229A98AB7</stationID>
-+			<name>Oldies @ CFOS-AM</name>
-+			<shortname>51</shortname>
-+			<icon></icon>
-+			<frequency>0.56</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538710E0424C6B045B2192E52A41633294FBC4D6D0DCE9718E7767AD3CBBB64FF418</stationID>
-+			<name>CHR @ CKGL-AM</name>
-+			<shortname>52</shortname>
-+			<icon></icon>
-+			<frequency>0.57</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387CA3C1F727A8B13541CEAB051C5D5336D7F23E176EA7D27B3836170FC8C5B9BE0</stationID>
-+			<name>News/Talk @ CKPR-AM</name>
-+			<shortname>53</shortname>
-+			<icon></icon>
-+			<frequency>0.58</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387020E218DD974FB8F1AB6C6CB4D8B197FF37F614974BAFF0FF04D1DF9C9FAFBDA</stationID>
-+			<name>Sports @ CJCL-AM</name>
-+			<shortname>54</shortname>
-+			<icon></icon>
-+			<frequency>0.59</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538700312BA43D080B58538D302DB860E404750984DD0074A916B39EC545CF1379CD</stationID>
-+			<name>Oldies @ CFCO-AM</name>
-+			<shortname>55</shortname>
-+			<icon></icon>
-+			<frequency>0.63</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F68BD20A5BE999DE81DDEDDAA11FFC6752A43D51514986B902D70B410ACB4955</stationID>
-+			<name>News/Talk @ CHOG-AM</name>
-+			<shortname>56</shortname>
-+			<icon></icon>
-+			<frequency>0.64</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E1DE75E2BE0F5CE4D3D2ACB40AABFDFAE5C25084D6BF6FFB203FB792C27F3F14</stationID>
-+			<name>News @ CFTR-AM</name>
-+			<shortname>57</shortname>
-+			<icon></icon>
-+			<frequency>0.68</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853879B10E0A091EF756AFFECD007746EE2EEB4C3D64E3375308E0FCC45453FB047F9</stationID>
-+			<name>Country @ CJBQ-AM</name>
-+			<shortname>58</shortname>
-+			<icon></icon>
-+			<frequency>0.8</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853874C8509AF11B4F856F570DA531316397FBE7B222BE943BCDD051780EEC0124963</stationID>
-+			<name>Country @ CHAM-AM</name>
-+			<shortname>59</shortname>
-+			<icon></icon>
-+			<frequency>0.82</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E71997B442DCB3952D89AB290835AD5670783C9DA03A6AFCB50B2EACA5A981BB</stationID>
-+			<name>Oldies @ CHML-AM</name>
-+			<shortname>60</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853873FD423C2E1562B89C4E345BD4A1B1B73C677BE771291E8DB38A9F17173B4846E</stationID>
-+			<name>AC @ CFPL-AM</name>
-+			<shortname>61</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387D001E4C61E6DE920B1575B190BD9B5B37B020977E04F38576F64BA3004AD06CC</stationID>
-+			<name>News/Talk @ CFRB-AM</name>
-+			<shortname>62</shortname>
-+			<icon></icon>
-+			<frequency>1.01</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387424294ACA2638A9FA5C88E253B77DD51925A1E90878FF04CC63E7C07F8487A69</stationID>
-+			<name>Oldies @ CHUM-AM</name>
-+			<shortname>63</shortname>
-+			<icon></icon>
-+			<frequency>1.05</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875A66270416082CB4C06DCA096DB2B946C67D50326720D285714C28771A8CF959</stationID>
-+			<name>News/Talk @ CHOK-AM</name>
-+			<shortname>64</shortname>
-+			<icon></icon>
-+			<frequency>1.07</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877193518E7AC5D4F38FF398E79985586E2C3760CCAFC0890073424B1D3D33CC9E</stationID>
-+			<name>Oldies @ CKKW-AM</name>
-+			<shortname>65</shortname>
-+			<icon></icon>
-+			<frequency>1.09</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853872A8B3612D1E39C534F5656C13D01AAF4CDCBEA0F2D4CAAB2A4F411A8B9296CEB</stationID>
-+			<name>Oldies @ CKOC-AM</name>
-+			<shortname>66</shortname>
-+			<icon></icon>
-+			<frequency>1.15</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387876C5EB7785C42C34B17B6D5CDCD10459D37CEF452A533816684EA26C0AC8F07</stationID>
-+			<name>CHR @ CJTT-AM</name>
-+			<shortname>67</shortname>
-+			<icon></icon>
-+			<frequency>1.23</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853872BA99262573FDC126085ABAC358017391E5D5BF908BC54367785928491852922</stationID>
-+			<name>Oldies @ CJCS-AM</name>
-+			<shortname>68</shortname>
-+			<icon></icon>
-+			<frequency>1.24</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538751515E14FC1C0CAD503EA9C3A53AEE3A11A50A1D0D603C1B326586F08BD3526F</stationID>
-+			<name>AC @ CJTN-AM</name>
-+			<shortname>69</shortname>
-+			<icon></icon>
-+			<frequency>1.27</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538758A816DDFEA98055904B262B12A86C5EDD86C30B93890A4AD0CF90B69C56549B</stationID>
-+			<name>News/Talk @ CJBK-AM</name>
-+			<shortname>70</shortname>
-+			<icon></icon>
-+			<frequency>1.29</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538721ACEEACE356B2E0820D2EC3DF821EB31EBAB6CFFEFDEF2572DA4945DC923155</stationID>
-+			<name>Classic Hits @ CKPC-AM</name>
-+			<shortname>71</shortname>
-+			<icon></icon>
-+			<frequency>1.38</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875B79C7F4383E6C762706370AEACF739D47C5712E7B832D36B04B47FC073F0186</stationID>
-+			<name>Oldies @ CKSL-AM</name>
-+			<shortname>72</shortname>
-+			<icon></icon>
-+			<frequency>1.41</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538752429D53A9F687C70E8E352F36219AD716D879F1AD41DC8FF5EE9C82EEE7734D</stationID>
-+			<name>AC @ CKPT-AM</name>
-+			<shortname>73</shortname>
-+			<icon></icon>
-+			<frequency>1.42</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538724737608C2A2A616DE49B424135B50A4F242108E8F619DD35474EAA9AF6D517B</stationID>
-+			<name>Oldies @ CJOY-AM</name>
-+			<shortname>74</shortname>
-+			<icon></icon>
-+			<frequency>1.46</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875C1CE8727F5626C388394BF70085CE39E7B36CF507C902058A6CAD31C0FC32D5</stationID>
-+			<name>Oldies @ CFPS-AM</name>
-+			<shortname>75</shortname>
-+			<icon></icon>
-+			<frequency>1.49</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387A9A9AEDC27F800BD96818465CFBB3423E08FD4C3C27B99B27644D01A0B56DC85</stationID>
-+			<name>Ethnic @ CHIN-AM</name>
-+			<shortname>76</shortname>
-+			<icon></icon>
-+			<frequency>1.54</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,414 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Ontario</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386BBD3399B483508CE617495612BC49B9EB8EEDDEC91D03918C1A7D9B78D05879F</stationID>
-+			<name>Urban AC @ CKLN-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>88.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386402F58A2FC9ACB1732F00E4AD6953A0ACAD6002D06D280C1448BBF25C2C7CBED</stationID>
-+			<name>Alternative @ CKDX-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>88.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386A6B5C6A56C654D1EF53FED84ECF71E7495689028C4209B738B97EDB64E6809C5</stationID>
-+			<name>CHR @ CIUT-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>89.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853862AC1C308E19A22CE8EDCFEA3A4694B6E75D0061BE24E5184D717EE80F1F5D648</stationID>
-+			<name>Classical @ CJRT-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>91.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853869940994CE36F56CC91E3755811501083CF75F3FA147B35C59EF501C6A9232BA5</stationID>
-+			<name>CHR @ CKPC-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386C0B06FEBDC29742E738362C21488B6DC53E9C5467BEFF1FA1918066F33397CFF</stationID>
-+			<name>CHR @ CISS-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386767DEDBC4C618CE65EB00E1860D9CD677EB6D635AA871AAC88C2E2C15C69F453</stationID>
-+			<name>Rock @ CJRQ-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>92.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386DB863E27395DD2F381433DE2A61E5D129CECCE4E0054420979979EA1839E2ABE</stationID>
-+			<name>Community @ CKCU-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>93.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386FAADF7AD44886F1E35744A0E93A4E52D8D4D8A28A788AC5BAE47478660A3F456</stationID>
-+			<name>AC @ CFRU-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>93.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538636200C8C40FE3BD9B35EDDD7376635BDB460DC2E212299F8F2F1382765D7F890</stationID>
-+			<name>Urban @ CFXL-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>93.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386D7CE8D51E849BDB4DE57B733127F04B060F9C4B673440FFA7C6BDBD913028F56</stationID>
-+			<name>CHR @ CKKL-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>93.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853864100CBE1F6361692B6F3281A8439F7DE20DCE4DA62A2BCD12A08CCEEA8C5121C</stationID>
-+			<name>Rock @ CJSD-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853866C8E41CC7F246EEFE0FC7B12D48CB32DED00F264AC4C5B0E5A41CE94A022E503</stationID>
-+			<name>Nostalgia @ CHRW-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386168B69AB7EE5A725F393872C2E8D9D4A4CA1DA4B5AC15A9A0EE48A1425242D82</stationID>
-+			<name>Hot AC @ CKGE-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>94.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386982D84F66D2D1D415FE025064382691931D36666BAD901546E8DD9C3AA5E1266</stationID>
-+			<name>AC @ CKSY-FM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>95.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853864E34CBBC7BB3CBFBEF03686C4DD8BFEB0F1BD15F978DBF3E604AC42458E23AF5</stationID>
-+			<name>Classic Rock @ CJXY-FM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>95.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538619435BCB06CD70B3E72F9FC66A82CF7174E4715995B1119B18A415B4CA86E010</stationID>
-+			<name>Rock @ CFJB-FM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<frequency>95.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386F02EE0FE6FC1F7CC06BD0C51E16448BF0589256C1599B36B0AB1E6D559ABD829</stationID>
-+			<name>Rock @ CFPL-FM</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386D8F3258DB9CAD4B877B6436F47C1A8CDFE0A1D98357CFDB87B12ACE9569390B0</stationID>
-+			<name>Country @ CHVR-FM</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<frequency>96.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386FDA3B5B00A3CC38D48CBD83E67390B5739A60D9D4BF59648F5F1F39E7B629783</stationID>
-+			<name>AC @ CJEZ-FM</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<frequency>97.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386DCE128C871AE0B3E88AD8914186744CEC297E7FA2695A2576E624132CFEA57F8</stationID>
-+			<name>AC @ CIQM-FM</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<frequency>97.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386C478FABC579AC6F910B9F2145AFA3BE45A40C7780894B9A7D4C90B8C4C26BE35</stationID>
-+			<name>CHR @ CHFI-FM</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<frequency>98.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538624D94F399AE7ACBF41F43E81FDA05AB1882D1059DA7BCFAEA87482B5DA5D376B</stationID>
-+			<name>AC @ CFLY-FM</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<frequency>98.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386B4E7858A1C16F77774B6D60317734B9435A111C79867EAF33F5EEA019B2ED14A</stationID>
-+			<name>Country @ CYSS-FM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<frequency>99.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538654DEA9EA7D68F0D485BB980FF9E387487FE9278A486C32D34FD052CF4732A621</stationID>
-+			<name>AC @ CKMX-FM</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386447C292FF745659014EF1F8DBF6B58414ACA6047FF9678E6DA5E5F2C7DA5A9FF</stationID>
-+			<name>Ethnic @ CHIN-FM</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<frequency>100.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538625ACB8C48033773DC6DAD8B8DB3A65944A10B7624E11D6C25D091B078217ACC8</stationID>
-+			<name>Alternative @ CFMO-FM</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386A164237B20FB1A881985DA52D64EFCC9D2057843BB88E3BA50B4E307BA4A86B1</stationID>
-+			<name>Rock @ CKWF-FM</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<frequency>101.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538614A744DB3C84630BD3EA779761735CA6DF75FFB6E9FC2DCACCA1C25B531EA392</stationID>
-+			<name>AC @ CFRC-FM</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<frequency>101.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853868D109D1121D6084BA5617FAFBF61511320C88427C243BCC345849F3E392133F1</stationID>
-+			<name>Alternative @ CFNY-FM</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<frequency>102.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538690FB3CF0893E18C64F51903A11D73A99F4793CDBD16628E3CB2E39345FAA9B2D</stationID>
-+			<name>Hot AC @ CHST-FM</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<frequency>102.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853863DD41F785B586BD29B07CC961DBE78A8F850040EFA43E443195FEBFC9FA3F151</stationID>
-+			<name>CHR @ CFHK-FM</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386047F08B748ABA7CD3880814BF9F66C32342F7C80BFDC82DB99170F1B246BDC66</stationID>
-+			<name>AC @ CKLP-FM</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<frequency>103.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386637F85CB8ACF831AA1DF14A40AA9131182F2D8C4FFB4F3B15D88E9CD3B8F6614</stationID>
-+			<name>CHR @ CIDC-FM</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<frequency>103.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386907E950B4E21779DE4B34E4DEF7304C4519D2BB982DC9D366E14E741132BD337</stationID>
-+			<name>Rock @ CHXL-FM</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<frequency>103.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386787853E1D7749B900FC8BC37FBABF2E367DEF584D4CB213DF45252F9E3D8E16E</stationID>
-+			<name>Nostalgia @ CKDK-FM</name>
-+			<shortname>36</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386F831810F48B27ED2DC2C77C3416D074C11EA8BFBC21B2433C8B03A916AA544ED</stationID>
-+			<name>Country @ CICZ-FM</name>
-+			<shortname>37</shortname>
-+			<icon></icon>
-+			<frequency>104.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853861CB5A9AEF68F8CAB403B2EB4ED350D89C35A007EF3C5046B1B334B55C430BB7D</stationID>
-+			<name>Country @ CJQM-FM</name>
-+			<shortname>38</shortname>
-+			<icon></icon>
-+			<frequency>104.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386CAA5542509AEBBCE1AB227BA3C8ED4AE99D4DEB801FF6A015F37190B0431E607</stationID>
-+			<name>AC @ CHUM-FM</name>
-+			<shortname>39</shortname>
-+			<icon></icon>
-+			<frequency>104.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386965E058688936CD2A8F1AF38046DE6DA764D5B7F21F64BB0E2F0E80CFAF6A946</stationID>
-+			<name>Country @ CKQM-FM</name>
-+			<shortname>40</shortname>
-+			<icon></icon>
-+			<frequency>105.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386A7CD1C9CF70CC34FF19A8EE55023FDE89ED1B6F4B2111C66D34EC3495BDABEFA</stationID>
-+			<name>Classic Rock @ CFCA-FM</name>
-+			<shortname>41</shortname>
-+			<icon></icon>
-+			<frequency>105.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538693A78B680171A292CA2F2BAE4415910E9495EF3A4F345AAADA1C0AA914000FCC</stationID>
-+			<name>NPR @ CHRY-FM</name>
-+			<shortname>42</shortname>
-+			<icon></icon>
-+			<frequency>105.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386F04D219347EF9006074AB70D3A4405A0F119E046A838F334B5FC99D3C5F9C376</stationID>
-+			<name>AC @ CHRE-FM</name>
-+			<shortname>43</shortname>
-+			<icon></icon>
-+			<frequency>105.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386EE619BE656B906FA217A860731E54AECC2F3058CF53FCF6F7C447C7618F1E553</stationID>
-+			<name>Nostalgia @ CIMJ-FM</name>
-+			<shortname>44</shortname>
-+			<icon></icon>
-+			<frequency>106.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386BE62C1CE01ED24B2F557DF4EE9EC54C4DC91909802DBAA0671CFFF6AB02CE793</stationID>
-+			<name>Rock @ CHKS-FM</name>
-+			<shortname>45</shortname>
-+			<icon></icon>
-+			<frequency>106.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538608B1EE52D64B3DF96C6B8FA637F4990A904E03ADC15038EB887EB7A2E32C1FF8</stationID>
-+			<name>AC @ CIXK-FM</name>
-+			<shortname>46</shortname>
-+			<icon></icon>
-+			<frequency>106.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853862F38341D678AFB178E35BC9E2EC81177E6ECF02F346AC8BE73F202C17B5506A8</stationID>
-+			<name>AC @ CHCD-FM</name>
-+			<shortname>47</shortname>
-+			<icon></icon>
-+			<frequency>106.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853863B768122EE5ABF32DF9AA18A8D489F5F232AC368ACB3FC301098A40DCACDB7F1</stationID>
-+			<name>Rock @ CKQB-FM</name>
-+			<shortname>48</shortname>
-+			<icon></icon>
-+			<frequency>106.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386ACDF712DD3826C57ECA305F40BCBFAAF5D8F34ADE81651E53F140E4A995E4D90</stationID>
-+			<name>Classic Rock @ CILQ-FM</name>
-+			<shortname>49</shortname>
-+			<icon></icon>
-+			<frequency>107.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385386F20F122F17C34424B4B3101B3FDEC0388E96395E48711F1ED50F3141B6ECFCC4</stationID>
-+			<name>CHR @ CING-FM</name>
-+			<shortname>50</shortname>
-+			<icon></icon>
-+			<frequency>107.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,622 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Ontario</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876E98DEFC969A09D6C13E4CD7C19F81DF1E95174BB71FA595BFA91E7BE4AFEF30</stationID>
-+			<name>Urban AC @ CKLN-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>88.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853878C9BF92E01972A10CE22FB12F7BAC5F40CBDE7A7F6855ADBC109FF4E662EE8A7</stationID>
-+			<name>Alternative @ CKDX-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>88.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387612ACBF8CCC9F553967792F51C7544AB3DB850030A05917786D7A4A07A42AF97</stationID>
-+			<name>CHR @ CIUT-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>89.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875CABE542CBF6AA88AEF61FCA1863EE48E8FCB8B2B0993E9277BC8FF154F51E4A</stationID>
-+			<name>Classical @ CJRT-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>91.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E8B15BCDD0565BC5F357AD4FC826051D3DC2CD93853F25A9CAE1A95C329C46AF</stationID>
-+			<name>CHR @ CKPC-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853874CB71B000668424DB4C117AD087DBD06DCCA25DD31AE334B14F9098269CFE919</stationID>
-+			<name>CHR @ CISS-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853873A28020387BE95260D4016A3858A071421107AE6F60AF9BCE6EEED8E9DD3166A</stationID>
-+			<name>Rock @ CJRQ-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>92.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387B6A7C22A5CC4619A2BCF91F1D813F4F60AFCB9D4BDDEED5A500103BF8D5E9815</stationID>
-+			<name>Community @ CKCU-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>93.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E79B7801EF38DD6A0FE7758A9DCFE13F96E5A1573CC12699F6DD63A0C57E7167</stationID>
-+			<name>AC @ CFRU-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>93.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875189655E80CC025AB1797DF35A9969AC6BF51D1B656AE48319719662E0655A14</stationID>
-+			<name>Urban @ CFXL-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>93.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387DB5EAEE982BDB34BBBDA7D40DC39B1DE7E927B7ED50AC8F08AC15B44D5C7B366</stationID>
-+			<name>CHR @ CKKL-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>93.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387B7D3B73330648DDC480DD5D4BB40045EBE59EF06C36D95E926059096DEE7130A</stationID>
-+			<name>Rock @ CJSD-FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853878E460B2401661EA007EC2CCA2BAD6EAFED60BEB86503C6FAAF0CDA52D09D0FCC</stationID>
-+			<name>Nostalgia @ CHRW-FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<frequency>94.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387763E811BE7BF239EB35E6580D3D9936E7CDEEA4B28B13B8B6F59BDAED1CC0D1E</stationID>
-+			<name>Hot AC @ CKGE-FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<frequency>94.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387A486E26543E4F633D83587B4162E2347FF26FE1AFB99C26DF5FAACC62C14A096</stationID>
-+			<name>AC @ CKSY-FM</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<frequency>95.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F7F7BC8A4760F68353D6B1B6039F80C7AF4FBA3B68565C9FB4C825B03374167C</stationID>
-+			<name>Classic Rock @ CJXY-FM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<frequency>95.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387B6E1CDC4D0369144EFD50DD7ECCB059291B9C5A5349973E76EAFB8660D28054F</stationID>
-+			<name>Rock @ CFJB-FM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<frequency>95.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877F705CD0E90EB7C924C230EA29DA271ECF194E6E8AF366AE10A6B8DC2F913BF5</stationID>
-+			<name>Rock @ CFPL-FM</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538723656F97FF16DE7B18CD714B91CD7EB15A511821CF22B155893157BFAFEDF679</stationID>
-+			<name>Country @ CHVR-FM</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<frequency>96.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387AF261A8D40335B9B4BFAA43FDA39D7A7F5A53E976E6AA80CE1E85C5A4C04EC8F</stationID>
-+			<name>AC @ CJEZ-FM</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<frequency>97.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876D561577E3DC788C19571674B29C5AD5AF5D520ECFF670E7C75BE09250012207</stationID>
-+			<name>AC @ CIQM-FM</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<frequency>97.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538774FFC8229642E61F322532AF4FC6DC63ECBB4AD33DDD4D658C22E4F9CC0F0A8D</stationID>
-+			<name>CHR @ CHFI-FM</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<frequency>98.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853872A10FB5967CD90064B72DE60A7A25A13FE2F8ABC3466C4E40784578BF82F4E49</stationID>
-+			<name>AC @ CFLY-FM</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<frequency>98.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853879EE628DA1882AC0D30A792250251A7A742AE1DDBBA5811A59B0246388426B65B</stationID>
-+			<name>Country @ CYSS-FM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<frequency>99.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387BE5A36CABF9B65A0B70E478CA2CF20F8F546636BD882184D0FDF54B74B7094C4</stationID>
-+			<name>AC @ CKMX-FM</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<frequency>99.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F32B6EF72C8B152DAF03FED92D12EB2FFC3D12CDE01AA4FB7CF118C736D6700A</stationID>
-+			<name>Ethnic @ CHIN-FM</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<frequency>100.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387C4397050BB9E7BBAA1E26DCEB254B67F43984158D5F2575C1441005633392C6A</stationID>
-+			<name>Alternative @ CFMO-FM</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<frequency>101.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538706412BAD92E6149D2AA9DD54571AFD4E1B42384A2BAED7979FFF6C45E0BB752D</stationID>
-+			<name>Rock @ CKWF-FM</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<frequency>101.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387DD4F3EBC5658F6F0A62CDD8F3C26F303F4E14AB1A19328DC4FB0D90682D998C1</stationID>
-+			<name>AC @ CFRC-FM</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<frequency>101.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853873BDA2F6A481DDDC9D578BE1587FEFF50428EBC9F88C650404F2B89ACEA75AE8B</stationID>
-+			<name>Alternative @ CFNY-FM</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<frequency>102.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538716473ED7B07ED3D3427F033B89DA601941B27D9750CF6AB19DAE2877839827EB</stationID>
-+			<name>Hot AC @ CHST-FM</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<frequency>102.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387EDCCD75C62578153A960662DC007092A1AEFC29D9263CB1A0802B257D1F4DCE0</stationID>
-+			<name>CHR @ CFHK-FM</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<frequency>103.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387FCC1575AC7B63E73F65A4FF62360D7EF02D4E7A9108CCEEF414501862763ACA0</stationID>
-+			<name>AC @ CKLP-FM</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<frequency>103.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387D9A3E774AF8667AA1BFC1BA5907836D84DE0C4C002604B8E9E5F8C3766526AF4</stationID>
-+			<name>CHR @ CIDC-FM</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<frequency>103.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387256BC2D33EE81620BB8BE2BC2D01FCE6DED69B151C37604A399C817D01D97C57</stationID>
-+			<name>Rock @ CHXL-FM</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<frequency>103.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877BA40CEA39347B184BFD4CCC74D19EA2E61950BBED79671F3ED4970E7290FB50</stationID>
-+			<name>Nostalgia @ CKDK-FM</name>
-+			<shortname>36</shortname>
-+			<icon></icon>
-+			<frequency>103.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877817B483F401A31D7828E8206898387283FCA1540CC07958302B35D487BFDAE6</stationID>
-+			<name>Country @ CICZ-FM</name>
-+			<shortname>37</shortname>
-+			<icon></icon>
-+			<frequency>104.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853870538B7B1497ED02C3E1919285BCFC3E00AE8219008687ABA87CF50519DD9EC99</stationID>
-+			<name>Country @ CJQM-FM</name>
-+			<shortname>38</shortname>
-+			<icon></icon>
-+			<frequency>104.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387B642EE3194250F31ECDDC410157AF67B1CEE6692429B92F4C8C5FD87EFAF34F6</stationID>
-+			<name>AC @ CHUM-FM</name>
-+			<shortname>39</shortname>
-+			<icon></icon>
-+			<frequency>104.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853878F35BF4F80A7C66A66CB3E5D240042CF41DFD7F476614CDC8058D585A091559A</stationID>
-+			<name>Country @ CKQM-FM</name>
-+			<shortname>40</shortname>
-+			<icon></icon>
-+			<frequency>105.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387A7CDF81610B0B74DFA711AD53B1401F5BCBF2808E4EC1F541290037D908E03C7</stationID>
-+			<name>Classic Rock @ CFCA-FM</name>
-+			<shortname>41</shortname>
-+			<icon></icon>
-+			<frequency>105.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538735B590EA8B14262A3D7E5C26F381BD2B3F672388C6A3CB8189E27540CC3197C9</stationID>
-+			<name>NPR @ CHRY-FM</name>
-+			<shortname>42</shortname>
-+			<icon></icon>
-+			<frequency>105.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876A79F38B234FEA9275F17E25A009CCCC3799FC24DA620AB235D9402C68241EA9</stationID>
-+			<name>AC @ CHRE-FM</name>
-+			<shortname>43</shortname>
-+			<icon></icon>
-+			<frequency>105.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387225BDA02BA932246643D745C36BC2939BEA4210C339B412E994B663E6235A7AB</stationID>
-+			<name>Nostalgia @ CIMJ-FM</name>
-+			<shortname>44</shortname>
-+			<icon></icon>
-+			<frequency>106.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F38D87244563679468C2B4BEBE2A54E7E4FB21AC53179493CD6CBBEA483D165F</stationID>
-+			<name>Rock @ CHKS-FM</name>
-+			<shortname>45</shortname>
-+			<icon></icon>
-+			<frequency>106.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876B6A06BA95EF9D75A3471C9D7B5CD6F3F7A9DC29F948B3109B928E7A763508B6</stationID>
-+			<name>AC @ CIXK-FM</name>
-+			<shortname>46</shortname>
-+			<icon></icon>
-+			<frequency>106.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853875D7E4E4EB1D04567335789330CDCBBDCB57C9450282F5F7D9AE8DBB02EB2AD15</stationID>
-+			<name>AC @ CHCD-FM</name>
-+			<shortname>47</shortname>
-+			<icon></icon>
-+			<frequency>106.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F8B40F9449181478EB112D7094B5084E3F568BDCBE08A688413E354F96766BCD</stationID>
-+			<name>Rock @ CKQB-FM</name>
-+			<shortname>48</shortname>
-+			<icon></icon>
-+			<frequency>106.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387C094B26D0BDE6C803C37923CC5FB32CD1EDF8DF52A3D6CB2122284A2A6C3016B</stationID>
-+			<name>Classic Rock @ CILQ-FM</name>
-+			<shortname>49</shortname>
-+			<icon></icon>
-+			<frequency>107.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538755F98172903403007BAC06168BDCD9F06B491E6C6BA44988736EC1A94A7575A4</stationID>
-+			<name>CHR @ CING-FM</name>
-+			<shortname>50</shortname>
-+			<icon></icon>
-+			<frequency>107.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538726EEE0485C0FBBD70981AE736AE24CC1474499C447208C5082513B20660644B8</stationID>
-+			<name>Oldies @ CFOS-AM</name>
-+			<shortname>51</shortname>
-+			<icon></icon>
-+			<frequency>0.56</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387C07E21EECF0A25E16F6A656EE640F2FAC4E53BA47D8AE32EC9E57F78D30E12F8</stationID>
-+			<name>CHR @ CKGL-AM</name>
-+			<shortname>52</shortname>
-+			<icon></icon>
-+			<frequency>0.57</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853878E6A34F02069592943599C06BAEFC372F3FB968695248C35544F8F65EECA9771</stationID>
-+			<name>News/Talk @ CKPR-AM</name>
-+			<shortname>53</shortname>
-+			<icon></icon>
-+			<frequency>0.58</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387D0E33C0BCF07B05815CB61EB9FC244BB4C73BCBF2B736C92284EE8D2F4D19B55</stationID>
-+			<name>Sports @ CJCL-AM</name>
-+			<shortname>54</shortname>
-+			<icon></icon>
-+			<frequency>0.59</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387EE790E6B43D12C980ECF8C55D5E947CBE9CD297B731275B2230DB86F56043C28</stationID>
-+			<name>Oldies @ CFCO-AM</name>
-+			<shortname>55</shortname>
-+			<icon></icon>
-+			<frequency>0.63</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877E9CA0E6E7161E815266E8E12837CD9D97AD81ED5EBB768D0EF51FCF5F394DCD</stationID>
-+			<name>News/Talk @ CHOG-AM</name>
-+			<shortname>56</shortname>
-+			<icon></icon>
-+			<frequency>0.64</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853879538D6491E52FAA18DB3BC50F9241867A79B00DA53907C76D9BFCF19D50145E5</stationID>
-+			<name>News @ CFTR-AM</name>
-+			<shortname>57</shortname>
-+			<icon></icon>
-+			<frequency>0.68</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E8D4CB03138624F10498976E0EEFE9B6E8A1414BC9CF9334848C3BEB7D7CEBB4</stationID>
-+			<name>Country @ CJBQ-AM</name>
-+			<shortname>58</shortname>
-+			<icon></icon>
-+			<frequency>0.8</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853873B47018A34F2913969C1379711467738CC1447C6D8A96A10BC816E3D08D2DF36</stationID>
-+			<name>Country @ CHAM-AM</name>
-+			<shortname>59</shortname>
-+			<icon></icon>
-+			<frequency>0.82</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387A17C05D5E7313B59164DB319C9CB5CBBE6D3648A73118ED9F1EC9B3EEFDC03E1</stationID>
-+			<name>Oldies @ CHML-AM</name>
-+			<shortname>60</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538764CE1690FF419201C02E1732BA9391BF94CFFBD00B8C9C1FBEA494D3171FA0F0</stationID>
-+			<name>AC @ CFPL-AM</name>
-+			<shortname>61</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387FAA32280A36E1881D28192C0585393D38DB29182FBFF509BE97BC71318317802</stationID>
-+			<name>News/Talk @ CFRB-AM</name>
-+			<shortname>62</shortname>
-+			<icon></icon>
-+			<frequency>1.01</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876E80525B1EE7E7496987C5644DF0920681FA7843AD4EDA1D8397D8337DFCD145</stationID>
-+			<name>Oldies @ CHUM-AM</name>
-+			<shortname>63</shortname>
-+			<icon></icon>
-+			<frequency>1.05</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E28F26BA719DEC29D74AD9414D1227E22215DB299264C5424D3DBE465BD5C3A1</stationID>
-+			<name>News/Talk @ CHOK-AM</name>
-+			<shortname>64</shortname>
-+			<icon></icon>
-+			<frequency>1.07</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853872D7635F61027AEB8847B27D16C08909EFEC3ABA42FF0F3F54C3FDE4F71B0F0D5</stationID>
-+			<name>Oldies @ CKKW-AM</name>
-+			<shortname>65</shortname>
-+			<icon></icon>
-+			<frequency>1.09</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876C9E8B06257C7A1924CFDC270AB4C4D2C10372854AA18B8DAC4A51BD5141D0BF</stationID>
-+			<name>Oldies @ CKOC-AM</name>
-+			<shortname>66</shortname>
-+			<icon></icon>
-+			<frequency>1.15</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E05F4659A976BDD0877DBE5DF0B38C58FAE13E0BF65A5506A0F63E4586FB0923</stationID>
-+			<name>CHR @ CJTT-AM</name>
-+			<shortname>67</shortname>
-+			<icon></icon>
-+			<frequency>1.23</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853877217F9D5FF93CE68A7A42842A02D56A35ABD3745D9379126BBA635F8CA6AEA11</stationID>
-+			<name>Oldies @ CJCS-AM</name>
-+			<shortname>68</shortname>
-+			<icon></icon>
-+			<frequency>1.24</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853876111C32C65B2382E4D8D19B92D3D315BC2F78BCF3E02A1D2811153DCA52AB765</stationID>
-+			<name>AC @ CJTN-AM</name>
-+			<shortname>69</shortname>
-+			<icon></icon>
-+			<frequency>1.27</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387F790B9D10F6151C81BB1E55667CFB7375A8065F19F3A0B7585763823F73BE172</stationID>
-+			<name>News/Talk @ CJBK-AM</name>
-+			<shortname>70</shortname>
-+			<icon></icon>
-+			<frequency>1.29</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387067AB80B3AAF92C801A95FF4F71399F279E8B452D4AA089F8D75C2D061A0B09D</stationID>
-+			<name>Classic Hits @ CKPC-AM</name>
-+			<shortname>71</shortname>
-+			<icon></icon>
-+			<frequency>1.38</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387193CFE62DC76D42AD202E169C6834AC313DDE061924E1411330D09CBDDB7270D</stationID>
-+			<name>Oldies @ CKSL-AM</name>
-+			<shortname>72</shortname>
-+			<icon></icon>
-+			<frequency>1.41</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387E63DEDF4DD5851C889E843FDDFB37136B4F9650F2F4DB3F54B18B8C827FCE779</stationID>
-+			<name>AC @ CKPT-AM</name>
-+			<shortname>73</shortname>
-+			<icon></icon>
-+			<frequency>1.42</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538776DA0BA89CCAAC57A9D6082AA848EA0CE7A2D20CEC2AE4DC02880F2ADD40671B</stationID>
-+			<name>Oldies @ CJOY-AM</name>
-+			<shortname>74</shortname>
-+			<icon></icon>
-+			<frequency>1.46</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853870C27702D5C4578D660CC1600408AFE1127C1DE8958808BD7B55B66BD0D8C7F4B</stationID>
-+			<name>Oldies @ CFPS-AM</name>
-+			<shortname>75</shortname>
-+			<icon></icon>
-+			<frequency>1.49</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385387DFD4D0AA3FED72182CA5555E2FC4A576570722C696FFABFD40BED9B946F28915</stationID>
-+			<name>Ethnic @ CHIN-AM</name>
-+			<shortname>76</shortname>
-+			<icon></icon>
-+			<frequency>1.54</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,30 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Quebec</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389651181978E67E42215B4D30FD0060862B14D472B7E30917A978E36DC88F0313B</stationID>
-+			<name>Talk @ CIQC-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>0.6</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389E338FDF6FABED3D9A576513AECF04FD40E5001DC5B003893B4671B73BDDA9150</stationID>
-+			<name>Talk @ CHRC-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>0.8</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,94 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Quebec</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385356CD9DD1A93794AB3675AB047B8E4E884FAA312F187A73AA6CB6919076C39CEB7B</stationID>
-+			<name>Alternative @ CFAK-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>88.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853563B41E95179A54ECB4A00D6E0A80861B7BD22AA334A618FB85F0555F265EE2EE1</stationID>
-+			<name>Ethnic @ CHCR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>89.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853568287524B70496005D97E3E9487853AB5A9DAF272E9A5F099D853C2D940097BD8</stationID>
-+			<name>AC @ CFQR-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853569402DBD98AB56C5A1D2A3705D4D023215C970130602DCCF105A42753CFDAFFE8</stationID>
-+			<name>Alternative @ CFLX-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>95.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853566FDEC9652755850D746766CFF88B7B4420EA0D990C5CD2A17A7C52E2E572C1DC</stationID>
-+			<name>Hot AC @ CJFM-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338535667B9AB049DC36A573F0B8AC3C73B78082A6CE5B36B640F94B9785CA51D5E536C</stationID>
-+			<name>CHR @ CHOM-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>97.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385356A8AF6535A854DF52826B4E93CC763A9FC1610BC78163BFB0C30969DCDA6A02EA</stationID>
-+			<name>Alternative @ CHOI-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>98.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853561CA6E44132CAFF8CDD7F6911708046B4EB1540F7156FE27DC8EE2F833EFAAECD</stationID>
-+			<name>Oldies @ CFOM-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>102.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385356C718716056A273CAC1E4EABF02B9692085AA575B90A02139B050E05B4AAB0535</stationID>
-+			<name>CHR @ CFJO-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>103.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385356B14958EA8D57D93486064ADB374F0E1E3E6F15DE22BFA26C3D01B26708F902C9</stationID>
-+			<name>Urban AC @ CITF-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>107.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,110 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Quebec</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338538917B618E7F0EEC470EB266AF65B527C0FC38A8E8BBBAC09E65D149B9ACC737FD4</stationID>
-+			<name>Alternative @ CFAK-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>88.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389DFF8E8EFF4060F58A180BC540D88960C7D3BAF568F774DA3DBB94AC70C1AFE1F</stationID>
-+			<name>Ethnic @ CHCR-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>89.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538963B8F0086E9B6B22C97B41C51136DC2D2DB620421A9368BF07C32F1FBED1F98F</stationID>
-+			<name>AC @ CFQR-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>92.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853895625E419BD1CDDBAE521E96DC15523CA7EA87DE945BC22354195F46E4E7FAB5C</stationID>
-+			<name>Alternative @ CFLX-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>95.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389D50371EF969ECC882716053C947FE4AA98147B1C354409E4FDCAA99C7765B9D0</stationID>
-+			<name>Hot AC @ CJFM-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>95.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389ABF38CC786A66D9E071AC6D4BA04CC8EE646205D74BC4CE9784A39BD07382AF3</stationID>
-+			<name>CHR @ CHOM-FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>97.7</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853893C7A2C1B5B37A7D3DFF22237A0876D496FBFD44757541ABBD3FDBF572AF1630C</stationID>
-+			<name>Alternative @ CHOI-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>98.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389468260BA2B79BAAA971EFECA5B2C8AAC389782E3B85C726356AF8AB4A431B8FC</stationID>
-+			<name>Oldies @ CFOM-FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>102.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538903A7AB9379C1918F3F321B18682958D071C70B0BE42F443DAD8E2B79550E32DE</stationID>
-+			<name>CHR @ CFJO-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>103.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389D76EFB944D1D56D794BAFC219FA7911878F0EDCAC12BDD561549C32F1F334EB8</stationID>
-+			<name>Urban AC @ CITF-FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>107.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338538925183644B8075C87D6A37CC43D6B9136D5FC77CE7F72D51CEDA492CDE6D56582</stationID>
-+			<name>Talk @ CIQC-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>0.6</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385389174B649D33F7845E1E4B9435DAEFFCF97ECABAABE3E4D191B018DEFA410D187E</stationID>
-+			<name>Talk @ CHRC-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>0.8</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,70 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Saskatchewan</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10633853922CBE03E5BF8155703EC10D3E0C3FAE6A256CB4FD8AB3CE2D3832C8F3E1951C2A</stationID>
-+			<name>Country @ CJWW-AM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>0.6</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392C81C9FB8F948767E9597ED261EA84C3C81BB082E9D5132C5CF46707342AD1930</stationID>
-+			<name>Oldies @ CKCK-AM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>0.62</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853928B14DAA96CD8E42A0B7BA74D75F99D64FFD6DF1E7B04DBA5D1C39C723B01164E</stationID>
-+			<name>Country @ CJVR-AM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>0.75</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853923BCD4914F1F6A90B213F161DC962B060AE5C9819AE5586728D7A879F69A5A8CB</stationID>
-+			<name>New Country @ CKBI-AM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539297B6A4F7667AE83208F641C1019592CCC7D78CEFB54B6B192061CD27F954DCFD</stationID>
-+			<name>Country @ CKRM-AM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539203382F7D0844AAC2ED0844A0D0A75B2783B6FA435382D0E81B1B41E06D605034</stationID>
-+			<name>Hot AC @ CFYM-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>1.21</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539243EDB5DB93FBF91FE7E44DF60204953F4C2C29742D7541272FA4919CC9DBBEE3</stationID>
-+			<name>Hot AC @ CJYM-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>1.33</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,54 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Saskatchewan</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106338539149CCF4BDBBBE1DD4D4D882464CECF011290172C50BB99EA9E69086A9B6EA4764</stationID>
-+			<name>CHR @ CHMX-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385391CEEAF5E63A4936D1346D7EB79F9E7A6D4729E3E96C3B91153E69312BFB219596</stationID>
-+			<name>Country @ CFQC-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>92.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853912B0A5E29B34ECDF206DADE105BF251C8F1941E50C2206F9987AE54446F9503CB</stationID>
-+			<name>CHR @ CFMC-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>95.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853918828B2B765310949888688E194181918A9F8AF854094462A385790FA81FA6E73</stationID>
-+			<name>CHR @ CFMM-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>99.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539163B0B17992A2632030645ED944EFD4395A96939F2340A9E77F5937735BFAD899</stationID>
-+			<name>Rock @ CFWF-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp
---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,110 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>G. Richard Raab, rraab@plusten.com</maintainer>
-+			<changed>Sat Jan 18 14:31:54 2003</changed>
-+			<country>USA</country>
-+			<city>Saskatchewan</city>
-+			<media>antenna</media>
-+			<comments>Generated from http://links.radio-online.com/stations.htm</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392F117413BFADF22E4E72F4745D7323B099F1F28A2CAD22EFC5D33B66661E24D2D</stationID>
-+			<name>CHR @ CHMX-FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<frequency>92.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539234488E7C829A5C45B21E9214262665CEEED21A70823942A69FD442B2B97368D3</stationID>
-+			<name>Country @ CFQC-FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<frequency>92.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392F46C1FA4EBE0AB793FE0C6672232B68810CD9149C8C68F32E553421A62FF6098</stationID>
-+			<name>CHR @ CFMC-FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<frequency>95.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853926160480419127C9EAA00305CF902A6E1781A04134A1D2A264E8E727AD473448A</stationID>
-+			<name>CHR @ CFMM-FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<frequency>99.1</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853922E23923749C3468C56ACA0DE9C402916DDBEBE083BAC6E34763BC5F2A1CB6725</stationID>
-+			<name>Rock @ CFWF-FM</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<frequency>104.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392ACA62862EA04E38850B9CCCF44BAD3AC95E05FD6938B4D23E561108F68EEB6AF</stationID>
-+			<name>Country @ CJWW-AM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<frequency>0.6</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853921246AA0CC5D6569CAAD7B9122EBC9BA3BF74F4A56486DEF9E37B77AB4C7A900C</stationID>
-+			<name>Oldies @ CKCK-AM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<frequency>0.62</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392BAA64D7CDCCD7C1CF46A513FFE2815B12F602FE0BA67F5C1A699B302A66E26C9</stationID>
-+			<name>Country @ CJVR-AM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<frequency>0.75</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392454E721BD87FB3F8D707CB0E681E8D981EDF4092A809A109AB55708657D82DF0</stationID>
-+			<name>New Country @ CKBI-AM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<frequency>0.9</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539242BD87899BB87FF733DB4E48EEB3CA70C5F65526232C1CC039A3395C4EDC90DA</stationID>
-+			<name>Country @ CKRM-AM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<frequency>0.98</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106338539225BCE8632827B870192D3E43907F7CE2A240C38B527EA85F0D9EEF6B32C9D4B9</stationID>
-+			<name>Hot AC @ CFYM-AM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<frequency>1.21</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385392A4B7EBA582A1129D21179B617FFF95C3CDA93BC906C357943486E5516E0EB716</stationID>
-+			<name>Hot AC @ CJYM-AM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<frequency>1.33</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp
---- kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,330 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>Camilo Guevara Isidro &lt;mylosoft@gmail.com&gt;</maintainer>
-+			<changed>2010-02-07T17:07:49</changed>
-+			<country>Colombia</country>
-+			<city>Bogotá</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1265586572E5657722177EBEA73DA4FF0518811C3484A717A9C12CC4C4BFB3B0340A8B</stationID>
-+			<name>88,9 - Radio Uno</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558534656E8020B1D8585EC1EE27CA7DB8365FCF5703EC1AE1EFBE7CFB12ABBA2CA</stationID>
-+			<name>89,9 - 40 Principales</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585398C027C4454EE87E3CF0BF2626DE27ECF258CBAD3A77F9F1651FA97A221841</stationID>
-+			<name>90,4 - EMISORA HJUD LAUD (Universidad Distrital)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558544558FC2009395BF1D9EF06D190DF6C4DC5B57BF0DC09F842010FEAAA002E3D</stationID>
-+			<name>90,9 - La Mega</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585512B2A5E1E6BCF0D7755E8809B02B4E2EFFAD5E7EB5CC1539019249A85D88E4</stationID>
-+			<name>91,3 - Vilmar Stereo (Faca)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655855391167AC86413F107081FE6AC284347816867044B554DF12CBAF74502AD604</stationID>
-+			<name>91,9 - Javeriana Estereo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585568699A8595F69B73223A07CA49137AE95C4DF49FB268AC8BEAA7FB6E1EA027</stationID>
-+			<name>92,4 - Radio Policía Nacional</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558560029169A35872F465CB876832E32CBBAC8FA092BCACDB8321092BB2BD99E34</stationID>
-+			<name>92,9 - La Z</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585620BB32D339B7D584101BDB753F8543163ACF118BA83B2130D1AA6639098061</stationID>
-+			<name>93,3 - Unilatina Stereo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655856443DAAFEE2E8E0208C6DFFE33E3FCAE978CD0DA7A86C2EAE9466AC299E13C3</stationID>
-+			<name>93,4 - Colombia Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585687761E6CB5384A4183D5B3CAEADF288BB781333F3C148B36E58C949C05378A</stationID>
-+			<name>93,9 - Amor Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585715EA2BE0C18E090093A7DD6EC6EF328ED54FF6AC5B26C7685D2F591156BC94</stationID>
-+			<name>94,4 - Despecho stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585747C397779EDAECA1EBBE137D71D7FDE6D7A1FD9368B4317A4788B183C5DB0C</stationID>
-+			<name>94,9 - La F.M.</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585765AE4E456336743FADC6F062B0A5EC912CE7449E771EE244C1AA69ADAF553D</stationID>
-+			<name>95,4 - Quinta Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558588417E1F181DA2BFEDF54050C1B5A634AC21D3F20B07AFAFBD83AB5B83A29EC</stationID>
-+			<name>95,9 - Radio Nacional de Colombia</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558592626C3EA5E78B816C4F441F8125FE77A2DD2F2E08684DA94FB8EC9C799C500</stationID>
-+			<name>96,3 - Alternativa Stéreo / RCN Radio Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558595451674B61A73EDD66BEE83371394479C90D318B2616CF3EBAE27DF8A020A5</stationID>
-+			<name>96,9 - Melodía FM Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265585990BF6F27CAB43016860538C68D61C6D28D09664C3DB7ABB76124585B13A85F</stationID>
-+			<name>97,4 - La Vallenata</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558605213FD122E47EFCE1529547FCFA5E5A62F78B752F91DA2AD6FF29292AB0D8B</stationID>
-+			<name>97,9 - RadioActiva</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586077C1C779B863DF0AEFD7A40C691FF5CB0B316400AF784A5A2B4280C098C078</stationID>
-+			<name>98,5 - UN Radio - Emisora Universidad Nacional</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586107CBDDE91DE818CF1DC7C165DBEE97FC6EA7D00310919651673631A9A21498</stationID>
-+			<name>99,1 - Radionica</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586123ECADAEB507405B7C51062AA1EF04E1DCDBE4852B39D1463C904FC044A969</stationID>
-+			<name>99,9 - W Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586139D948BCFA0F57A6F8459CCE29055C6E59B51D21799318B84A18BA5FF97426</stationID>
-+			<name>100,4 - Oxígeno</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655861609F8D34C018D14435BD84EAE180213E1DAC209A38B5CFEAEF16822B791A64</stationID>
-+			<name>100,9 - Caracol Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586188B331F176F32CFDF203ED323F3DF5DD9739B102B58F881754E128E80AB301</stationID>
-+			<name>101,3 - Mauro Stereo - Funza</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586210C72E262B4123BE023000CF7B19BAAC35096F216B6FDB89829E279DF14B3B</stationID>
-+			<name>101,9 - Candela Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586239A3A27E61661E60A972C3FAFE8AAE4EBEC0215906927FD023370BC7D03B51</stationID>
-+			<name>102,9 - Tropicana Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586271BD4564DEB5AFA57B5D623461D8F41378348E7E7787065469DE8EAA9FD30B</stationID>
-+			<name>103,9 - La X</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655862903E11B0402AC81471A11C5DE3D5D3A6B3878A58676B737A9F90371D0EA834</stationID>
-+			<name>104,4 - RCN Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586314D4AEB10D8887486F301C61C4D7CED780A7AF5F53B9AEB1C05D122B6BA293</stationID>
-+			<name>104,9 - Vibra Bogotá</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655863376F22B915AA76D4DC6A6343E990918ADEB5D27FAB7066CC7EBDF303997C68</stationID>
-+			<name>105,4 - Rumba Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1265586361EA6092AAB1DC59589F99C73013CD37B554E7F95D8E5F652F26AB7D206BEB</stationID>
-+			<name>105,9 - Olímpica Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12655863869246EB11A58366B4091C5A068AE0FA22C8759324D2527E1AB7EE1ED5D0B9</stationID>
-+			<name>106,9 - Universidad Jorge Tadeo Lozano</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558641326CC0554E127440B8CCF9533F9BA88BFB6CE48DDBF1932B0E5F006DB5400</stationID>
-+			<name>107,4 - Radio Rumbo Stéreo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126558644096CF476B3D0758B75660C491437181EE5702DC2CB4C54A7A46CCFCCF817D</stationID>
-+			<name>107,9 - Minuto de Dios</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,9 @@
-+SUBDIRS =
-+EXTRA_DIST = "bogota.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/"
-+	$(INSTALL_DATA) "$(srcdir)/bogota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,9 @@
-+SUBDIRS =
-+EXTRA_DIST = "split-cable.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/"
-+	$(INSTALL_DATA) "$(srcdir)/split-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,231 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0-rc1</creator>
-+			<maintainer>Ivica Božulić &lt;ibozulic@gmail.com&gt;</maintainer>
-+			<changed>2008-04-05T16:59:08</changed>
-+			<country>Croatia</country>
-+			<city>Split</city>
-+			<media>Cable</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>120740751328238D2159D5831AD30B26BA2A5A66CD1984B82075078737563C2FD2EA5E1557</stationID>
-+			<name>RADIO SPLIT</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.4006</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407508E3A4EBB3E570DD94433A956AB7448DB5968860538E1D6A359FD70C0938F32171</stationID>
-+			<name>OTVORENI</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.8505</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120740751775D937D8C6A07B0E5A3FF7A690E85481ED81940F462705AD3A45FACE5161BFB5</stationID>
-+			<name>DALMACIJA</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.0257</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407510D1E25B12ACC9660E602B300E6CF8E54E477F3C115442852B575AB2CDF5F27679</stationID>
-+			<name>KL EURODOM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.6256</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407504EB158B4F1CF4176B28BF214BD88BA8A96C7FB26B6B17EA660FEFEC8092D303DF</stationID>
-+			<name>RIVA</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.6504</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407500E9B6C096D64A894A068FABE75A019716C3B748D916EA2E354D69D7BAB862E5C4</stationID>
-+			<name>RADIO SALONA</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.7253</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>122097750466D2BAFC3BC580FF5394F5F374F90D3DBB4AAC5A5155453A54F2E57A163BBE5E</stationID>
-+			<name>DIN-DON</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1220977448C1DF1B92704B74A403BBFA80772DC0AAE78099963484B94A4FCAD98D69E3EC2F</stationID>
-+			<name>RADIO TROGIR</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407498389C4F99C767482BD69BF12E465DB9E0E5909D7655D16EB4A11E06DB9696C81C</stationID>
-+			<name>RADIO KAŠTELA</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407516A0B01C6CA2CB9A40C6EC11394D665983073B0D42444011652721645FEA061C30</stationID>
-+			<name>HR 1</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.6507</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12074075150544492C037A467AC5F2A3B7FBC286954BF27034A44EEC379C1FC5CB1FDE64EC</stationID>
-+			<name>HR 2</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.2007</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1220977646E1B29A182D5572F2B7CBCF7F2814D50923CB1CA312E83C75CE29E5E6D638678B</stationID>
-+			<name>HR 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407511DBF4FAC44CA53796F2D74A357697A1E212F00C53838EFFD7AA648B2E147EC50E</stationID>
-+			<name>NARODNI</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.0506</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12074075011E1E049ACABAB05DB23C164C4FD4102C4CD48A1C66CE8F9C12A6427A8B0EDBF2</stationID>
-+			<name>RADIO BRAČ</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.3504</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120740749651539469F93B7B572ACF9BA16639803013B692A1925A4CA5336FB9BCA7708A47</stationID>
-+			<name>MEGA MIX HVAR</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.5252</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120740750359F725F0F47690F7ED5EB1771CAE0D65DD4A7B6A1C8D51B26E69F0802E5A3A60</stationID>
-+			<name>NAUTIC</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.9254</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407507B8D6C9AE7C806221B94CB81132248F208BE1546980C50BAC1B99DD42A3056760</stationID>
-+			<name>KATOLIČKI RADIO</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.4255</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12074075240C0FA4E55B55464681E3185E457C820E0E3791E4AEA8E3C7A26A1698DBB83A65</stationID>
-+			<name>1 LIVE (ẆDR)</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.626</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120740752872ED80D1CA5FAB754D53BFE3FB2AC696485DF2D97C7D2A95C2F001196206CF9E</stationID>
-+			<name>SUNSHINE RADIO (Pro Sieben)</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.251</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12074075337B5A5DCC896803FEF4ED2896F3E9C95A7A4C1644C0CF9D421AB1C63855FE5BCE</stationID>
-+			<name>KLASIK RADIO (Vox)</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.126</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407535BDE94774C396714FA26A50F5CFCA6513E8CCAFF38F1C27A21D4050165345ED78</stationID>
-+			<name>RTL RADIO(Vox)</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.951</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12074075381C8E6295357ED296DADEF6A7D2E294F8C14A621F0326E02C50F5B8EBD46809CC</stationID>
-+			<name>ROCK ANTENNE (Kabel 1)</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207407539569A37859951819D18B33C11C57D6FFB95D75DA69461023B1157880CB90BDEAB</stationID>
-+			<name>ANTENNE BAYERN (Kabel 1)</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.651</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12209778051F47033DD3C846295AFC5E1DE6F5AEB5C075DBB37FFE4ECE772BBC8EC12E4F16</stationID>
-+			<name>JAM FM (RTL2)</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,143 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Petr Urban &lt;urbanp1@seznam.cz&gt;</maintainer>
-+			<changed>2008-04-08T17:03:40</changed>
-+			<country>Czech republic</country>
-+			<city>Ceske Budejovice</city>
-+			<media>Air</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1207666974509EE882BDBA2D87DC38D38A0BCEF0D51C991F4DBB617CD0208EDA11DAD9CAA9</stationID>
-+			<name>ČRo1 - Radiožurnál</name>
-+			<shortname>ČRo1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120766698430190D64A0BA139E954D1E43B89612D5502C1F86C80C1642E1DD430B845549A5</stationID>
-+			<name>ČRo2 - Praha</name>
-+			<shortname>ČRo2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207667006DBB1303ED14BC81ADF7DF384A388B2943FB58EC931A293F9112CBB4D761B0871</stationID>
-+			<name>ČRo3 - Vltava</name>
-+			<shortname>ČRo3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207667008A26C97E5F7612C0820EE87362AB88E2EA0DBC8B74339996B5D14DFA56E79E3C3</stationID>
-+			<name>ČRo5 - České Budějovice</name>
-+			<shortname>ČRo5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120766702720B7E904410567F2DFB9CBEBEBD8BE64101515C6C1F9D6187482402554A9D1D7</stationID>
-+			<name>Kiss Jižní Čechy</name>
-+			<shortname>Kiss</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207667739D293C26B631ACC80488CCCFE98D8A3CC0A7C56AFA7B7981B91AEB345E6E07054</stationID>
-+			<name>Rádio Blaník JČ</name>
-+			<shortname>Blaník</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207668015852339FEC6B77D79165DE45D45965DAA1E179ECC574D4A3CA3B2F10077FB99B8</stationID>
-+			<name>Frekvence 1</name>
-+			<shortname>F1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207668044C717459C7325BF313BF5FC6BE2ECA70D06BDDFEEB4E66AEA7AB5B8460F85DB99</stationID>
-+			<name>Radio Impuls</name>
-+			<shortname>Impuls</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12076680971544CB58DA52B02BDB7A3E8D1D02AFEF2F7B2E31DDBC891EE5FE6F5E814081DB</stationID>
-+			<name>Hitrádio Faktor</name>
-+			<shortname>Faktor</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12076681867F98C7B592723F35E8EF67EC33A823C164F88A740681041EDE7FBFEDA1DC6AD4</stationID>
-+			<name>Evropa 2</name>
-+			<shortname>Evropa 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>120766823348F4850F00D515F62DA7FBFF0A75C47701649A96D6F2EBC8F7FC6F2A0333FC4E</stationID>
-+			<name>Radio Proglas</name>
-+			<shortname>Proglas</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207668324BA0EAC424584D6FA18AEE86392411AEB1B1625B2B8019CBC58FF6A01BC9E9C35</stationID>
-+			<name>Radio Faktor Gold</name>
-+			<shortname>Gold</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12076670307AE2B3DF6C6D8F3223287781D174FA9B1C92B75F4239837EBCD5DA4C40C9FCDC</stationID>
-+			<name>Rádio Beat</name>
-+			<shortname>Beat</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1207668385CFDDA6ED02FA809768C7939C1A2CCBFD9C6D688BE6C2A654A58024802A9A4C26</stationID>
-+			<name>BBC/ČRo - Rádio Česko</name>
-+			<shortname>BBC</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12076705683C91C317574ADC848753E468585597BF46A7348C65F6F01083B97486AA04908B</stationID>
-+			<name>Radio Šumava</name>
-+			<shortname>Šumava</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12076727277A7919C9F95D6C9B86F7D8EAB2CC76B3D139085C6125F0CBA4561344CBE73AD1</stationID>
-+			<name>Life Radio Ober Oesterreich</name>
-+			<shortname>Life</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,16 +1,18 @@
- SUBDIRS =
--EXTRA_DIST = "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp"
-+EXTRA_DIST = "ceske-budejovice-antenna.krp" "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/"
-+	$(INSTALL_DATA) "$(srcdir)/ceske-budejovice-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp"
- 	$(INSTALL_DATA) "$(srcdir)/plzen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/plzen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp"
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am kradio-3.5.13.1/kradio3/presets/england/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/england/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,18 +1,20 @@
- SUBDIRS = buckinghamshire
--EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "newcastle-upon-tyne.krp" "sheffield.krp"
-+EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "milton-keynes-antenna.krp" "newcastle-upon-tyne.krp" "sheffield.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/england/"
-+	$(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/london.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp"
-+	$(INSTALL_DATA) "$(srcdir)/milton-keynes-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/newcastle-upon-tyne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp"
--	$(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/sheffield.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp"
--	$(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp"
--
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,72 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Ian Hay, &lt;ian@rotodyne.co.uk&gt;</maintainer>
-+			<changed>2003-01-25T22:35:18</changed>
-+			<country>England</country>
-+			<city>Milton Keynes, BUCKS</city>
-+			<media>Antenna</media>
-+			<comments>A poorly served and weak area for reception</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1063385353C6B88DA43D60485F93CE285F49666657543D54E610AB347EB1D73FDA2FC7C510</stationID>
-+			<name>BBC Radio 2</name>
-+			<shortname>BBC Radio 2</shortname>
-+			<icon></icon>
-+			<volumepreset>0.8</volumepreset>
-+			<frequency>88.6097</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853532D933FCEF3A7613BDDD56EBF088F9B6362B69E0FCABB21DFFC26D9AC81DC28BD</stationID>
-+			<name>BBC Radio 3</name>
-+			<shortname>BBC Radio 3</shortname>
-+			<icon></icon>
-+			<volumepreset>1</volumepreset>
-+			<frequency>90.8185</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385353C8BE87758A09C21FC727E3B7C8DE412595703F2E19438F5B7FBCD509531751D5</stationID>
-+			<name>BBC Radio 3</name>
-+			<shortname>BBC Radio 3</shortname>
-+			<icon></icon>
-+			<volumepreset>1</volumepreset>
-+			<frequency>90.8634</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853533F24308814CEC86F7F2D451AF6CE0ADAA1EBBDED5507D7E1ED04AF7BB93C5E2C</stationID>
-+			<name>BBC Radio 4</name>
-+			<shortname>BBC Radio 4</shortname>
-+			<icon></icon>
-+			<volumepreset>1</volumepreset>
-+			<frequency>93.0197</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385353606298F24CB48B4D31470EF41B4AF40F4BF19AF4CA0019E972419C5E5FDF2A7B</stationID>
-+			<name>Classic FM</name>
-+			<shortname>Classic FM</shortname>
-+			<icon></icon>
-+			<volumepreset>0.8</volumepreset>
-+			<frequency>100.446</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1063385353E2F2EB1467A831526FB14696A5FE35FAD1623929349D8A8C9DC7F9A3EFB87F93</stationID>
-+			<name>Horizon FM</name>
-+			<shortname>Horizon FM</shortname>
-+			<icon></icon>
-+			<volumepreset>0.8</volumepreset>
-+			<frequency>103.324</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10633853535F8DF276212D9521388835FE08AFEA463B8A2AE6BDFBD3B6AC34D330F9EE2613</stationID>
-+			<name>BBC 3 Counties Radio</name>
-+			<shortname>BBC 3 Counties Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>0.8</volumepreset>
-+			<frequency>104.518</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp kradio-3.5.13.1/kradio3/presets/france/abbeville.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/abbeville.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,127 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>abbeville</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092CBB4B2223036021E901E948C5C89F0B128B7A4FE4844AA89DB5E2B9A9608A5A3</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092648660A98566A70CACE41486F03F4399DB65FB3ABACD5C055203FB39AE440499</stationID>
-+            <name>Fun Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B3619B5DE060324713328B8FAA5A7693FE9DA955C0889589E7E77119581F401C</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922805BF9C1B19351F89DEA4E887493DF8F908A77B809BF5264FF30920CED7D361</stationID>
-+            <name>Radio Soleil</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092CCD737EC9A595C0FA42A693AE4B9BD9BDEE561D29B035D9A3E934FBB538861E0</stationID>
-+            <name>Contact</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>91.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092AF1640DAE80035EBA6DFDB4900619CA63A09B5BE7E696D9E588444209E814B74</stationID>
-+            <name>RTL</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923B52A20FAE2A9AD685AED4BCFDFA22D434AAD14CE9FE60EA08EE5144532BA8C8</stationID>
-+            <name>Skyrock</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092AE5A89FF1501F8389594E2F77D608534EBA38EF82983388C01851326D10A90F2</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700924E2152476AFE9B26576E130FE4A3537120E816F60944D84557FB4D04058A18DF</stationID>
-+            <name>France Bleu - Picardie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009240334916A605A6359ABA11A3201B2DBF572D26EA1A453835C7718FD16E810DF1</stationID>
-+            <name>Chérie FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700925022C005489EB6C1C182D5E3A7DE856419EFF889EC7E79F4C928A913871F465D</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092160F1146D4E5A9B6FFA578AF3EF1E9E4B9B6DEB84ED95244934E3AEADF7CACFA</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092E69028D981D566C9E356F1C57F4D731C82424DDD41F57280CF409001BBC12F1A</stationID>
-+            <name>Europe 2 - Fréquence Picardie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092A04C60A71A8CED83F526DAFC306DBF70B846B68D5D86BAC9223AAD392C852AF7</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.8</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp kradio-3.5.13.1/kradio3/presets/france/amiens.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/amiens.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,187 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Erjon Seferi, &lt;erseferi@wanadoo.fr&gt;</maintainer>
-+			<changed>2008-07-12T14:58:40</changed>
-+			<country>France</country>
-+			<city>Amiens</city>
-+			<media>?</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158657143024D1EC38E41C3981C2A3DED5B2457328B7E3D46BE37F8131554A8535B6E3B6</stationID>
-+			<name>France Musique</name>
-+			<shortname>Musique</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215865745F6AE866FAC40BCC63AED628D4F1970C5D65A7925430C2CC4AB71D97B7C900A6E</stationID>
-+			<name>Rire et Chansons</name>
-+			<shortname>Rire</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158657683AED59C29FA1CE49EB3BC433950CBFA0209C58F56D95E554EF3ECEE97DB80CFB</stationID>
-+			<name>Fun Radio</name>
-+			<shortname>Fun</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121586578595DEB7BF34B66CE3552438EAE9718FD81AF0CE86C74D203E1D8DF2361F680733</stationID>
-+			<name>France Inter</name>
-+			<shortname>France Inter</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215865804D363782D3576B0FBBCECFE63C84407FBC46B81B8A0C73B13B9F64C9EA83A2A1D</stationID>
-+			<name>Nostalgie</name>
-+			<shortname>Nostalgie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158658460F51E43754E99E634F4E0359806CBEE1A23027BDE386DAAB9250F2C907D1F3EF</stationID>
-+			<name>Contact</name>
-+			<shortname>Contact</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121586582586BD714C746F57B98DED30C59AC90EB9EDD276AC5786D5A95EA49D76F91E2BEE</stationID>
-+			<name>Europe 2</name>
-+			<shortname>Europe 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121586586532CE40330DA5033BDD651073E6B76B1C208FD9E394903E0885B3C9CD82F041D7</stationID>
-+			<name>Fugue</name>
-+			<shortname>Fugue</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215865961A716CB4A7953401BF3FC007B882977487203F6039F220DF078DD72876831E2E0</stationID>
-+			<name>France Culture</name>
-+			<shortname>France Culture</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215865987C3DCAF25A4F999955F0B225AED2A4B6D6CA4406D744DE1DEB9B382CFD2659B8E</stationID>
-+			<name>Skyrock</name>
-+			<shortname>Skyrock</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215866650FA0E943EBD524C07EEA5B189A237D52A2759A90ED57AA894437438E9F58BB0D6</stationID>
-+			<name>NRJ</name>
-+			<shortname>NRJ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158666739C0B0FBE2B6AD890ED1C3A71C6899295BE980AE361D0A334C96D489D43104C26</stationID>
-+			<name>France Bleu Picardie</name>
-+			<shortname>France Bleu Picardie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215866771F115C902CA9CFB8363685C34DD934FC4AAD3FDCABF254F2A62FE92F8720C91DA</stationID>
-+			<name>Cherie FM</name>
-+			<shortname>Cherie FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158667960E6580CE771ED7D39736049B44DF55D2D66B88010293973D68D84ACCED55DB48</stationID>
-+			<name>Radio Classique</name>
-+			<shortname>Radio Classique</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121586683984614CDE9D8A4B0F5FD6C2C23D2E881550DB9B20C0C0C2A97D92C29DAB51342A</stationID>
-+			<name>RTL 2</name>
-+			<shortname>RTL 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215866858C0950D166660B91CC2A693AAD69008C04E7BD7BA817901090031BF0EA672243D</stationID>
-+			<name>RTL</name>
-+			<shortname>RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12158668803D46BEEDD6D924EEABF943B4CC79573350C106691AF039E2035B55DF86476D1B</stationID>
-+			<name>Europe 1</name>
-+			<shortname>Europe 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215866898947135C6305A6B43ED1E14548DF7D15C1DF509C26D3A9842587D39E2ED300109</stationID>
-+			<name>France Info</name>
-+			<shortname>France Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1215865886EF1E5CA01719EEF06AF6F67D90FC7787ED543F376CF4BD66CF3C08990455B83F</stationID>
-+			<name>Radio Soleil</name>
-+			<shortname>Radio Soleile</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.1</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,111 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>bar le duc</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>128467009288848970E8B69F47F999D2B14FFD01D05E874529B3BAA15BE6B3BE4B7100D226</stationID>
-+            <name>Europe 2 - Pyramide FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092F31430AEFF6F705EB72DC9E0DAD72038B1DC637A1033572C0EFDDD78E086EA06</stationID>
-+            <name>RFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>98.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922503FFDDF37D311B2AB5B08CE2EB6F8A36D83AD15C69C99AE30A047A5596F35B</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B0E43A29C4478F7948793BF32BD9139B06AD9C05F46479187E1758FF6F8414B4</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092DF6970930CFED3954B7E0A0F8C0763B41149F05801B9DCAA8628F820F8ADA225</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700927823C30BED79D2D6DC0DF09D0F8922B83B76DA0E3F2B1B1F051240594DDE88AB</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092AE58ECECFDDA4D3B2ED21AD8D4BA98A75D7D5433B2DE5324F9C777897FA83419</stationID>
-+            <name>Skyrock</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700929D83CE99148380CB4CFDBD9F465ABC4C217D158DF80AB0EAC512AF0DACCF4B9D</stationID>
-+            <name>RTL</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092CB3DEAA6BBF2183C3A12D96C6951FF1D81056BE35A32568FAF1EEA4C4AE2B9A7</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092630FC18571A977D3BFDC29DE4F8F57EF8A7F3987FF9DCC957B9F7408B613E91B</stationID>
-+            <name>Fun Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092044892468F7073A7F9A858036B0B8645166B405C34963D602D3D0B416B4B788E</stationID>
-+            <name>Meuse FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092BEE4497AC8C30E3DE1154FA2EDDFF410EBDD0CC645BAE422D2A31C7EE1380B23</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.5</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp kradio-3.5.13.1/kradio3/presets/france/forbach.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/forbach.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,87 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>forbach</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092F6AED1720BC4C25CC80DF8508E978A4C880F08C85AB37E648BA42865BC9172A5</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092ED7DF6074EA2290C8D25113C4A6C6430D19F356D0FE9D36943D3D95853CA6A48</stationID>
-+            <name>FIP</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>98.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009246F3514DE657AF735CC78E204020871D0E51B79A67AC20E125976A57C2F8019B</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009227EE0EA3F0AC5FD8060857AC31F5DA1A87AA5E0D17B717ABAC47D09945E7FC20</stationID>
-+            <name>Europe 2 - Rockin'Chair</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009277F842697A2C414EA61BB59D140D42C729CAA955E82F9B61E4B8D962C0EF2D3C</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700927706F0C7EF1D2345D8EF050CB3BB6E2DD967BE4125561BCC7360C5C7A14A9B2B</stationID>
-+            <name>RTL2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009277DF30BEB0273483BDF86A77D935CAB6055D923829B5DABC4F8EA519325FF5C9</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700920A3536E83EE0521FD84D6BA42D1295870629514B2E789BAA18A6F7516D652CD5</stationID>
-+            <name>Jerico</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092427AAC75D4854737F1B0AC010DE15B74539F00FBF85AEE5B695E69330C622DA0</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.5</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am kradio-3.5.13.1/kradio3/presets/france/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/france/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,18 +1,35 @@
- SUBDIRS =
--EXTRA_DIST = "angers.krp" "lille-antenna.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp"
-+EXTRA_DIST = "abbeville.krp" "amiens.krp" "angers.krp" "bar-le-duc.krp" "forbach.krp" "lille-antenna.krp" "metz.krp" "nancy.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp" "strasbourg.krp" "thionville.krp" "verdun.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/france/"
--	$(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/abbeville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp"
-+	$(INSTALL_DATA) "$(srcdir)/amiens.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp"
- 	$(INSTALL_DATA) "$(srcdir)/angers.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp"
--	$(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bar-le-duc.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp"
-+	$(INSTALL_DATA) "$(srcdir)/forbach.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/metz.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp"
-+	$(INSTALL_DATA) "$(srcdir)/nancy.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp"
- 	$(INSTALL_DATA) "$(srcdir)/paris-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp"	
-+	$(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp"
-+	$(INSTALL_DATA) "$(srcdir)/strasbourg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp"
-+	$(INSTALL_DATA) "$(srcdir)/thionville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp"
-+	$(INSTALL_DATA) "$(srcdir)/verdun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp"	
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/metz.krp kradio-3.5.13.1/kradio3/presets/france/metz.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/metz.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/metz.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,135 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>metz</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092466690E5BD84B440D3BFB7C132EBBC6C027EBF679FC8A0C78472CF9799EE2CDA</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092132340B2BCAE77B6B4A18ECF3B7F896A259A4796D6BBF59B695E4DE09CFAED52</stationID>
-+            <name>Jerico</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700929B027D8D8DD1B4CA30CF8B1E31EA6CF765064D930499CF85134F3C5310EA5F95</stationID>
-+            <name>FIP</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>98.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092A55DB1F4E72BE260B77B1A2988A3F156231B8F99231287A5C2BD7D3372901F02</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700921EF8E854DEE3F789FB23B8A70F9D79B4C63D179CBBEC7E418E25DDE303C85D56</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092DF970F5DC03F51880A418A6EA0F1AAE8E7C7859763B3884B02C930A04C840A2A</stationID>
-+            <name>RTL2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923DE7FD365EF2845589D012B14E55A24CB5D48BED38BDBBF1DD16D5FD0116367F</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922AC40738DF237B073ED19EE9580C08766B1E327226751B156B0596C8D77F3FC1</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092F6E60CFF47589D64AEAD4D38A78D30F5BD1364441DD81ED7E131A153C7127DE9</stationID>
-+            <name>Chérie FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>103.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092568C98D1C04445A19B98E9AABD38C3DD7E1C77A2877FF89584E6CFB7F133BB03</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092D2CDD7D4A88A032E5C2278B9C43936080BD71DCB4444A4B1C263803C973BBC85</stationID>
-+            <name>Nostalgie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092131E3465106EAFE3D5E6DD2FC460A297972E8C8CCDD93449F95A65AA84C7541B</stationID>
-+            <name>RFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009221D81E4678C70A8397098A47334FB521DC6CD66B87D681DBCB08F3FFEE53E22C</stationID>
-+            <name>Europe 2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092EB4D99794BDA559BBCB972C3D4FD37968CB1B682D48CE952B5848654E557C304</stationID>
-+            <name>Radio Peltre Loisirs</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009236146D220BA2293EEE3E862EAFFD6EDAA5989D562C8D482D83FB62CF3505D9ED</stationID>
-+            <name>RTL</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.8</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp kradio-3.5.13.1/kradio3/presets/france/nancy.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/nancy.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,199 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>nancy</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>12846700928C28BDB4C167CC28ABE2F241150B6BFBCD84D19B6A112F1CD6CA74E85031FED6</stationID>
-+            <name>RTL</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092925044DE1D2F730CEA2C1A285B1431D3D6A1A62A01FFAE143F04650990DEDB6C</stationID>
-+            <name>Fun Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>103.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092874B5F769CD83F20B7E29F9C9855201FC0ACDA9BE56C452B71F38D668E236C31</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092589C2D6A0A64D385B1405DB122A475BE6D4E34D17ACFDDF31002311421A96982</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923CA73B2F862BA6838D7E2340C6411A0C705A5F7864F55781C3DF48B9D319C1DF</stationID>
-+            <name>Chérie FM - RDS</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092486003F914B38CEAD941AE7AE3465C16B2E55208FE8C65177E59A044EDBB6D85</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092519CBAAD8B3B3F4F761B09C25EA30591D3DF4825A6E9E009A7F0E3D97530D116</stationID>
-+            <name>Fajet</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009261139B2CAAD7FC4047642B8B9AC99362418DA14030B701C8FC44368B7C236D73</stationID>
-+            <name>Graffiti</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092C0899A5EA8982054D3FE6153DC62053B513B9B249CDB0557DCB6BE0EC58C737D</stationID>
-+            <name>France Bleu - Nancy-Lorraine</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700925FF6A09B43FCC5C952391AC09C782236A1991F521147DB6F6F998F908863A421</stationID>
-+            <name>BFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092D7958B2205E340B1F556994057D6048A8505FD97444C0F3572CC522718934901</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092A1BBD823EBA8304505C54F27BA10A34B286BB7717DB662CCA3997DEBD7B5C103</stationID>
-+            <name>Europe 2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092C59EDEAFDDF5BD12421941363887E3FC1F9C02F7C42CB51C289B0D78686DC789</stationID>
-+            <name>Caraïb Nancy</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092178423C7130AD6033A41F5B4E4A5358431D0C32D39C449F5F9643AC462B3AA42</stationID>
-+            <name>RFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009286C289A67EC2856C8E11C575436249337356E1D03AE5D7D69869C72C304D32A2</stationID>
-+            <name>Jerico</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009280EDAF82A0E4C8E0791A7771F0EBFAF85FBF47E1AF2D356DF5E0B96D09C0E41C</stationID>
-+            <name>RTL2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092057A818064C625FFDF8FFDCEE8F7D5157C9593B328C71E8CB46BE8D94F8D32EE</stationID>
-+            <name>Radio Classique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923D4B26C666F75F4638E96D4255851CA819B612F0202473CDA1AAB81820959CB5</stationID>
-+            <name>Radio Soleil</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700925253237B2FE53DB85D6E8D08261D3C72C556A4A87C11C99CFA324A4F9E013B54</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009291EACD5C3118FCB39650CF2F50282CB1C146292978DD88FC5D28F919CBC8BE23</stationID>
-+            <name>Nostalgie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700926B71E5FD4D48F337AFF56F29B63844FA3AAAB9BD6E12F3A30205817D406BA13B</stationID>
-+            <name>MFM - Lor'Music</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>91.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092C852D374AC6E276A0197ED5FD76639F419A4233DFE7D34E0927294F93473D56D</stationID>
-+            <name>Skyrock</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092BC391D3495405E5BFC39A74705C00EBB8380C4D8A46634943831BE05186A64AD</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>91.7</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,159 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>strasbourg</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923E4B393E5A415A8821F0950DB7ADC911B451101CB8A83412BDB214AC10A45BDB</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>103.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092F28C30CF2C2D2F21B5B8EEC4272B5482D4B9AD3891B867090DC1E331C9371C89</stationID>
-+            <name>RTL</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009295FB4D21C567A53288C5F50B80FFC6C8BF145F8CF3383E618B92336E1D80AA04</stationID>
-+            <name>Top Music</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009240B254A71CC061CEFCE36E499A4F8FA23A8870EC6E62A2C9E35AD659F542319E</stationID>
-+            <name>BFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700920E56FC721B1DD85B12528F3EFCE9324E65CB8D128293432024E0428D4F6177A2</stationID>
-+            <name>Nostalgie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009206068A852BBB11271575C4A56F5B695A4FB59D705589CB5D879F47FA4A5567A7</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092C350A16918E618B81BF46CEBB4612AB0CC2E07EB4E51AA2A2667D12FE43213D4</stationID>
-+            <name>France Bleu - Alsace</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922CEAE73C2850068D80764A919CB121BFF1522809542BEA48AA524CB01AF72E7B</stationID>
-+            <name>RFM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B329F2B0ECC0EC64A450996A322C488139AA62AB9F532F3559C36259F4667F35</stationID>
-+            <name>Arc-en-ciel - Campus</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700926567B2DE55046AE0D42756D179C7BFB06F6CD4F7469218EE2D0EAF766EDB7F9C</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700924E0A4633D0BA750F8D7AE08237AE8FB305705F3EA70FE80ED55AB2169AF7B689</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>87.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009238F063D7AF81EC70CD704A4AF075C8CC1D9A5BE138EB40820C837F9959C5E26D</stationID>
-+            <name>FIP</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092AEF9E1B9AFEFDA210D407EC70E08F732821737BA5FF2335FBDBEEF8F1163F927</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009297A9C9DB6F0E218ED83A72CAC3B14EBBCFB2698792B11E4678A3F78C0E1D141D</stationID>
-+            <name>R.B.S. 91.9</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>91.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009246A97CDEE4F12958FCDC501FA941CDD2A95750EFDA463A3048A4E1BBD432B19D</stationID>
-+            <name>Accent 4</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700925FF9BA22396CB3511FC436859ECBF2A6EDEB6A7D9FD33BB42B87769B55A415E0</stationID>
-+            <name>Europe 2 - Capital</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092A47372115FBCDFEC1344E4B52CABFDC219F5E8B64F58C601749B0169C18C6594</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700923FD02A9CC9511880575B654239FA8DB65BD22E4EAE13E47C9CCEF6826813824E</stationID>
-+            <name>Judaïca</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.9</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp kradio-3.5.13.1/kradio3/presets/france/thionville.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/thionville.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,95 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>thionville</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B6F6DC3DB805642C794D30675BD3F7BBB2B568458B4E640F0F8DC278951BBCC8</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700924930B52A844DAF1F8B3D70B171143D4848AA2EB1E22BAC78016919ACCF1E34F5</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B308F6A499A6CDE3B8A1DC841B12B211E2879945EA920FE31B21D90E755B39D0</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092A66DC5CB34CFD20DE722EC83BD5D73B65EF98AFD5C4DE633BC07AFC2AF3B4BB4</stationID>
-+            <name>RTL2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B715B5EAEAEC0E37343B21D3D2FA59614E630A255D9589196CBC97282EBB0027</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092AE16D76A22DB50E7D816F2CCA6A5FA30F830A55BAFD174FE70CFB8CCA290E7FB</stationID>
-+            <name>Skyrock</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009234F204DB71A42CF68454454369DCDA9104674FBE22456DB4BB1678D0B566E77C</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700928D34A3FE9629FEC8AAB358615C846D492D094222270127FA1647632DF7588C9F</stationID>
-+            <name>Europe 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700926944E469E73757903A6CBE0A72B9FB05CA95E18ED5C195176959D034DF93B889</stationID>
-+            <name>Fun Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009244FEB99A0C2D7D723F3A7DF3751067708051BBA745E4331BC03FEC8B5D6A64ED</stationID>
-+            <name>Jérico</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>103.4</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp kradio-3.5.13.1/kradio3/presets/france/verdun.krp
---- kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/france/verdun.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,87 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-unknown</creator>
-+            <maintainer>Ren Riassetto &lt;rene.riassetto@fcvnet.net&gt;</maintainer>
-+            <changed>2010-07-22T20:37:19</changed>
-+            <country>France</country>
-+            <city>verdun</city>
-+            <media>antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>128467009278010A2D5434A6F6F22E5A66CE7708D2CA6DBD3C316A474FE9854D82B9FD736F</stationID>
-+            <name>Nostalgie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922278AD8A45B5150E6E2D361484A17DBA8CAD7D3A22A60177D20BC4CE8F8C9863</stationID>
-+            <name>Meuse FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.0</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009262F715217EDC9DE27775EC7EC16290810351190A7E478E603A4B7B29DDC5466D</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092D93351740E07CF987C5221762D5D2207BAD1BF579913FF192622F84C211D1D83</stationID>
-+            <name>Fun Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009268CA66D4B2BA14EE0CED2D0C2C92D1F8EFAEBAF010136F72A52D21E43D165CAA</stationID>
-+            <name>Europe 2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>87.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>128467009252BF0EE1D79A69F3B35D35D917B006FB1AEA51528D5B864BFA1FF39B98B252FD</stationID>
-+            <name>France Info</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092BCCF1C1AF114AD7CC0A33CAED6391C0BB37556BDD28F5ABBE3E33384CA789323</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1284670092B5A21674EB0CB60DFAD1EE5289C13B2E5E4024EFFB9282A45D087EC9F3E539D4</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12846700922BD31A6A4F8FE9EE920303802128940DDAA4F90C5B1884666F646153DE0A98CA</stationID>
-+            <name>NRJ</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.0</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,225 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-10-29-3</creator>
-+			<maintainer>Michael Wlotkowski</maintainer>
-+			<changed>2006-11-04T08:00:33</changed>
-+			<country>Germany</country>
-+			<city>88279 Amtzell</city>
-+			<media>Kabel Amtzell</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625143B8F60924DFBD4124E7C3A6EFCD28D74818B50E090DDCD4FFCD570CD1F0789530</stationID>
-+			<name>Bayern 1</name>
-+			<shortname>BR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626252039C1FA9FA1F8752C1AA3B4848D497EF40289663E34FE856DCDF9C02D7B1642621</stationID>
-+			<name>Bayern 2</name>
-+			<shortname>BR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625276BC3D5BA7B8BE66A16376C5112C2366C99749CBED7DA2DE68E1CAF767D51939A9</stationID>
-+			<name>Bayern 3</name>
-+			<shortname>BR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116262527893232B6703651D7A7EC14292A1A45DFACC78B0B2F1CD334BA5CF908D316109DB</stationID>
-+			<name>Bayern 4</name>
-+			<shortname>BR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625278532D106A2CB47925F5CA62600A8925F6B53F988629962D4B960B0518370B6AA5</stationID>
-+			<name>Bayern 5 Akt.</name>
-+			<shortname>BR5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625278AC5E844387B48B03022F370F779B44D6F2C9BB14D6B49918D0244CCE918C791B</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>AT_BY</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626252791F9B2E4F29EB7725663A8C96FD2661AD0950A1FB8E579E43687C5101A2408DF3</stationID>
-+			<name>Radio 7</name>
-+			<shortname>RA7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625279001DB03F038C523AD3F613ACCA261072D65947D9580939351E46A7BD39EB2DFB</stationID>
-+			<name>S�dwestfunk Stuttgart</name>
-+			<shortname>S�d_Stut</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626256245813E9094294405282DD336F1ECFBD9C00B1BADFAB396C5D6E92379FC881E3FB</stationID>
-+			<name>S�dwestfunk 2</name>
-+			<shortname>SWR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625624B83C31DB6A49ED5BF1E5875A67F72F3E71DF8EA075ACAC5DE848F3AA9A270EC8</stationID>
-+			<name>S�dwestfunk 3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116262562504B184DB45DE35AEB046DD049C34735A6594D782304DB0B6C94EDA261F262166</stationID>
-+			<name>�sterreich 3</name>
-+			<shortname>�3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625625D2EA7E951DBB437CAE61C7B164AC10AE4E6873A812589AA9C2B1AB7E47767D8F</stationID>
-+			<name>�sterreich Vorarlberg</name>
-+			<shortname>�Vor</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625625A4662613704BFBCC8D54F84E970F74768580146F5223E2C0BE7594D4E44B53B6</stationID>
-+			<name>DRS 1</name>
-+			<shortname>DRS1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625879F0D63A6C3DCEC52C12E4B355759BB782F2399FFEAE5FD07DA923C5819BF953DB</stationID>
-+			<name>DRS 3</name>
-+			<shortname>DRS3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626258797A1228AD9BB871940E56976EE2279071ACF759F4C7AF61F227BE3C03A1F6AA3B</stationID>
-+			<name>S�dwestfunk 1</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625880695B4EA1E6A17A598FC40A29BDD8951E13C57266565A7010FCED0BB0B23C430D</stationID>
-+			<name>Radio Lindau</name>
-+			<shortname>RaLi</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626258808F8679ED6AAFE17B9A7BD6571386E3A7BDC71C16F571F19028B7A5F92E546C4D</stationID>
-+			<name>BDR-FM 4</name>
-+			<shortname>BDR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626258806B01BF5B8FE3F46A1D5DE3A11AC59525AF4804E7ED213C808095FFC27C0BC519</stationID>
-+			<name>RTL Oldies</name>
-+			<shortname>RTLO</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116262588182BBFD4700519E8ACFACA2FAE19E10B64F80814B8F767932C7298178FC003A83</stationID>
-+			<name>MDR-Sputnik</name>
-+			<shortname>MDRS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116262588190642A6E97E8F2335C9D2A217C89C49A4C53A012A6D060D31345E1ECA1D28B22</stationID>
-+			<name>WDR / 1-Life</name>
-+			<shortname>WDR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625881E85B022A640DBC7504130C464F72E9DB1D4766676E0AEA1B39D02E5D0675D406</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>KlRa</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1162625881BD9FFF78EE575F4DB03FDE70923DCA044D332AD6338DE4CFFD5F5C84DCC0C57B</stationID>
-+			<name>Seefunk FN</name>
-+			<shortname>SEFN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11626258827BB56022653275D2B3D2D71D01FE7460C903744F9BA18C9BBB8CB69D3548D5CB</stationID>
-+			<name>Schweiz 2</name>
-+			<shortname>SW2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>108</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,227 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Ralf Großerhode 
-+&lt;ralf.grosserhode@t-online.de&gt;</maintainer>
-+			<changed>2006-09-25T11:25:28</changed>
-+			<country>Germany</country>
-+			<city>Bayreuth</city>
-+			<media>cable</media>
-+			<comments>Angaben stützen sich auf
-+kabeldeutschland.de. Alle Angaben ohne Gewähr</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176370F91BDD0EEE856DEAD20664F469A498EE506C3656D1C93C2E54C2ACD9F0945EDC</stationID>
-+			<name>NDR 2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115917641582A8F885CA1B60018EF4FAD96CD127D49F8716D87774563060A742D4FE57FB05</stationID>
-+			<name>Radio Plassenburg</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176449A125C3340338A9019B847ABAB591E2BDA1AF0D472BE6E72A00397D75BD2298FF</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115917647341F42319F3A75DC00E9BE5123BBB9CD08E65C94CC7F3C44AACB292842D1B27A1</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176506B42E1656C242954B4CE5F86F64E27F65D80D0457C46E0EF5A780FB31CCE2B5F5</stationID>
-+			<name>ERF Evangeliums-Rundfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176552292C30B53790A995DC66F2503C83DA6B3308D8C98D168D6190F5C756A5639488</stationID>
-+			<name>RTL Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176584EECCEDD8A70AA99D90F48D3735FCDB8138614666FB801EEFA7EDBDFD1246CBCB</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591766482EAFE02B575BDDA5B1167B3999CF8F3B36AA9A1959DBF0B467FFB8523B14160F</stationID>
-+			<name>JAM-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176674300CF3DCE4ADDB188E4C7E67B7DC1948C06026FF3F2A92B05ED2957F7F2D38F2</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>dlf</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176717DA67BDB605A5176C4B583B9CBE4EB7893615243D77B7AA31664A8ADD580146C6</stationID>
-+			<name>Antenne Thüringen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591767428362F9949DF6118DB0CE2C4B7FF40F530700FCB20D480431F63765C17BA9D342</stationID>
-+			<name>Landeswelle Thüringen Suhl</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591767674E301B719648F56C922A9933FDD4E2DB6E4D2C0409CE62224C8A687CF05879AB</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591768140C2188DDC2ECD8A7BB27822638F84F84359A378ECF3B5AB4004B27A881CF021C</stationID>
-+			<name>mdr1 Radio Thüringen</name>
-+			<shortname>mdr1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176895232978E557EF2CF353C2F816B6B193FB01B3490C802A6C3D5709D148601A4525</stationID>
-+			<name>mdr Figaro</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159176932A0E4BF414E39CD3EB016EF9F1B4EC8A54151B435C47AB97968FFD702A168C50F</stationID>
-+			<name>DeutschlandRadio Kultur</name>
-+			<shortname>dradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177049F8673E03B331FB756142AAFC347BFA37B2770D94F1A8230DE9B4CBFAF650FB7E</stationID>
-+			<name>Bayern3</name>
-+			<shortname>BR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115917709191D3D432F33F531306770B400ACC263BF3CC8F8A42D5E419143A24DF79C17310</stationID>
-+			<name>B5 aktuell</name>
-+			<shortname>BR5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115917712194A3CA5B3209D4226A467F2556EEC51C3A4AFCEE6F031FA5F446AB5632F766D9</stationID>
-+			<name>BR2 Oberfranken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177150435518411DDFFDAE21AD099566B3C331266E1AA5F083962544043DD6C1158792</stationID>
-+			<name>BR1 Oberfranken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177190AED3B92961E90467002B8D036062364F82B2CBFE8256B1D5070B6B57D3F16622</stationID>
-+			<name>Bayern 4 Klassik</name>
-+			<shortname>BR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177233793063353EAC9E8F1F8C2D65BA5A87B40718AB9308B687AD55411E5B1B56E754</stationID>
-+			<name>Radio Galaxy</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177364D6FF08C3DA4F93B14F8DFDB5C57FACBC86F4B832ACA66CB636EABE05DD5BD670</stationID>
-+			<name>Radio Mainwelle</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159177393A85981F6062ADAF5C8B6364C5F6761469184E847AAA93EE4DF6E49052E6C8993</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.65</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,333 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>juergen kauer&lt;jkauer@arcor.de&gt;</maintainer>
-+			<changed>2007-03-20T22:46:38</changed>
-+			<country>Germany</country>
-+			<city>Berlin</city>
-+			<media>Cable</media>
-+			<comments>Kabelnetz von Kabel Deutschland in  Berlin-Lankwitz</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791566EE4FC1594E6E6DC394DB75EEA2E9938CA67BA6682313127E3DC8CFD562686A13</stationID>
-+			<name>BBC Worldservice</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>87.495</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915677F9936FA0BAB670FB58F07C35C232BF6C8F65DB1C7A491480937848532CBB384</stationID>
-+			<name>RTL RADIO</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>0.82</volumepreset>
-+			<frequency>88.055</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791567CC15FD02795828846ABF82393E35836D35535ACE3BE8DE23A3D666764EC92EEE</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>88.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915686667AAF2ABA643A8427136F1FF23B13680686E00AC029D20C746F82110E15883</stationID>
-+			<name>100,6 Motor FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157082D00D133FC0C7F0A736DF9DA658240AE74C45890AE0A3E2E074448807441213</stationID>
-+			<name>Fritz</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915708CED28FBC443431F076E8E377DDFECDC96801422442D7A89DBD4567F05E915A8</stationID>
-+			<name>Radio Energy</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>90.455</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915716F7ED9C758E6C5CC9F58FBFA5957EA22BFF20B19CCBE47E9741A6A6C0E5ADF57</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.805</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915727A649C66B9C75FF3ED4CB90B686BF3ADE3F27A658F1446CA1DB599E759B2719B</stationID>
-+			<name>JAM FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>96.68</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791573F82AE782CEEEBD775EB38501C64B71B14C8DFEC95D001474317959E6581A1F8E</stationID>
-+			<name>infoRADIO</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157430C736B8ED87C5571B6FDEB10504E28CCD9486F62DF082CFD590A699C3E0248E</stationID>
-+			<name>Offener Kanal Berlin</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157482B2FA653974785D4655257398C16A26A4B8EFFB21FADE3262D2159C55F235AE</stationID>
-+			<name>94,8 Metropol FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791575013759401591C315632A40F3F6734FC75048A4345ACBB02D99067C5CF553DBC3</stationID>
-+			<name>DEFJAY</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157688C1348A5C55ACED6747F7B0FDBD4863B36F11EFA5C80443FFE52355AE8C7EDC</stationID>
-+			<name>Star FM </name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>94.551</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791577C45B6C9771EA973DF94328D91A5FDFF87B11790B23AD6001B218FC777E6CE2F1</stationID>
-+			<name>radio BERLIN 88,8</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9255</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157865A27D18F805B7F2DF9873794B299DEF581B7AB615949944EB0A232683FCAD38</stationID>
-+			<name>KulturRadio</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279157937EE7B714C71289579A1C99C508664996231F58F92529F7FE46E2B38FBF06657</stationID>
-+			<name>BB Radio </name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.996</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791579332D9366F17BD87251985FC7C429E2952A69E06EFDD85D254BB4DDF8816A4408</stationID>
-+			<name>Radio Paradiso</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.546</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915801AC51F36D9DB58534B0CC40DF6055C0717ADE6B59776D1C04AF4C5E0E33D7718</stationID>
-+			<name>RADIOmultikulti</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.851</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791581F1329D24372E9ED5171891011B1D34792BB423B640A0DD0248E6D82A403FA220</stationID>
-+			<name>DeutschlandRadio Berlin</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.496</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279158182E86933E311515E8355B8D72F1AE2E65F5887BF78E9F5B84BE1155BCABDCC8D</stationID>
-+			<name>98,8 KISS 99 FM</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.901</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915836948510D2C8FE10382E670931472C2D1CFFF6D2F80A617CDA8483EB678FA4321</stationID>
-+			<name>Berliner Rundfunk</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.251</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915848BC80E6D186BC53D388A41307E314B3C977185BB7BB24B0D86F329BEB29D1003</stationID>
-+			<name>RADIO EINS</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9508</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279158571AE18245596E9390E46457F573BBC152F4A7DCD02C52641CE192E727E60CD69</stationID>
-+			<name>mdr SPUTNIK</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.301</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279158593519FA971426F180D2376830F7095EA51761ED137E43058D7B80A638CF58620</stationID>
-+			<name>94 3 r.s.2</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.746</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791587EA7AA8881EF9FFE900E6B0BED14F01B38BA22CBC16526397AEDD3FB7D38C2758</stationID>
-+			<name>Antenne Brandenburg</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.646</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915873FF901E6FC22915B56137882D60DEE023706BDB5FCF368209061582D2614758B</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.001</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791588378E9D932C33F1231837B9A2014E604CDE9DF44EAB8EB5FB2B55B5A6E9E3A1DB</stationID>
-+			<name>Jazz Radio</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.446</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791589A310930786205964A1A672504FEFCFE0C3FC34AE2A43CCEC4345556C6167B580</stationID>
-+			<name>Spreeradio</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.001</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11744269309D360EE4BFE2B2A775AEC8F16A1CBF4D46AF5BB75B1CB610639E346802A431B9</stationID>
-+			<name>JAM FM</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.746</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>107279159044714ABF2F837EFA328827AD05695552023C89D6B4DC728EB175EE1BAC4A4D8C</stationID>
-+			<name>104,6 RTL Berlin</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.076</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10727915928FF2DFF1847AC9ACEF507F3353229A2B67EFF320AB9712C200E002F37A28895F</stationID>
-+			<name>SWR3</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.951</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791593C28480C8972B00751352BBA74BC446B3A7338BF5E581C0C38BBA95C063B479BA</stationID>
-+			<name>sunshine live</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.846</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791593A55AE94E136B46AC1EF61FF2A8AA2DA703EA17189BA6C7B18BD9506CB4EB6DC5</stationID>
-+			<name>Radio France Internationale</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.201</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791594E4FCB64702D7F3190369EE339FF4229396A4791AA1A1446012FA58BE91F25A95</stationID>
-+			<name>WDR 2</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.946</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1072791596546338507FEBC23B2130D3E3BC0F909B6C7047EEDA64CF7EB6BD2938F03DA3A0</stationID>
-+			<name>SWR2 - Baden-Wuerttemberg</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.876</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,285 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.4</creator>
-+			<maintainer>Gereon Schueller email@gereon.de</maintainer>
-+			<changed>2012-07-30T23:43:39</changed>
-+			<country>Germany</country>
-+			<city>Bonn</city>
-+			<media>Unitymedia Cable Network</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>10919654322C2EF9495C225621B9F02F38D65CFC19F781211D908E273732E406391CD83D79</stationID>
-+			<name>EINS LIVE</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432DBB1C47689A796F5A1C31D13160E84E4B0B2B2BCF238ADFCD56D5291ECBE7D34</stationID>
-+			<name>WDR 2</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432E620D2DEA57DE8D3425869D9B61FAE8A909EBC1722C46E9FBF9B76D67ED16064</stationID>
-+			<name>WDR 3</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109196543276474D50DC0126736B1119DD90EC0AB7BE3055817859732721E8D84396EAD0F4</stationID>
-+			<name>WDR 4</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432C0D8D51BEC7FF0F3D80EE649446D9DBD6C644D5B40BBF847B78C06DEAE0528A5</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109196543202597F652196A8D0009727B698654FF01A73E446650AB4B0F7D78128268F10BF</stationID>
-+			<name>WDR Radio 5 Funkhaus Europa</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10919654327FC5DE92D726B62F116DC19AB42A5B9E50F4C2B6D9EE8CEB885CF5CD95743CD0</stationID>
-+			<name>HR 1</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432EB0D627AD9EA1893AB97AF05E283F9818B9C5BC03A96828A824CAB2794F2422C</stationID>
-+			<name>HR 2</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432AC1714188FE3DED94E17643578A3E62ACFD719E0B45742C3E2382DB18AEDEEB2</stationID>
-+			<name>HR 3</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109196543242548D5CC887023C30BAAD21DEC259799CD610808DB84512ED0F5E0110243B96</stationID>
-+			<name>SWR 1 Rheinland Pfalz</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10919654322B538342EF91D6B54D33F4DA945A72439271B8204D1BEEB61270FC81F43ACB36</stationID>
-+			<name>SWR 2 Rheinland-Pfalz</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432F2368F7A2CD6FA43903E86319637E767C98EE31AA5AE1432E44AF7F9E45BA023</stationID>
-+			<name>SWR 3</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432E125008DF90996BFD0997C7D3DE02B0A794DD3F6ADED22025500878964ED059D</stationID>
-+			<name>SWR 4 Rheinland</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109196543207D0720F7D31DA8771BA01EBAFF4F6B36550DB8DAA86DAA1A032F0EDCE5B0BAE</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109196543266466AC67416B83BD8FD516241243783C74023FD75DFAEAB17F8325BD1BCCDE5</stationID>
-+			<name>DeutschlandRadio Kultur</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432BEBF709E0B4332DDBCB8F94C34EE848CF5BEE1A4F28AC37966378C7017DA1BE2</stationID>
-+			<name>Radio Bonn/Rhein-Sieg</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432C2CF129CEA931E111DA60CFC9D36C588FD72ACA92ABD44763DED1F050E820FE5</stationID>
-+			<name>Radio Köln</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432CCE146C86E2248511CF3373E685BDA8F54A8D8CC97C5C9CD56039CB4F5943CC9</stationID>
-+			<name>sunshine live</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432520C12ECD249D970FE383731DCF2C796233E6A13D8EAFF413FE07A6C4FEDB6EB</stationID>
-+			<name>DomRadio</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432DAA66E312D952479B2ECB430EE509F8625E0F64C3866C454AE02F2E272DE8A60</stationID>
-+			<name>Jam-FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10919654324719F08B7D922C9956CBC1794CF886037C6FE8210D0D44107D04DA2F323329AB</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1343691592BA7AA01237F6E3E7E9F6FA677EDA32DC604054ED37608748B137AFD320E4</stationID>
-+			<name>Radio Paloma</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10919654329D3E62F7898B303285904EB4D7400A8051766199D279E9B4970DCE53AA35FFE4</stationID>
-+			<name>Radio RPR Eins Rheinland</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10919654320ADB8A8DA2451E866A10421A346F0CECD55A0B9F270AB263D9DABCD1D62946A0</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432A0454782B1B958D30B59CD7FC2C02811E9EB63432F55469EEE5121577C35A39B</stationID>
-+			<name>Belgischer Rundfunk (deutsch)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>134369151654628D560CDE8CB1DF82669C0CAA2EA2C46F94C0C7171605343B76E2A301</stationID>
-+			<name>bigFM - Hot Music Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1343691539C50D1F861456D49146F6FED5AA9704E68D632C68536BDEE9E306F9A27ED9</stationID>
-+			<name>ERF (Evangeliums-Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>134369175436874EEA444FE168D7CD968569EC60A1BD656ECA93B8493B82804E8A1056</stationID>
-+			<name>AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1091965432D540169A28BE38B5BC636CC5958B619A5EBF736B6534AC1DE7BD3021AC5FDEB1</stationID>
-+			<name>BFBS</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13436915630ECC4585C73D9671B8255ADF510E275F8F2C688684315D9AA259D8707517</stationID>
-+			<name>FM 3 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,261 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-10-29-3</creator>
-+			<maintainer>Tim Gollnik, &lt;Tim.Gollnik@t-online.de&gt;</maintainer>
-+			<changed>2004-06-09T11:18:14</changed>
-+			<country>Germany</country>
-+			<city>Bremerhaven</city>
-+			<media>cable</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E</stationID>
-+			<name>NDR 2</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11</stationID>
-+			<name>NDR 1 Niedersachsen</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3</stationID>
-+			<name>NDR 4 / Parlament</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684</stationID>
-+			<name>NDR 90,3</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A</stationID>
-+			<name>Radio Bremen 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141</stationID>
-+			<name>Nordwest Radio</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41</stationID>
-+			<name>Funkhaus Europa</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6</stationID>
-+			<name>Radio Bremen 4</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366</stationID>
-+			<name>Energy Bremen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202</stationID>
-+			<name>Radio HH</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C</stationID>
-+			<name>Radio ffn</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178</stationID>
-+			<name>OFFENER KANAL</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E</stationID>
-+			<name>AFN Power Network</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D</stationID>
-+			<name>Delta Radio</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02</stationID>
-+			<name>Radio RSH</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6</stationID>
-+			<name>HitRadio Antenne Niedersachsen</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734</stationID>
-+			<name>BFBS Radio 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F</stationID>
-+			<name>DeutschlandRadio Kultur</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2</stationID>
-+			<name>106!8 rock&apos;n pop</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189</stationID>
-+			<name>sunshine live</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C</stationID>
-+			<name>RTL Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4</stationID>
-+			<name>n-joy radio</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B</stationID>
-+			<name>JAM-FM</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp kradio-3.5.13.1/kradio3/presets/germany/coswig.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/coswig.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,294 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Hagen Edlich</maintainer>
-+			<changed>2007-04-11T01:39:29</changed>
-+			<country>Germany</country>
-+			<city>06869 Coswig (Anhalt)</city>
-+			<media>Kabelnetz</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247707A0C82B606E65CC7F2FBEA0866020438DF24632426678DC361F7C193C7B8845BE</stationID>
-+			<name>Sunshine Live</name>
-+			<shortname>Sunshine Live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>117624703266B62F9E009559DBD9A294B32B2F73EAF63A8B28AF83431F80E5593786641AC1</stationID>
-+			<name>NDR 1 Niedersachsen</name>
-+			<shortname>NDR 1 Niedersachsen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>117624708971E9A8A2BDD50B839C80F17E99FC2615603B9AF02F3B9705EB71FBEF5CD7DDFB</stationID>
-+			<name>NDR 2</name>
-+			<shortname>NDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247163E70DCE726F2CFBE3BEDFE8B05EE6C384D5318795E41C4466A9D7D48A19F3D8E9</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname>NDR Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245349AF57021CB5F93E2F5A44202078E3D594898EF9872CAB0F55A5829328C7EAD2E8</stationID>
-+			<name>Jump</name>
-+			<shortname>Jump</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247446EA0C211D139184145EA8064C5E02087F1E93344C014ECC142E373A46EE7E77AD</stationID>
-+			<name>Fritz</name>
-+			<shortname>Fritz</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762474728BDF3F755C240D8D8EB9781F3A928DD4F22EAB34B36E9CCE9F6C24F4FB22831D</stationID>
-+			<name>NRJ</name>
-+			<shortname>NRJ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245354F9792D14D7A4C02FED7644C6303C3E62B96E1E359B27F35F29846AA304932DE4</stationID>
-+			<name>MDR Sputnik</name>
-+			<shortname>MDR Sputnik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247621B215007AC7280D5AE46B6F93A29A9DFFE3294F7CA63684D265D00ED5D2D70365</stationID>
-+			<name>Radio Leipzig</name>
-+			<shortname>Radio Leipzig</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762477071EAC736A707A9AD5509666EAB5FF92E6CF5A6C7EA071BFEC4DA56D97BF4BDD7E</stationID>
-+			<name>Radio Brocken</name>
-+			<shortname>Radio Brocken</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247708D821B8DDC4E76242BCC0BB4BF906412069F6ED1FCAEAC1B8D03964B1CBE8678C</stationID>
-+			<name>Radio SAW</name>
-+			<shortname>Radio SAW</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176247708D5E33AC1D3235A3B271AC0E9B528BF08E3F7AA040E83CBD48DFEEE1DB9C8E3B8</stationID>
-+			<name>MDR Figaro</name>
-+			<shortname>MDR Figaro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762469094F443FA4C67B3C73A1E9E0BAA1E3B014646B4C654F4EE1C450FDA11CC6493A67</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>Antenne Bayern</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762453616DC96E98F9F2BB736BF0BED0642CDC2DE88F1991EA915DEF2D2962229D1B30FB</stationID>
-+			<name>Rockland SA-AN</name>
-+			<shortname>Rockland SA-AN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762453621223D1F049DF97DBE0F4A9A9E6B39671D21628044599F72342464C97D6F22081</stationID>
-+			<name>Eins live</name>
-+			<shortname>Eins live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.0004</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245363C836DBABFAB34DBBB91AC2D42AF7CE1454F2A0FF095FF31E9F70F40E2211AD56</stationID>
-+			<name>Nordwestradio</name>
-+			<shortname>Nordwestradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762453641AABE4D81D8EF0C27DB3C48B078D6C93E30FE3830E9053F195CD9D2108AA7481</stationID>
-+			<name>Radio 1</name>
-+			<shortname>Radio 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245365D229F90373EB6CA1F4E2ADF2097BA1AA1A8363E83A2D5EF4557F7573070B87BB</stationID>
-+			<name>MDR Info</name>
-+			<shortname>MDR Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245367AE96165F2EC516BBF2F71FB44077D98C704EFD0B7F99481BC98E91B6E8DE4400</stationID>
-+			<name>Stadtradio 88,88</name>
-+			<shortname>Stadtradio 88,88</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245368B945284318577B0B720618D63FAB35CE85F9F45D77BBF0A87F71C0BA8FC19D42</stationID>
-+			<name>DLF</name>
-+			<shortname>DLF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176246864242513E9CE92BAF25CBB8433B11384AC93E9F35FA2E7F978FCDB5F903ECC5CAD</stationID>
-+			<name>MDR 1 Radio SA-A</name>
-+			<shortname>MDR 1 Radio SA-A</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>117624682132A6A74354D08337EB493D374072B03763DC26FE4F5F1386FA8CC1AAFC644F7F</stationID>
-+			<name>MDR 1 Radio SA</name>
-+			<shortname>MDR 1 Radio SA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245373B9B0F90767273A2D459B78EC67A5E9236696975DC9B3B77297618818D1CDCAFA</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>Radio Melodie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762453744C9A303A5C5A7E3504F75EAB55DE2ED1D6615AFF845F83C7ACC1BB6AD3A36E04</stationID>
-+			<name>n-joy</name>
-+			<shortname>n-joy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>117624537733B9E8D7B049EB078A4CE72545B28E4EEA9B24ECA20C3B72B9AE5175D3E83E4F</stationID>
-+			<name>Deutschlandradio</name>
-+			<shortname>Deutschlandradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>117624537973BF9927DDB11CCCA2E1DC331145C184763291A36FB37FE6C83EA4A5B3F320FE</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762467554B0CD17FAECDE5837EE6588BB3C6369BCDE6991A787DF809A1CD7B3631CBF982</stationID>
-+			<name>Hitradio Antenne SA</name>
-+			<shortname>Hitradio Antenne SA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176246795DD47990D17CF58ABB65DFEFCFE0438780A7ABB4861B01A39D4B30B4659B06C34</stationID>
-+			<name>R.SA</name>
-+			<shortname>R.SA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245383C0A242E951364EE884AAB9286100E06033AFB09A165DFCAD9CE6AC787472FC34</stationID>
-+			<name>Das Ding</name>
-+			<shortname>Das Ding</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11762453843AAEDF886054B17B1394DF7B17678D7E1F85FC029CDD541FF69E7C7882B9A316</stationID>
-+			<name>Radio Kultur</name>
-+			<shortname>Radio Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1176245389E77366541FAE828839AA3E4F8503FB21940E7A40E81E566E64B118AFC18F681C</stationID>
-+			<name>FFH</name>
-+			<shortname>FFH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.15</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,304 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Werner Muehl &lt;info@ib-muehl.de&gt;</maintainer>
-+			<changed>2006-10-03T17:36:01</changed>
-+			<country>Germany</country>
-+			<city>Erlensee</city>
-+			<media>Cabel</media>
-+			<comments>Stations/Frequencies for Hanau, Bruchkoebel, Maintal, Erlensee, 
-+Rodenbach, Neuberg, Langenselbold</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>Antenne Bayern</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C</stationID>
-+			<name>AFN</name>
-+			<shortname>AFN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632</stationID>
-+			<name>Bayerischer Rundfunk 1 (Main / Franken)</name>
-+			<shortname>BR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B</stationID>
-+			<name>Bayerischer Rundfunk 2 (Main / Franken)</name>
-+			<shortname>BR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6</stationID>
-+			<name>Bayerischer Rundfunk 3</name>
-+			<shortname>BR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F</stationID>
-+			<name>Bayerischer Rundfunk 4 Klassik</name>
-+			<shortname>BR 4 KLassik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D</stationID>
-+			<name>Bayerischer Rundfunk 5</name>
-+			<shortname>BR 5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159888999C88F220598C7CA2D533194FF95E4EF0629E3EA1144151F13104F3D0A957F6975</stationID>
-+			<name>BIG-FM</name>
-+			<shortname>BIG-FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159889239AFCB7A4D3F499D83C998312C5314A3374819A63E5DD848F26D2A28724A188BF5</stationID>
-+			<name>Deutschlandfunk Köln</name>
-+			<shortname>DLF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname>DLR Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598894980E90DF6E12053843D94648E3AC2B00607502F7B3338DBE6C237AAC528179BBE1</stationID>
-+			<name>Harmony FM</name>
-+			<shortname>Harmony FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359</stationID>
-+			<name>Hessischer Rundfunk 1</name>
-+			<shortname>HR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45</stationID>
-+			<name>Hessischer Rundfunk 2</name>
-+			<shortname>HR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812</stationID>
-+			<name>Hessischer Rundfunk 3</name>
-+			<shortname>HR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C</stationID>
-+			<name>Hessischer Rundfunk 4 Rhein-Main</name>
-+			<shortname>HR 4 Rhein-Main</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11367224732DD9647905D1A0E3003D6727D6C6A468489AE8E1B8349C8BDE108A1BE864F4DF</stationID>
-+			<name>Hessischer Rundfunk - Info</name>
-+			<shortname>HR - Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598893448B33C4FDC7C5C5B9B501188282E8B21D0B19A89E026C9BC0E284F344F9DB8C3D</stationID>
-+			<name>Hessischer Rundfunk - Info MW</name>
-+			<shortname>HR-info MW</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1</stationID>
-+			<name>Hit-Radio FFH Rhein-Main</name>
-+			<shortname>FFH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1136724537075C78FBD2816E19C6B77CC4DAFDC888A9DC10DEBA65983A0B76537048067AE1</stationID>
-+			<name>JAM-FM</name>
-+			<shortname>JAM-FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>Klassik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11367244420E0433EBB9A7933AE1DFCAE9AC5968416B2B9C1718E31FED01DFD0676DC2505B</stationID>
-+			<name>MAIN FM</name>
-+			<shortname>MAIN FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447</stationID>
-+			<name>Planet Radio</name>
-+			<shortname>Planet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186</stationID>
-+			<name>Radio Fortuna</name>
-+			<shortname>Fortuna</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>Melodie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159889106EC20DC8D1EA0580D1BC060B8B6D873182E34D8269303B75B03A36EC11810BDC9</stationID>
-+			<name>Radio Primavera</name>
-+			<shortname>Primavera</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1136724286E5985147114BB716FE9E15FA357C38BBB0CB331B5396CEB9EBDBCE94915F4A18</stationID>
-+			<name>Radio RPR Eins</name>
-+			<shortname>RPR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6</stationID>
-+			<name>Sunshine Live</name>
-+			<shortname>Sunshine</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC</stationID>
-+			<name>SWR 1-Rheinland-Pfalz</name>
-+			<shortname>SWR 1-Rh.Pfalz</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5</stationID>
-+			<name>SWR 2-Rheinland-Pfalz</name>
-+			<shortname>SWR 2-Rh.Pfalz</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765</stationID>
-+			<name>SWR 3</name>
-+			<shortname>SWR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839</stationID>
-+			<name>SWR 4 - Pfalz</name>
-+			<shortname>SWR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115988887190FF89418BFC2D560EB0F3E672896E7B59B292E3B85FA8AB6AC579E5FF5ECB05</stationID>
-+			<name>Sky Radio</name>
-+			<shortname>Sky Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1136724325091824FE3A7B2E74B15CCE068D71760C4BA8271CE5F3511F5BA9F69098A9C9C8</stationID>
-+			<name>WDR 2 (Siegen)</name>
-+			<shortname>WDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68</stationID>
-+			<name>WDR 3</name>
-+			<shortname>WDR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11367226162FF388CE9717148283756F57FE37EEE28DD6148247865CBD8BC64CF3C8EF3A01</stationID>
-+			<name>YOU FM</name>
-+			<shortname>Y</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,295 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Skutek &lt;grf-chz@gmx.de&gt;</maintainer>
-+			<changed>2007-12-18T15:31:54</changed>
-+			<country>Germany</country>
-+			<city>Erwitte/Lippstadt/Soest/Paderborn/Warstein</city>
-+			<media>cable</media>
-+			<comments>Stand November 2007</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422</stationID>
-+			<name>hr1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1</stationID>
-+			<name>hr2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0</stationID>
-+			<name>hr3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608</stationID>
-+			<name>hr4-Rhein-Main-Journal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114</stationID>
-+			<name>1LIVE (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08</stationID>
-+			<name>WDR2 - Siegen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62</stationID>
-+			<name>NDR1 Radio NDS - Südwest</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61</stationID>
-+			<name>NDR2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3</stationID>
-+			<name>WDR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9</stationID>
-+			<name>BR1 - Main/Franken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D</stationID>
-+			<name>domradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897</stationID>
-+			<name>ERF (Evangeliums Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01</stationID>
-+			<name>Funkhaus Europa (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419</stationID>
-+			<name>SWR1 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C</stationID>
-+			<name>SWR2 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B</stationID>
-+			<name>SWR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB</stationID>
-+			<name>DEFJAY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54</stationID>
-+			<name>radio ffn - Osnabrück</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF</stationID>
-+			<name>JAM FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83</stationID>
-+			<name>RTL Radio - Die besten Hits aller Zeiten</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5</stationID>
-+			<name>WDR2 Bielefeld/HIT RADIO FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7</stationID>
-+			<name>2255LIVE Ihr Gewinnradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59</stationID>
-+			<name>Radio Hochstift/AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265</stationID>
-+			<name>Radio Siegen/Hellweg Radio/Radio Sauerland</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,355 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0-beta1-r664</creator>
-+			<maintainer>Andreas Karl</maintainer>
-+			<changed>2005-03-04T19:15:35</changed>
-+			<country>Germany</country>
-+			<city>Frankfurt / Hessen</city>
-+			<media>Cabel</media>
-+			<comments>Stations/Frequencies for Frankfurt Main</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359</stationID>
-+			<name>HR1</name>
-+			<shortname>HR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186</stationID>
-+			<name>HR-KLASSIK</name>
-+			<shortname>HR4 KL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45</stationID>
-+			<name>HR-Info</name>
-+			<shortname>HR-Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812</stationID>
-+			<name>HR3</name>
-+			<shortname>HR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C</stationID>
-+			<name>HR4-RheinMain</name>
-+			<shortname>HR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1</stationID>
-+			<name>YOU FM</name>
-+			<shortname>YOU FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254ADEF6022D469FC3619A861A9696292F20C8DCBA6AD9F0B18313132367BD9CEE8</stationID>
-+			<name>DeutschlandRadio-Berlin</name>
-+			<shortname>DLR-B</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC</stationID>
-+			<name>Hitradio FFH</name>
-+			<shortname>FFH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5</stationID>
-+			<name>BR1 (Mainz/Franken)</name>
-+			<shortname>BR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765</stationID>
-+			<name>SWR4-Pfalz</name>
-+			<shortname>SWR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452546D14E1356C2246B3F5D7185F12B04FCCA6FD2489D136AFD321BD33231C2C4DB4</stationID>
-+			<name>BR3</name>
-+			<shortname>BR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839</stationID>
-+			<name>BR4 Klassik</name>
-+			<shortname>BR4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525435295B421B71BB719FFC423427D88A13394AC09A41C7FADE4CFAF34CF20A967D</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>ANT-BAY</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632</stationID>
-+			<name>SWR1-Rheinaland Pfalz</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B</stationID>
-+			<name>SWR2-Rheinaland Pfalz</name>
-+			<shortname>SWR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6</stationID>
-+			<name>BR5</name>
-+			<shortname>BR5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F</stationID>
-+			<name>SWR3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D</stationID>
-+			<name>Radio RPR Eins</name>
-+			<shortname>RPR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101</stationID>
-+			<name>Sunshine LIVE</name>
-+			<shortname>SUNSHINE</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254E6194286DD3604C97905284DBD5755FEA2D0D8243E97D5BC889C76C1B6E91888</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>MELODIE</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525480DD9CEA8D762EF40365B81DC415F98E8D8D49BB5077BACB848F33AB8FFC1154</stationID>
-+			<name>RADIO BOB!(ex Sky Radio)</name>
-+			<shortname>SKY</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452547C658BFD8AB9FE93566A1D66601EE06F430A26079E188A0E4E304860235DE200</stationID>
-+			<name>HR2</name>
-+			<shortname>HR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C</stationID>
-+			<name>radio-x</name>
-+			<shortname>radio-x</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525431E0BF7A1159B68FE9747EC8803E96EDE40295B8DCDFC2ADE2D50090859A2AF3</stationID>
-+			<name>BIG-FM</name>
-+			<shortname>BIG-FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2</stationID>
-+			<name>WDR2-Siegen</name>
-+			<shortname>WDR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254C2A9AD17F3E452CBB5EDA1FC41F3E91A2CE003910634BC8F3FC0472D24C5BE3B</stationID>
-+			<name>WDR3</name>
-+			<shortname>WDR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254886BEA32C5981E47D8085FAC639673F691BBEA7D08BEA9437C8168874C4FF3DA</stationID>
-+			<name>Radio Fortuna</name>
-+			<shortname>FORTUNA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34</stationID>
-+			<name>RTL RADIO</name>
-+			<shortname>RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525490359933CE6E34491643A8F2D51D4B3CDF0644A3FC88A9122F9173A0422A77A4</stationID>
-+			<name>planet radio</name>
-+			<shortname>planet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447</stationID>
-+			<name>Deutschlandfunk (Koeln)</name>
-+			<shortname>DLF-K</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3</stationID>
-+			<name>AFN</name>
-+			<shortname>AFN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC</stationID>
-+			<name>MAIN FM</name>
-+			<shortname>MAIN FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6</stationID>
-+			<name>KLassik Radio</name>
-+			<shortname>KlassikR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68</stationID>
-+			<name>JAM-FM</name>
-+			<shortname>JAM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,367 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Christian Haase</maintainer>
-+			<changed>2008-01-23T15:04:13</changed>
-+			<country>Germany</country>
-+			<city>G�ttingen</city>
-+			<media>Cable</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109774346C3B3C59CC62EE9B80B8D8E08A315081FF6DEECADDE797036DD35DD720313AB</stationID>
-+			<name>NDR 1 Niedersachsen S�dost</name>
-+			<shortname>NDR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010980262AC02EA7CEE4A9787E1BAB56662E863F8406F1DBD1121C163281EBEC130DF71C</stationID>
-+			<name>NDR 2</name>
-+			<shortname>NDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109780028FA4C97936D91B7AA300175D6246EA08F4B5CD9E4CCB628641F6227FDA707EA</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname>NDR Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201097927EFEA249C8FC673EBD62E941ED93ED433BCF7E836D1CD7782CDD2CDB152189691</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>Deutschlandfunk</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010978510EA8D2B980E6C19488BA1E7535640C12518B88F734A91A50DB5ECAB1DCF3E4F5</stationID>
-+			<name>NDR Info</name>
-+			<shortname>NDR Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109837495323238ABA5A082BC5CE9E13FB9BAC2319CB9E8C2FDC5D51E5F7F57CFC3B794</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname>BFBS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098447C7921DFDCE0A87585C877A4E4F14469E6E631197D8F61C3D9DB7992C0F6CF94E</stationID>
-+			<name>N-Joy Radio</name>
-+			<shortname>N-Joy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010985118C339A3D9CF54A26F18143C58DDE078F0C4398FF419B22C8A1112EF54EC9AA72</stationID>
-+			<name>HR 1</name>
-+			<shortname>HR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098547D3AB57CEE698B1055882DADE29CB3BFCB82BBBF20CBF6F2F2B1976EFF9044708</stationID>
-+			<name>HR 2</name>
-+			<shortname>HR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010985715E0FCC725AC4DF418CB8BE1BBF2401F969B75AAC93F3E12AFF6FE818B7BC4DAB</stationID>
-+			<name>HR 3</name>
-+			<shortname>HR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010986083B91D444A320FF64D572F4D06E5EBF7CF9F5E58BD9CEC18429D6B4C179BEDE9F</stationID>
-+			<name>HR 4 Nordhessen-Journal</name>
-+			<shortname>HR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010986436FC6FB10889A59B3E26CF84319697556F79675891B01D19E087BE589A51BD835</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname>WDR 5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098676DC4A41C8EBF28E3EA290014DDB3AE0BDB33EB4F05ED3FFE781348C803686134B</stationID>
-+			<name>MDR 1 Radio Th�ringen Erfurt</name>
-+			<shortname>MDR 1 Th�ringen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098849EE6F5544A5FDEF6F4E671794F7B0D49294B52D96146A015A91EDC48286D85AB9</stationID>
-+			<name>WDR 2 Bielefeld</name>
-+			<shortname>WDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201097557C000942967970C43A83708468FF26103AC8B0581DEB400BA21BAA8A849874B32</stationID>
-+			<name>Stadtradio G�ttingen</name>
-+			<shortname>Stadt G�</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010989008BC7BC41095AC902061E5E57722FF5DC4E18AD136EBAC375EB9E5B74B67DB036</stationID>
-+			<name>WDR 4</name>
-+			<shortname>WDR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010989234A3586E929CF194D5AE5061E2B51FDE4CB0DDA02C21811EB73A8CDD679CE3F89</stationID>
-+			<name>BR 2 Main/Franken</name>
-+			<shortname>BR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098961DB6AA80EBEF605DB7726EDE700738740F99E762D3B9673046909F377F5BC81A9</stationID>
-+			<name>BR 1 Main/Franken</name>
-+			<shortname>BR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201098991D21FAC6C42CBCA1C30EDAB03AA24F35F6C0EDA5D9EBB6AB9D3575A055E1D1A59</stationID>
-+			<name>Bayern 3</name>
-+			<shortname>Bayern 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099021BADD498B6AEC071B3D17C5FA9DC6491CF07DEE1ABDD5E0D193DC04D0D0C6AB83</stationID>
-+			<name>Eins Live (WDR)</name>
-+			<shortname>Eins Live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099060F137794C0CABE65412572A3A1E133778DB9A56F21E0051DF5AE004DB7EFF1588</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname>Dtl Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099105DE85CE952993AC3FEE8B917C0FC45FF302BE4DE3514056800C802CED566AAD3D</stationID>
-+			<name>WDR 3</name>
-+			<shortname>WDR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109912693D8EAD66B191CC7A8E74A66CD8F16439634F4E02C27A55B3C05C096A27FEC9A</stationID>
-+			<name>Radio Hochstift</name>
-+			<shortname>Hochstift</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109915408E02695F27D249358DA6D4DF70ADE3FFF4F64426449434DA9C21C0B94012FE7</stationID>
-+			<name>Antenne Th�ringen</name>
-+			<shortname>Antenne Th�ringen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010991983A71807FC0FF0365E5400DC2A509123262CEC6B18FCD5AE7D29293D198BCCFCC</stationID>
-+			<name>89,0 RTL</name>
-+			<shortname>89,0 RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109923991F554555E1295EB09A9DE9D0B6208EC7E506B35BA3E55B57BEEC55DC439FEAF</stationID>
-+			<name>MDR 1 Radio Sachsen-Anhalt Magdeburg</name>
-+			<shortname>MDR 1 Sachsen-Anhalt</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109931215CD26378E5951B3C42F185A66A67D3D1CF2232BB7A9671BADB30E47F94CE77D</stationID>
-+			<name>Jump</name>
-+			<shortname>Jump</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109934107BECD3DDA9C499E7BF7CF85D856A2FE0303C63771B39618B8D865D1353BEBD6</stationID>
-+			<name>Radio SAW</name>
-+			<shortname>Radio SAW</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099371D3D2A916EC4AE1ACDBAE8DB326FC93A0FBAB9D7CA67F0768F02633150F58C77D</stationID>
-+			<name>MDR Figaro</name>
-+			<shortname>MDR Figaro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099410375D010A6DC949089AC8548A8767B283E400580491A40EB9FC1F2844FDE748FA</stationID>
-+			<name>Radio 21</name>
-+			<shortname>Radio 21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010994505AA8B9A303C5365BD0377108CAC995D185AA06FE9DC280AB1F3764FD6062079A</stationID>
-+			<name>Radio FFN G�ttingen</name>
-+			<shortname>FFN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010995145E068162D8B94A1DC01E3D59898ECCDFE5E2242602AD59D560BD33ED2A37919E</stationID>
-+			<name>Hit-Radio Antenne Niedersachsen G�ttingen</name>
-+			<shortname>Antenne Niedersachsen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099558D1923339D9D36028AB475C46AB4C84D6CCE86295FAECA640FA99B2D84D6D8BB3</stationID>
-+			<name>sunshine live</name>
-+			<shortname>sunshine live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010995821652BB98253CA9A3F953BDD44D4BE6DA7BF855DBC6290EED9C915D488E716F41</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>Radio Melodie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12010996100276949EC86ACCDEB088DB01877A9A0E2B53AF2EC6BB8B042BDA14C6597EDC6C</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>Klassik Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120109963563936CEE1E7D6B93A945FD9607A1EAC60D2FE23A4D222A8571F306FDDB447BCC</stationID>
-+			<name>Hit Radio FFH Nordhessen</name>
-+			<shortname>FFH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099700A4AF799AEC5140A08E9CCC709595B2A508AAEF09DC1DAF710F0AC06432D93229</stationID>
-+			<name>RTL Radio - Die besten Hits mit Gef�hl</name>
-+			<shortname>RTL Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099740E0E7E0DB340AF8DDE58C6981D09FE7C5B8E6A6278CC15AD387BC40BE7677B96B</stationID>
-+			<name>DEFJAY</name>
-+			<shortname>DEFJAY</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1201099768FDAA47CB55582A630F00D1A94BBA7593014DE7B012357FB155BDD4AF8555FF68</stationID>
-+			<name>Jam FM</name>
-+			<shortname>Jam FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>108</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp kradio-3.5.13.1/kradio3/presets/germany/hilden.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/hilden.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,353 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Uwe Kuhlmann, Uwe_Kuhlmann@web.de</maintainer>
-+			<changed>2005-05-03T18:20:35</changed>
-+			<country>Germany</country>
-+			<city>Hilden</city>
-+			<media>cable</media>
-+			<comments>Gilt fr Hilden / Langenfeld / Leichlingen / Monheim / Leverkusen 
-+(any comment and thanx welcome!)
-+ Enth�lt zusammengef�gte Eintr�ge</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013660F9F721EC3DC80603B46C9B67D41EC8F353D462884758182C22E2077C5A6E497</stationID>
-+			<name>SWR1-Rheinland-Pfalz</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013665F0A1111D6314DAAF3D15B0190CCD182F24D0C60991DEEB9B94F59C1677AD451</stationID>
-+			<name>SWR4-Rheinland</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013665186333B9483BC89B57913499A9E70F6393DCCF34CC89877F80044FCE256AA7D</stationID>
-+			<name>SWR3</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366138A802AD5A22ACBFB1DB303E0D67097FFB8B72914AFE4EADBB906627695F64C</stationID>
-+			<name>WDR2-Wuppertal</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366E5A9DE63878AF799B9CAF38BCF370DAA0E5A7B43A8FE9C640FA8668F704EE60C</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013667E9887B5EEBE22B9DAFF23CFBA9E070109351EFC26A26286F63BDD19EE66E698</stationID>
-+			<name>JAM-FM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366CF2D50F282F0C22E452E6D7F3130773C446F5906C9305C2A45B53A8480F78890</stationID>
-+			<name>WDR2-Rhein-Ruhr</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013662BDEA51AF1ABE96284621DF2E6EF55BB9C075ED63E16914AA95A561F4AB17C5A</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.1753</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>111350136699854D3B8C0FB6729070CB2AF25C72E672BE565F8B5742CCD6473CDCCB1CC863</stationID>
-+			<name>Radio Neandertal</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366A7ADDEB8C9A8341BD6ED9BC754AE0E39DF172E9E4B20C7DE27A818F77196DDEA</stationID>
-+			<name>DeutschlandRadio Berlin</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4004</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>111350136671FD32971DB55D9712623AE318937011D1F42C6F61C9D5E3918403B643C311DB</stationID>
-+			<name>Eins Live (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>111350136682160AC418966730CDA6BFA3264F27BFAA63D8D6481FA8EE12A0181C9C8B7CD7</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366D1D121522B0A5B8AE9527134DBFBE187C97A4DE7183C57F4D200C135F2C07957</stationID>
-+			<name>RTL RADIO - DIE GR�SSTEN OLDIES</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366F8D933B2F83F720B5124C85435F071C19522579E89C89F7647F3ED2490EB223E</stationID>
-+			<name>WDR Radio 5 Funkhaus Europa</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366DB8E4FA3F8534872CFF67494232ECA2E0B1AE6E6B4E1E349DC5761EA766453F5</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366073A8DC7CF7DDE6CFC1A5B4F62B6CD4EB6E2EB932C338787F847B8C5BCC9DC92</stationID>
-+			<name>Radio Berg</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366C53472253704CB7F6B1FDE7D1EDF76DCB586336AD12FC2878F51F418B6516651</stationID>
-+			<name>Radio 3 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.951</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366B41219F825DE19A759CF74E874FECBC14DB39ACECAEF16448257C009AAC7E55F</stationID>
-+			<name>sunshine live</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.051</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366CFE017DFCC8A99D4656566A73CAFCFE2C40FB8B50D2A30A748AB4A6B327F5AE9</stationID>
-+			<name>Radio Melodie - Heimatfunk mit Herz M�nchen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.551</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366165B0CA74BF612CDEFF38DC3262780DCFFBD76523396DA987B648B5554AC6794</stationID>
-+			<name>SWR2-Rheinland-Pfalz</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366FEB7AB3FBC338FB78E0BBBF284D377EEF809EE6A6835E323805BFC665B251CC9</stationID>
-+			<name>Radio RPR Eins-Rheinland</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.951</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366C7761F0E03F265D63062F2FAA29B6547D786974D33512630893942E754E4856A</stationID>
-+			<name>Radio RSG</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11135013666976F9AF303FC869DE76FC858BC99A1EA59CE7A085D422455D726D8F95E95109</stationID>
-+			<name>RPR Zwei</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11151372270EC2A4BF0F3036909FAE1CAEB62513B25CD6CC458264FA0EBC0AEC2459AB9DF1</stationID>
-+			<name>Radio 2 (niederl.)</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.226</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1113501366A1FB1AB86226CDD00EFCB3EB6682621E1FD1F9F33EDCC22F0F4B532F7E70892F</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.501</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137175FDF5091456A1D516BAA383BCCB627DEEA81DD03FF84E9C717612D08113588191</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.7752</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137180DFA1745F8A7300B22E767E411E1C589B2A4D6FD4EBF7999758BCA9B2636F21C8</stationID>
-+			<name>WDR 3</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.3753</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137190DD24C928DD3EBFD3A52AC708916FF2D33FD9177C60BDD96C00FC13F655B0F5F0</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.5255</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137191E6E3192689593527258FBE309B99ABC975756DA62A654060E611722D93D5395E</stationID>
-+			<name>Antenne D�sseldorf</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.0255</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137197FCFA500F48697544E1D615FE25960E193ED884DFCBD792D151D7B04AAB7FE414</stationID>
-+			<name>WDR Radio 5 Funkhaus Europa</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.8256</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11151372038613F752A26302D72D4D81EC08D55D5EDA3399ADB0C44EDA4CC4F2771ACBD5B1</stationID>
-+			<name>Radio Berg</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8757</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137205517685CB9E5B1C8C3EC2A3CA5BEACEEDF709791AF99BE3ECCAD34E89FDF56BD7</stationID>
-+			<name>hr3</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.5508</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137207FD6AA54223126EE02DA3C2A6D9BCC41D14AF2F509ABE8DC0368769410D153A79</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.026</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11151372129C623D6777686C2A80630E4E4D5A4418334033A86B30A1053C2FEA522F91D9B5</stationID>
-+			<name>ERF (Evangeliums-Rundfunk)</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.651</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1115137221EB4CC9C6A22DC1204E6087A523333CA4E6B34ECC70DB3D955C03680DDFD70B21</stationID>
-+			<name>Radio RSG</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.326</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11151372245CEB4DCA54C0376C7944BCB601E8C5489F66A2ABB6C147AC597D6AAD837F0CCC</stationID>
-+			<name>bigFM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.476</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>111513723052CCEE3605297250E16967BE66424CD40A53BF4B8C025EA93479D4A446CFE13C</stationID>
-+			<name>Domradio</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.126</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,255 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Daniel Str&auml;nger (dev at schmaller dot de)</maintainer>
-+			<changed>2006-12-18T12:35:21</changed>
-+			<country>Germany</country>
-+			<city>Konstanz</city>
-+			<media>Cable Analog</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>116644167238F1321A4B015F1A70F1842BBD28B7DBA8363006066739ECFA4F89940729E454</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441674E3AAF2D536A35F27D5E131E302E18E17917B9494E129F68D1C024DABAE330D0B</stationID>
-+			<name>Radio Seefunk</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>116644167511341F9D7375A102777A285699E9B19B32086C3D07F2C680124431E6BA88D8A1</stationID>
-+			<name>RSI 1</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441677044454339E85CB23E0FEA80C97395F0B5F082834621AFF71FA0F6ADCD0F2D3F6</stationID>
-+			<name>DASDING</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>116644153867318DD8FA616CB002B7FEFF3F116DF68E827BCC769BB7A021010251DDE8ABA9</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664416801E589D311ADF455D4FCB833AEDC04FCC43FB47826334173FBEB9A321E5C0D517</stationID>
-+			<name>SWR1</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441681D1C8EE34DA5B5FE2DEC676D3637C77289C1481479BB739B98EB1A72A6C8F095F</stationID>
-+			<name>SWR2</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664416828E205C849B191DF5451F0860CE93EA01C8E99D9FB0035582D32F18A738DFDFF6</stationID>
-+			<name>SWR3</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>116644168351AFF8CAE8BC28FD39CE5D8AF01C87AE5FD7846FCD787A992E12A05389D80135</stationID>
-+			<name>SWR4</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441686E6B7B6A6F9330000DE77BE3F17D29949832AADED45E4A255C8D3C616A185B1C3</stationID>
-+			<name>Ö1</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441687E8198ED84131F832827B2A92B7C83EF390FC501C294FB8A402907055687F11AA</stationID>
-+			<name>Ö2 (Radio Vorarlberg)</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441688C0209D108F8D6916416D33514FCE4E8DF3C40A3A9B12FC57B1DA0B18F0106562</stationID>
-+			<name>Ö3</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441690A492F72FDB725DFEA7C727463535B570F301E39118BE6A85A5D6D0FFF73EDACE</stationID>
-+			<name>FM4</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441691D64CE148BACD840CCFFE639FA2430DBF48793C6091BEB6DFC923237DE8311966</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664416923BED343121C02899E757E85FC91F2D66A4FD30008839AA8FCB2B46A986831416</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664416935FA995580C00EB03AB99D6B8C3627B2F9AFD00555BABDBFBD8B6C847701951E5</stationID>
-+			<name>BR2</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664416954251D17FFAB1C19888B3BDAF309017191E8491A11CCA94CAC4AEAFDFC87D98E4</stationID>
-+			<name>BR1</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441549E468A60BBEC88E3339CF1A6373AB4396A859CF4D6DD101AC9801A5D48F94A85B</stationID>
-+			<name>BR3</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441698F67C9285970AC34FE783A1836A1A3E1803F76F49D7B12A09B29BA04B091FDF88</stationID>
-+			<name>BR4</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441700D7B89D336BB7B1F99B077C67043F15466D919E17B16DF11A94AAEE341731B07D</stationID>
-+			<name>BR5</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441702B157AA712BABF263606A5E443DC45F86D96F95FBB356893A52EAA109DBC29C57</stationID>
-+			<name>ERF Radio</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664417049F25A61DD6C16564B65E024BB73D521960DA92AC806C2CF0E7E721EA611EFC7C</stationID>
-+			<name>radio horeb</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441554347C30787FB9E9EBDE1ACA28B860B5A9B93E591E1D50F99D9A967FE947F7ACC3</stationID>
-+			<name>DRS1</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441707031EB9C9E8C4151B05CFEC6A968FBD13B23893F4D94D4222F72A9062D39EBDCF</stationID>
-+			<name>DRS2</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664417087A318E1452B0D1B3F54AA8485AD3F67F74F5D44AD758C104C0B4FDD61F758339</stationID>
-+			<name>DRS3</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664417100AB0C53D85FAADBF07AD5EB8C02384E12BA33BCFC23C5AF20800B674440827B6</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441711D189CA449A9546945255009207B5C9367287BF496B7001A7C938AC6A326901E3</stationID>
-+			<name>Radio 7</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>116644171371F70255CFB196BCE5F932B0618CBE35F681F092278A13A69678CA61C6869C6E</stationID>
-+			<name>JAM-FM</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11664417167F4F1DFCFB7C204E8AB95C8D042E295FFB2EC595E441055F60325A48559F7CF8</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1166441717BE71C69ECAF383473836EFB426F77A6155FAA5D9496658C99C2F4E6401FC5E74</stationID>
-+			<name>sunshine live</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.55</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,295 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Skutek &lt;grf-chz@gmx.de&gt;</maintainer>
-+			<changed>2007-12-18T15:31:54</changed>
-+			<country>Germany</country>
-+			<city>Erwitte/Lippstadt/Soest/Paderborn/Warstein</city>
-+			<media>cable</media>
-+			<comments>Stand November 2007</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422</stationID>
-+			<name>hr1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1</stationID>
-+			<name>hr2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0</stationID>
-+			<name>hr3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608</stationID>
-+			<name>hr4-Rhein-Main-Journal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114</stationID>
-+			<name>1LIVE (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08</stationID>
-+			<name>WDR2 - Siegen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62</stationID>
-+			<name>NDR1 Radio NDS - Südwest</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61</stationID>
-+			<name>NDR2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3</stationID>
-+			<name>WDR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9</stationID>
-+			<name>BR1 - Main/Franken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D</stationID>
-+			<name>domradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897</stationID>
-+			<name>ERF (Evangeliums Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01</stationID>
-+			<name>Funkhaus Europa (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419</stationID>
-+			<name>SWR1 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C</stationID>
-+			<name>SWR2 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B</stationID>
-+			<name>SWR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB</stationID>
-+			<name>DEFJAY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54</stationID>
-+			<name>radio ffn - Osnabrück</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF</stationID>
-+			<name>JAM FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83</stationID>
-+			<name>RTL Radio - Die besten Hits aller Zeiten</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5</stationID>
-+			<name>WDR2 Bielefeld/HIT RADIO FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7</stationID>
-+			<name>2255LIVE Ihr Gewinnradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59</stationID>
-+			<name>Radio Hochstift/AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265</stationID>
-+			<name>Radio Siegen/Hellweg Radio/Radio Sauerland</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,402 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>H.-J.v.Angern" &lt;h.j.v.angern@mdcc-fun.de&gt;</maintainer>
-+			<changed>2010-01-17T18:05:53</changed>
-+			<country>Germany</country>
-+			<city>Magdeburg</city>
-+			<media>Cable</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1263742682EFA8D7372495F12DC5035422BAD8D3846427919A16F52EF7FF445AFA377B</stationID>
-+			<name>Hitradio Brocken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637427327527D1C44D176E9453D15642882AA0A707E44309221E46E7F2880685268B</stationID>
-+			<name>Jump MDR</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742775EB08A061881C66DCB3F6458E4A460DA7AD2C5DCB1535E063FAE23F188826</stationID>
-+			<name>MDR 1 Sachsen Anhalt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742825D0BB7B10DA6EB23C2FAC12F3C684F04B4E90797356E2BCF667C133218BF6</stationID>
-+			<name>Sky Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742827A3842FCF15F38EFD4AE035EBD778E446BE23071188606E1A4D6974361B7F</stationID>
-+			<name>Deutschland Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374282814ADFADBE2EF1CE3D8D76C481B621D30EE27BBCFF14A52676918965C4945</stationID>
-+			<name>MDR Info</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374282923CF6A6384B154BD196B26FAEC0F46E5D2F75992F1A4CB1E3922E945756F</stationID>
-+			<name>SAW</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742830B389853BBD307C73B674DD3080C10A8D7CB8838BDD6057B175CA920FD3AA</stationID>
-+			<name>Oldi Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742831CC06B9C80311B37D6466924D9AB2D3ADA554FF9DED60340AC9A039E9B3C8</stationID>
-+			<name>Rock Antenne</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637428322B4118EB5A3211F093974CCCC9927F9558491D774C8AA7E0A33F07700346</stationID>
-+			<name>Eins Live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742833D9A214651D3D206F59094AABE5E3353C48F4020AA8C27C76F836275592E0</stationID>
-+			<name>NDR 1 Radio Niederschsen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283318A69C075A277B3AE8BBC79F4E1E1CFF4D823EABB3E27F2EFC9AA217DDCC</stationID>
-+			<name>NDR 2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283421160FBC90ECB09B18979625B7F274B18546F9C5C97A246495B9AAE1A5E9</stationID>
-+			<name>FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283589E02D1E4A540935B08F8687AB04E172BB80B27849A0CDDFFF03174B4C17</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283631ED9E0026122FD10F2825536EC8979B1F01BEB7AD59A182A60DA6AB6337</stationID>
-+			<name>NDR Info</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742837C5F29068AF8F6315053367092213F5A91FECB77C79B25DC7123F0F97CE96</stationID>
-+			<name>Deutsche Welle</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283890A8F7FA29894A666714B8C172C8AC2B4AB800CFCE4CFAECCE5B89E97343</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374283997A76504466255252E1563C2AB7F4C94AF7CB603B93CBF0F04A192200307</stationID>
-+			<name>HR 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742840F23D0ECD733FDD8E3731B6056CEB2E209AB55CDF408DC3D77D63C4213280</stationID>
-+			<name>WDR 2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374284156512415BAD6D5DDC43C6D31836973C0907AB8D029DFF6B517E53C2FDDF6</stationID>
-+			<name>Radio Multikulti</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742841551253EE75D6424548E0CC1889E159736C4D2ADD3549A113C07F1F061CE2</stationID>
-+			<name>FFN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374284252DC31E7051B8F2C4984B09241B8BB7819148D202E8E524B02774BD15A8A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637428435D4645161BCED1C50EF09BF6CE85BEA46C166A1E2D64B19B1822D6700EAD</stationID>
-+			<name>Antenne Niedersachsen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374284413BE6B50358FE9B9ADF0A6EA2D9EDF035B91B1321D75EDF33D749E1CFA20</stationID>
-+			<name>HR 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374284593B682D61F333A3D754C703C82F42B741DDE18D0C8A2CF8524399A3798F9</stationID>
-+			<name>JAM-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374284646159C57300999149BF9E29B870F326D53B7AD3585AA98358AE57FB57D76</stationID>
-+			<name>Radio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263742847858C45BB6735345C399F738AFF6F55013D910568D69A6A9A85C313021A5F</stationID>
-+			<name>HR 4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637428482EBB68304452FDD74383FB9A44ED38027A32F0806F305E13C5368B14F616</stationID>
-+			<name>Bayern 4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743544D78D9BED87ED0DF1E8519FB2AF5D2C111B20A29EFF9C93A1DFB9F96254C5</stationID>
-+			<name>MDR Sputnik</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374354537444BA44CBE30C1D397DA0991B3F9BF542115EEF022AFBC5E5FF290C7A5</stationID>
-+			<name>MDR Figaro</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374354645C945AE5A4783113FEEB24D935493E61DCD872EE2A134A465E863CD3876</stationID>
-+			<name>Fritz !</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637435473D9A588A8A12B43BF3596ED13EFB1180A2A05719E7A8FB40D30A250A0056</stationID>
-+			<name>BFBS</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743548B8232CCE6182B4CF3816782E0844B502DDF91E2C28351A0B5877367DE0D3</stationID>
-+			<name>SR 1 Europawelle</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743549B9F2A5257233788E6F04310A8F1DD491442CA56AD73B0E5798C729B99EDC</stationID>
-+			<name>YOU FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743550BFDFB8BCD636A097518718168B3D5D61ECD57E40BCC0F277542874A1BA7C</stationID>
-+			<name>Bayern 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743551B0AEC06DC0F6E54AEE4040B5C41574A6875E90B9911063287E2D6D26F294</stationID>
-+			<name>RBB 88.8</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374355201213C9812FD21730D85E96DE0D3A52EF78B5E02A2715518232B56C8A7BD</stationID>
-+			<name>Rockland Sachsen  Anhalt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637435532085DA6DFCF8ACF5D9110E3D8906C6787F5C5959EA24F6556F8B352E32CC</stationID>
-+			<name>Radio Eins</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12637435547572CEF30E8B572F74EFE1BD51A7857523DA4C6C72CE5231468DC024D09C</stationID>
-+			<name>Sunshine Live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743941C06A86CC4F04B028AA968B5A1D0C649853283C5CC797B064E9291C30B25F</stationID>
-+			<name>ORF 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1263743942BC75454A3292124CDCE7FCE62C833AA3C823D7B730489D91694921C82BBE</stationID>
-+			<name>89.0 RTL</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374394362921148E9ECCE4D0A53BAA6752E8C954750B5716E2DA94072190FB92E46</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>126374394436B325F6FA9AF7DA917B9D0F9651623DD1D358F20DDBFCAF846F16F20BDC</stationID>
-+			<name>Antenne Brandenburg</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am kradio-3.5.13.1/kradio3/presets/germany/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/germany/Makefile.am	2012-11-30 23:30:53.000000000 +0100
-@@ -1,244 +1,282 @@
- SUBDIRS =
--EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "worfelden-cable.krp"
-+EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "amtzell-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "bayreuth.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.3.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bonn-cable.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bremerhaven-cable.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "coswig.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erlensee.krp" "erwitte-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "frankfurth-am-main-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "goettingen-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "hilden.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "konstanz-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "lippstadt-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "magdeburg-mdcc-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "norderstedt-cable.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oer-erkenschwick.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "paderborn-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "soest-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "warstein-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "wilhelmshaven-cable.krp" "worfelden-cable.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/"
--	$(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp"
--	$(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/muenchen-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/aichach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp"
-+	$(INSTALL_DATA) "$(srcdir)/amtzell-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bayreuth.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-cable.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bonn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bremerhaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/chemnitz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp"
-+	$(INSTALL_DATA) "$(srcdir)/coswig.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp"
-+	$(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/duesseldorf.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp"
--	$(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/erlangen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp"
--	$(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erlensee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp"
-+	$(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/frankfurth-am-main-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/goettingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp"
- 	$(INSTALL_DATA) "$(srcdir)/hamburg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp"
- 	$(INSTALL_DATA) "$(srcdir)/hamburg-cable5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp"
--	$(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp"
- 	$(INSTALL_DATA) "$(srcdir)/hamburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp"
--	$(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/hilden.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/karlsruhe-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp"
-+	$(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/koeln-loevenich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/konstanz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/langenselbold-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lippstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/magdeburg-mdcc-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/muenchen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/muenchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp"
--	$(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp"
- 	$(INSTALL_DATA) "$(srcdir)/muenster.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp"
--	$(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp"
--	$(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp"
--	$(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp"
--	$(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/neuberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp"
-+	$(INSTALL_DATA) "$(srcdir)/norderstedt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/nuernberg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp"
--	$(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/oer-erkenschwick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp"
-+	$(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/paderborn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/rodenbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/soest-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/stuttgart-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp"
--	$(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp"
--	$(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp"
--	$(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp"
--
--
-+	$(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warstein-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp"
-+	$(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/wilhelmshaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp"
-+		
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp"	
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,450 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2009-02-14</creator>
-+			<maintainer>Gerhard-Czech@web.de</maintainer>
-+			<changed></changed>
-+			<country>Germany</country>
-+			<city>Norderstedt</city>
-+			<media>cable</media>
-+			<comments>wilhelm.tel Senderliste</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350B84E83FC624D588B9BE2C16667AF463CE62AE705548F65C08E293A455B179381</stationID>
-+			<name>Radio Hamburg</name>
-+			<shortname>Radio HH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535026BB6D13F62EB11F9202671BE547076886D906672B3BA433EEA32DEE1D5CFBBC</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname>Deutschlandradio Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853501AC822C1346D33E13696EEC91ACF26BA372F11213BD45B4EE82A96C15FA32287</stationID>
-+			<name>WDR 3</name>
-+			<shortname>WDR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350373BB2F1ABE25FE88366C4630D30676015E09340196CE2D9CA144A574BF9E312</stationID>
-+			<name>NDR 1 Radio Niedersachsen</name>
-+			<shortname>NDR 1 RN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535060116062B40326BB376BFE3AFC499BED2E9977E2FD33EFC4C2EA9A8EC7536CA9</stationID>
-+			<name>NDR 1 Welle Nord</name>
-+			<shortname>NDR1 WN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350EE3CB6DB0F51E1AA3983153965EA7FA09DCE13F03EF634CB5831F8DB746ADD02</stationID>
-+			<name>NDR 4 Info Spezial</name>
-+			<shortname>NDR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535093FD8B50CD14B4DEDDCAB424AD4A236A3B5132F5A742DD5AE35A1523EA82761E</stationID>
-+			<name>N-Joy Radio</name>
-+			<shortname>N-Joy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535044CA129A3069F2F21913EF30FA88A204A17C4F3B771FDB8D37D72B5897D516E6</stationID>
-+			<name>1-Live</name>
-+			<shortname>1-Live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535054196C1A743CDE1D0B11CAA8DE8ACD3A7AFB00ABE2A2803F3E6FBA8EA828014B</stationID>
-+			<name>hr 1</name>
-+			<shortname>hr 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350DE5AD2FDA58E954D66478D9324226E127F9223095557A8D3DFFFEF16FB37C337</stationID>
-+			<name>Radio Nora</name>
-+			<shortname>Radio Nora</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853509EAAA7B362EC8BCFC1629FA3834FF7A76B91D6C4BFF4CDC3BB222C79D9568692</stationID>
-+			<name>hr 2 kultur</name>
-+			<shortname>hr 2 kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853500A5320B468F00DDB554C8AFD8D8DB4366DDE401B68B8C10D4BF1100A550E3138</stationID>
-+			<name>hr 3</name>
-+			<shortname>hr 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350508688C1414B72DB224F647C9BBD7A21F19D3F86897B0A82ECB4DBEABAE2C92E</stationID>
-+			<name>SWR 1</name>
-+			<shortname>SWR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853506439B306C57FD4A5340C8F7E7364CBEFE1372C60178FEF29688E0627A218BC52</stationID>
-+			<name>NDR 90,3</name>
-+			<shortname>NDR 90,3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535021D5A21FDEDA49C85D63E57004F55638248728F0BFD40F7671CC9BBC5AEA95DB</stationID>
-+			<name>SWR 2</name>
-+			<shortname>SWR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350D34BD6644543C07C38FA2D661672A512583CC51AD16F6F0DE32CC4697AEB1118</stationID>
-+			<name>NDR Info</name>
-+			<shortname>NDR Info</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350FF40EDBD2E10FDAD51A29E107DCAF7077E29E1736E60CB0BDDFA49A551A6A1C2</stationID>
-+			<name>NDR 2</name>
-+			<shortname>NDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853500D6CCAD018C68368688B649B1ACFEE285A557AB5C0FDA660E65718DB691499E1</stationID>
-+			<name>MDR Sputnik</name>
-+			<shortname>MDR Sputnik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350EBE5C823BACEAE26C7FF138AE71E7711B738C34E75208D92DC51ED5FB9C2FB5E</stationID>
-+			<name>Tide 96,0 + HH Lokalradio</name>
-+			<shortname>Tide + HH Lokal</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535011B527125E5F38884C3CF693AB2004D3E1C810FD877D2B4213FEFD3836370889</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname>NDR Kultur</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350AB3F8EE6BAC5C355404FD149F70CF608788C42CBCD172722787BFE29CFBAA8BA</stationID>
-+			<name>Bayern 1</name>
-+			<shortname>Bayern 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350601899CA33011371470A528C450992A0D64DD34A718C7BCE4AF47EF312D4B136</stationID>
-+			<name>Bayern 2</name>
-+			<shortname>Bayern 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535068C208A46296C2BE28873616D9C401F53E209937F709EDC3EB6EB7BE49EC4F02</stationID>
-+			<name>106!8 rock&apos;n pop</name>
-+			<shortname>106!8 rock&apos;n pop</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853502006935D7247875D8AA64C3B2AF8933D5B8D3650A1CAE77A4C6B677833772F0E</stationID>
-+			<name>Oldy 95</name>
-+			<shortname>Oldy 95</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350169E84364F4F9F4D3C3547FAC7365B9521BEFAB964624811D599177AA4E77E55</stationID>
-+			<name>radio Paloma</name>
-+			<shortname>radio Paloma</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853503D5AA8B2230615373C62861989B4AD0EB99F4EAED33ECF1EBF06B5967FCD831A</stationID>
-+			<name>bremen 1</name>
-+			<shortname>bremen 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853507248B4D0A7AD9E7DF13B1893C01E6FC349E736D790CD33B3D0696E9063E85E46</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350F6080C0CB178074EB190CA8E77340D8267A33B6C3C3E58B87D1E3255DD0AF5D5</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>Klassik Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535094733F26C046A7795D27ED029389749370E31C7C1C78483134F220F8D8FAD4A7</stationID>
-+			<name>Antenne Bayern</name>
-+			<shortname>Antenne Bayern</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350FAD03C1D4B5A46C859A3A110D862C8523602E39385B8E5E402B94A751731F2EC</stationID>
-+			<name>Radio ffn</name>
-+			<shortname>Radio ffn</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853500526AA9671790C3BB2211D6DF78CC72D1ABB18733ED5803200B3B1B0ED13C46A</stationID>
-+			<name>Energy 97,1 Hamburg</name>
-+			<shortname>Energy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853502CD554F9AD1EB9D0727B9D0621D03342D67D2F526DC6C43040F140D1D8412A88</stationID>
-+			<name>NDR 1 MV</name>
-+			<shortname>NDR 1 MV</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350FCC367BB28B3F06B05EE9436A580DD111C23C69BA950EFFF390F827E9539BB65</stationID>
-+			<name>Bayern 4</name>
-+			<shortname>Bayern 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535048C54A30155C428309B238A6B368938D90074D049CAC4719607EAB5CF7D1CBB3</stationID>
-+			<name>Das Ding</name>
-+			<shortname>Das Ding</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633853506D9D33CCAD3D2A21934D4332B28A106F4E7B556D2E85E73D1CA9694FE389A9BF</stationID>
-+			<name>WDR 2</name>
-+			<shortname>WDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338535090C69B1F51500F2011BA197DBBF8655430B7EBCE140C874329F8C8C8B0CEA50A</stationID>
-+			<name>you fm</name>
-+			<shortname>you fm</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350B7953D6A790A5AB4818383A12C503EC062B044FCA52ABF433AA19E42A49283BF</stationID>
-+			<name>sunshine live</name>
-+			<shortname>sunshine live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385350FC80A9732793334A7DAC69EA8F7B486EC7160FC3F7A6E592E08C280C7D06F449</stationID>
-+			<name>Fritz!</name>
-+			<shortname>Fritz!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12340016715898BD9CD68481FA7E9268C59FDCF206A92F6C2FC4D81F4BF99B1CD14087279D</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>Deutschlandfunk</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234001676F3C24D22C4CEFAAF59368B1C6175B9A112326DD02540159968DCE362531E47BF</stationID>
-+			<name>Hit-Radio Antenne</name>
-+			<shortname>Hit-Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234004410D728141F410BBB7AE00435D01B95B781EAA667EFA34510D49D1F3B511BF1421B</stationID>
-+			<name>SWR 3</name>
-+			<shortname>SWR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234004410592FCEB5589B5E7B2E730AB5CB789633232C5CAF6D6D19C59D09BBC989CB022F</stationID>
-+			<name>Bayern 3</name>
-+			<shortname>Bayern 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234004411DFC8AC8BFB2B7B5065F7BE40919DA57485B510CAAA1DA6C66D5B15185BF1FBEF</stationID>
-+			<name>delta radio</name>
-+			<shortname>delta radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>123400445658D18DC5F7E316C14349DAA777FE6EC95255EC80D8E33B208D502CC98C97C9B5</stationID>
-+			<name>R.SH Radio Schleswig-Holstein</name>
-+			<shortname>R.SH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>123400445766065E8E29FA0613993EAF2667A8B3E9D6AF0F4ADACEC66F591C43800662D112</stationID>
-+			<name>Nordwest Radio</name>
-+			<shortname>Nordwest Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12340044573D82674FCA85A381784833081DFDF233C9C032301D07C8CAB368BD735FAAA9CC</stationID>
-+			<name>Freies Sender Kombinat (FSK)</name>
-+			<shortname>Freies Sender Kombinat</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234004409F068FBDBCEF941ACA3B7C82B7DBBCE43BF5287F6A4B96407FA5343837E171138</stationID>
-+			<name>BFBS</name>
-+			<shortname>BFBS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1234004458B512B7DC7D8646454A0094CF9F2930306C137063BF00680315D0802EDEDA67B4</stationID>
-+			<name>Jam FM</name>
-+			<shortname>Jam FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,175 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Uwe Thaler, &lt;Uwe.Thaler@t-online.de&gt;</maintainer>
-+			<changed>2003-12-23T22:02:09</changed>
-+			<country>Deutschland</country>
-+			<city>Essen</city>
-+			<media>Kabel</media>
-+			<comments>Liste Radio Kabelcom Essen</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>111645544461FE8EC7D53496B0149CC2169AFF2BE5A321887F26EA65C4C52540225748C2DE</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL R</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444132EC8910552A076B2263EB4FB6DA83828A0EDE6BACD06C3147D3D1D432A0B84</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>DLF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444C33A968EE2BF1BB48608049D2CF4CF12067F88AD3A8399924505353DC2F8C1B1</stationID>
-+			<name>WDR 4</name>
-+			<shortname>WDR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554441C32631CB6263AF15048C040D027B28AFFC9380A2B9027721DAC470EFF0F2B13</stationID>
-+			<name>WDR Eins Live</name>
-+			<shortname>Eins Live</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444EC9767FF57C695D2BC57D4E9960583C198339CBC10C280ADC8967430FA73362C</stationID>
-+			<name>Deutschland Radio Berlin</name>
-+			<shortname>DR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554447E69E7F5DC8891C1EC85A6BABE9DA55BF3F972E92D42A27D94189964F338DAEF</stationID>
-+			<name>WDR III</name>
-+			<shortname>WDR III</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544489F961FBA68B91A2590ED0348782FD901D630C4B10247EE161FF365EDA52A0A4</stationID>
-+			<name>Funkhaus Europa - WDR 5</name>
-+			<shortname>WDR 5 FHE</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554447D2214728E8C6A0FE7F397222627101A4A4186A81B2C51C0D9C9E66A4A91DE81</stationID>
-+			<name>wdr II</name>
-+			<shortname>wdr ii</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444DCD947F01824F0A55659C25B627F517E6ADDF5B00B3FB2A658F738A482055810</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>Klassik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554446002034B38BC07A94EDA8819EF2177282B18B46232A19A5ECE0901DF6A0D4D85</stationID>
-+			<name>NDR 2</name>
-+			<shortname>NDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444B6F7C6375D08F52073F4D132CEC84048966F773C1492E82A05585CCA2C11A891</stationID>
-+			<name>HR 3</name>
-+			<shortname>HR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544479D905B9328F1AC358A01F714EE8C17400018AE87DBED4CE5C7F625F914B5FDB</stationID>
-+			<name>domradio</name>
-+			<shortname>dom</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544480377316E6435D71F5EB8AA0402FB46031174B80C5AC418AE0C0CCDAEDA937A2</stationID>
-+			<name>bigFM Rheinland-Pfalz</name>
-+			<shortname>bigFM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554449784A88F4B6C63A7C41D755BE911D687B4C687070880F5B28605E85AECA30754</stationID>
-+			<name>SWR 4 Rheinland</name>
-+			<shortname>SWR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444D5E482E6616E9D6E5D5BDFE5A04193005823CE44E87B48484DF749B8FF8D035B</stationID>
-+			<name>SWR 3</name>
-+			<shortname>SWR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554440A3113553BB364D4A20AE066334DE449CA5C17CCA426E8FA1D1EDCCB375D94B6</stationID>
-+			<name>SWR 1 Rheinland-Pfalz</name>
-+			<shortname>SWR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554447A369B21CFC99C0BF2B72914C742BE496DFDFCD025658A93E387411759BBFA9D</stationID>
-+			<name>sunshine live</name>
-+			<shortname>Sunshine</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444C55AFCD21C815FB71F984EABA23B215432E193FCC8D4F77B9722D39CCA020CF2</stationID>
-+			<name>BFBS</name>
-+			<shortname>BFBS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544418C2B1594DAF8F9AD98E1A3D4EC894D3A74B163377373AA0D594B4690538B502</stationID>
-+			<name>WDR 5</name>
-+			<shortname>WDR 5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554446B06F6FC468822B3823EA87329E6F0A6F352A325BC2618FB8037056CC8A53191</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>Melodie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,295 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Skutek &lt;grf-chz@gmx.de&gt;</maintainer>
-+			<changed>2007-12-18T15:31:54</changed>
-+			<country>Germany</country>
-+			<city>Erwitte/Lippstadt/Soest/Paderborn/Warstein</city>
-+			<media>cable</media>
-+			<comments>Stand November 2007</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422</stationID>
-+			<name>hr1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1</stationID>
-+			<name>hr2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0</stationID>
-+			<name>hr3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608</stationID>
-+			<name>hr4-Rhein-Main-Journal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114</stationID>
-+			<name>1LIVE (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08</stationID>
-+			<name>WDR2 - Siegen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62</stationID>
-+			<name>NDR1 Radio NDS - Südwest</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61</stationID>
-+			<name>NDR2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3</stationID>
-+			<name>WDR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9</stationID>
-+			<name>BR1 - Main/Franken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D</stationID>
-+			<name>domradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897</stationID>
-+			<name>ERF (Evangeliums Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01</stationID>
-+			<name>Funkhaus Europa (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419</stationID>
-+			<name>SWR1 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C</stationID>
-+			<name>SWR2 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B</stationID>
-+			<name>SWR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB</stationID>
-+			<name>DEFJAY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54</stationID>
-+			<name>radio ffn - Osnabrück</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF</stationID>
-+			<name>JAM FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83</stationID>
-+			<name>RTL Radio - Die besten Hits aller Zeiten</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5</stationID>
-+			<name>WDR2 Bielefeld/HIT RADIO FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7</stationID>
-+			<name>2255LIVE Ihr Gewinnradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59</stationID>
-+			<name>Radio Hochstift/AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265</stationID>
-+			<name>Radio Siegen/Hellweg Radio/Radio Sauerland</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,295 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Skutek &lt;grf-chz@gmx.de&gt;</maintainer>
-+			<changed>2007-12-18T15:31:54</changed>
-+			<country>Germany</country>
-+			<city>Erwitte/Lippstadt/Soest/Paderborn/Warstein</city>
-+			<media>cable</media>
-+			<comments>Stand November 2007</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422</stationID>
-+			<name>hr1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1</stationID>
-+			<name>hr2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0</stationID>
-+			<name>hr3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608</stationID>
-+			<name>hr4-Rhein-Main-Journal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114</stationID>
-+			<name>1LIVE (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08</stationID>
-+			<name>WDR2 - Siegen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62</stationID>
-+			<name>NDR1 Radio NDS - Südwest</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61</stationID>
-+			<name>NDR2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3</stationID>
-+			<name>WDR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9</stationID>
-+			<name>BR1 - Main/Franken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D</stationID>
-+			<name>domradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897</stationID>
-+			<name>ERF (Evangeliums Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01</stationID>
-+			<name>Funkhaus Europa (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419</stationID>
-+			<name>SWR1 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C</stationID>
-+			<name>SWR2 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B</stationID>
-+			<name>SWR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB</stationID>
-+			<name>DEFJAY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54</stationID>
-+			<name>radio ffn - Osnabrück</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF</stationID>
-+			<name>JAM FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83</stationID>
-+			<name>RTL Radio - Die besten Hits aller Zeiten</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5</stationID>
-+			<name>WDR2 Bielefeld/HIT RADIO FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7</stationID>
-+			<name>2255LIVE Ihr Gewinnradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59</stationID>
-+			<name>Radio Hochstift/AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265</stationID>
-+			<name>Radio Siegen/Hellweg Radio/Radio Sauerland</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,295 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Skutek &lt;grf-chz@gmx.de&gt;</maintainer>
-+			<changed>2007-12-18T15:31:54</changed>
-+			<country>Germany</country>
-+			<city>Erwitte/Lippstadt/Soest/Paderborn/Warstein</city>
-+			<media>cable</media>
-+			<comments>Stand November 2007</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422</stationID>
-+			<name>hr1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1</stationID>
-+			<name>hr2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0</stationID>
-+			<name>hr3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608</stationID>
-+			<name>hr4-Rhein-Main-Journal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114</stationID>
-+			<name>1LIVE (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49</stationID>
-+			<name>Deutschlandradio Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08</stationID>
-+			<name>WDR2 - Siegen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62</stationID>
-+			<name>NDR1 Radio NDS - Südwest</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61</stationID>
-+			<name>NDR2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3</stationID>
-+			<name>WDR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07</stationID>
-+			<name>JUMP</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F</stationID>
-+			<name>WDR4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9</stationID>
-+			<name>BR1 - Main/Franken</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884</stationID>
-+			<name>WDR Radio 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D</stationID>
-+			<name>domradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897</stationID>
-+			<name>ERF (Evangeliums Rundfunk)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01</stationID>
-+			<name>Funkhaus Europa (WDR)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419</stationID>
-+			<name>SWR1 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C</stationID>
-+			<name>SWR2 -Rheinland Pfalz</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B</stationID>
-+			<name>SWR3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A</stationID>
-+			<name>BFBS (engl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB</stationID>
-+			<name>DEFJAY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54</stationID>
-+			<name>radio ffn - Osnabrück</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF</stationID>
-+			<name>JAM FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744</stationID>
-+			<name>Radio 4 (niederl.)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83</stationID>
-+			<name>RTL Radio - Die besten Hits aller Zeiten</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D</stationID>
-+			<name>sunshine live</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5</stationID>
-+			<name>WDR2 Bielefeld/HIT RADIO FFH</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7</stationID>
-+			<name>2255LIVE Ihr Gewinnradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59</stationID>
-+			<name>Radio Hochstift/AFN - Frankfurt</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265</stationID>
-+			<name>Radio Siegen/Hellweg Radio/Radio Sauerland</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp	2012-11-30 23:30:53.000000000 +0100
-@@ -0,0 +1,277 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Michael Herbers, &lt;michael.herbers@gmx.de&gt;</maintainer>
-+			<changed>2007-12-11T23:23:26</changed>
-+			<country>Germany</country>
-+			<city>Wilhelmshaven</city>
-+			<media>cable</media>
-+			<comments>tux fan</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E</stationID>
-+			<name>NDR 1 Niedersachsen</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11</stationID>
-+			<name>NDR 2</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3</stationID>
-+			<name>NDR Kultur</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684</stationID>
-+			<name>NDR Info</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056091591890E743FC62C0FE220A787BDAFD61AC8C983B8D81A36B97886C7BFCA512</stationID>
-+			<name>Radio Jade</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6</stationID>
-+			<name>Radio Ostfriesland</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A</stationID>
-+			<name>FFN</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141</stationID>
-+			<name>Hitradio Antenne</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41</stationID>
-+			<name>N-Joy</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6</stationID>
-+			<name>Bremen 1</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366</stationID>
-+			<name>Energy Bremen</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202</stationID>
-+			<name>Nordwest Radio</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C</stationID>
-+			<name>Bremen 4</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178</stationID>
-+			<name>Radio Sunshine</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E</stationID>
-+			<name>Jam FN</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D</stationID>
-+			<name>FH Europa</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6</stationID>
-+			<name>Deutschlandradio Berlin</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734</stationID>
-+			<name>Radio Klassik</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F</stationID>
-+			<name>Radio Melodie</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2</stationID>
-+			<name>Radio 1 NL</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189</stationID>
-+			<name>Radio 2 NL</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C</stationID>
-+			<name>Skyradio NL</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4</stationID>
-+			<name>Radio 4 NL</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844</stationID>
-+			<name>RESERVE</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B</stationID>
-+			<name>RESERVE</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC</stationID>
-+			<name>RESERVE</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>109129056054E0EC549A20C823CC67874F7909A856ED54416CDD24B65DE1C12AD39B5B5EFE</stationID>
-+			<name>RESERVE</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.45</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,639 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>George Alexandropoulos &lt;g.alexandropoulos@gmail.com&gt;</maintainer>
-+			<changed>2008-12-26T18:43:34</changed>
-+			<country>Greece</country>
-+			<city>Athens</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1230309911B23A391B5B6404E3091E9D9ECF9BE8DE4A6FBC37628F936966CA145F15FEED0F</stationID>
-+			<name>Κρήτη FM (RDS)</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230310041C53AF537096A464EA9D7393DB1ED3791370F5775E49BC8858BA82280458F5DAC</stationID>
-+			<name>Εν Λευκό (RDS)</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303101575D33579382D14ECCC22E92B1414305016182FB7BA9EFE6CA50A604D850A57CBC</stationID>
-+			<name>Oasis FM (RDS)</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230310220B5C206BC9810A35D1EFC93D70746E857B846B8E310CAA13D3602035490A9913E</stationID>
-+			<name>V FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303102476E86C70BF2EA5C48D3F805B504267254CE29524B0C63D596BD22B6BCEF20E221</stationID>
-+			<name>John Greek</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230310272DFE71B1E1BF4CB2EE6E6DA9E2F7AF5B19072431F604C8BE6B18D2EAF368FC67A</stationID>
-+			<name>Angel (RDS)</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303103371BC455280287C472750952A9492A173E7279696BE7277A3DB9C66CD53149B85A</stationID>
-+			<name>Arren-a Radio (RDS)</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303104015CF4557D8ACE18694D6EE8154D07ECA17672AF11C6F5FF0F723EA05D0145705D</stationID>
-+			<name>ΡΣ Εκκλησίαςτης Ελλάδος (RDS)</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303104471B8BBD04DF9F47C0EDB773F06B4BACAE82699ACD1A45F0BB75F8D25B3882794E</stationID>
-+			<name>Δρόμος FM (RDS)</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303104933673A9EFFDAB1E1AD16F03D4FFE37C1F5CED43B5C75620A80BC2E9C404F67699</stationID>
-+			<name>902, Αριστερά στα FM</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303105374AE158E5AB0ED3A18C78292DD00315902384EA6109A0AA1172552C1C080BAE77</stationID>
-+			<name>Κανάλι 1 Πειραία</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230310714AE2CA9D371FBCA12154CF555677EF21621890B461BA8FA41F9D9D764DCCDB484</stationID>
-+			<name>Γλυφάδα FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031075982EB93F0EF674D9AA441B245BD7FC8D1FEFAA870F9109E184E6DBE4596FDD410</stationID>
-+			<name>Ράδιο Άστυ</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031080527F7E8134485FDE8926E30146332E82E336178DBF4ABD96487E9D52D5AE22C20</stationID>
-+			<name>Ε.ΡΑ. Τρίτο</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303109063B0E3AD5E48ED3A8CF88FE8CC51A90CEF91CA05453F7B360BD86723BB051B413</stationID>
-+			<name>Πειραεϊκή Εκκλησία (RDS)</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303109560CCDEF1DFE6DD06D30184BD88334C27D249404F7C06141D1E15DEED2769A26C3</stationID>
-+			<name>Κρητική Ραδιοφωνία (RDS)</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031099637DA95EC174BC5C9C0C30E5793D31DEC5D1F80C23C56F9791CE86F6ADA4794A1</stationID>
-+			<name>ΝΕΤ (RDS)</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303110246F1535C1B2CC59A3667E77E510E27CC6D0CE1BC195B16C8C1F2E07E98D5EF0C1</stationID>
-+			<name>Galaxy 92 (RDS)</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311024FC7B25A31EC1F8FB66C8575BBBC79BB71852C7FFFDBB4C9FD2640605C24E4A0F</stationID>
-+			<name>Λάμψη FM (RDS)</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031116244E7BDC268D4A421650CBA260D84346E9DFCA6D2BA54B0DF53EE49CCBF29E034</stationID>
-+			<name>Best Radio (RDS)</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303111928090247F007166010E5D852822A29E1FDAACEDB887EA1261923F19A599386CB3</stationID>
-+			<name>Kiss Radio (RDS)</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311213A944DC146D6BFAA016A9F26EAD33E758890572A9BCA0E1319327B250F2C5AFEE</stationID>
-+			<name>Orange (RDS)</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311245C89045C8E4A643D71D1924EEAD1B28C67AE522A65071531C2353C8FB57EF22A9</stationID>
-+			<name>Energy Radio TEI FM</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303115166EC20D8697A6C3050C3AA563EFBE770A99C1B0798F2A7A606478B34E367B694E</stationID>
-+			<name>Kosmos (RDS)</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311550F6F0482ED41A99B83F9BB388EF16F0036BEC8D74B18472D3BC37DBB6D93AADD7</stationID>
-+			<name>Ράδιο Μεσώγεια</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303115893C0F6BB62B993A0F13809EB983624554E39A1BA8ACA0A12ED49C38D39D9B3CD5</stationID>
-+			<name>Επικοινωνία</name>
-+			<shortname>26</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311623B8101A41BD370C4EF460EC27324FF1F5B7DC74C2F24DEF1040131D54EC8FE6CB</stationID>
-+			<name>Ξένιος (RDS)</name>
-+			<shortname>27</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303116644824056613E423391508C9C281DEE90D20CE8ACA0314F50F466D75BF2AC16DF8</stationID>
-+			<name>Nova Sport FM (RDS)</name>
-+			<shortname>28</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311710D727DBE7F8CA17F95D03CFA6D30792C80E0E040DA8420015272305DBD56EE553</stationID>
-+			<name>Ρυθμός (RDS)</name>
-+			<shortname>29</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303117775436213D83FC8FFC561FF16EC0237120E5A5F2BA7B9AB3B50A49C4787E75AC65</stationID>
-+			<name>Athens Deejay (RDS)</name>
-+			<shortname>30</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031182099429EF22F12F22F67E2687DE8E7E1135CF17C4A97338CA0D823A7CD06AF585F</stationID>
-+			<name>Ε.ΡΑ. Τρίτο</name>
-+			<shortname>31</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230311851996923E9C3FE3723FDF97B589375FC6407F26EA25208B8834A403B4711B8D9A7</stationID>
-+			<name>Φλόγα FM</name>
-+			<shortname>32</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031189004AE833A162F5018E0CE681665DEE99206E26CD3C7E9936D1591F7719F4C9658</stationID>
-+			<name>Disco Radio</name>
-+			<shortname>33</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303120414A9CD78220A67C5AD36C260CE2DF6116A7B81B7D178AF5A8EF31C992EEB232BB</stationID>
-+			<name>Flash (RDS)</name>
-+			<shortname>34</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303120671B21410896F7FDC86B9A94492DFBEA717FA148DBB2E42E2B8DD867B678E39528</stationID>
-+			<name>Red FM (RDS)</name>
-+			<shortname>35</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312096E38A0CACC50521610911604EB55EEC77B4A747F608831BF9083EE5512311D3A3</stationID>
-+			<name>Hijack 96.6 (RDS)</name>
-+			<shortname>36</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303121260761F5F5BAAB82465FB3A2C3ECBAEE61CAE3A792C46D9548DE5F649648A73270</stationID>
-+			<name>Rock FM</name>
-+			<shortname>37</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312166804069BA50E9D7111832D0EA4852161E89B5731255BF0CAE2CCE50550093AE9B</stationID>
-+			<name>Ant1 (RDS)</name>
-+			<shortname>38</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303121992EB1FA8C469E8BB788AB71BCC3AAB8F9742987112AFC1F6CE45F2166E9A91FA4</stationID>
-+			<name>Love Radio (RDS)</name>
-+			<shortname>39</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312232366483921B506A2979478D06B02158103F0EB385DBB7B2B856C52168FC595967</stationID>
-+			<name>Real FM (RDS)</name>
-+			<shortname>40</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312306F95ED4F74CEFDE73EF011BA8CF8778AFAA3467DB5FB30144450D3245A192515B</stationID>
-+			<name>98 FM</name>
-+			<shortname>41</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312327A2288437FE737C29476DC47CB0508582ADF7E9DBADDB8774C04577B33FBEBC19</stationID>
-+			<name>Αθήνα 9.84 </name>
-+			<shortname>42</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312364E2AA2C6881FEE40B2D884943C3E8B64481D60ACCBE9A2432EDE514FE51753308</stationID>
-+			<name>Derti</name>
-+			<shortname>43</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303124142D87A4C355F98DDE7CB724DAEE89545FF34A606A36F76ABD84B7B5E4E8CD40D6</stationID>
-+			<name>Alpha Radio (RDS)</name>
-+			<shortname>44</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031244511426477E7E610045A66A6D0648BD107284348B0468CDEE0BAAC91FA0DA08C5D</stationID>
-+			<name>Μελωδία</name>
-+			<shortname>45</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312493A31F04C250C1D43FD9C594F763BFC1B87A1010A03899E9291D1EA2E79698D695</stationID>
-+			<name>City 99.5 (RDS)</name>
-+			<shortname>46</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312525A4CAAE7137B93A8D20DFFAB81BEA4204385EA6C189A30DE176BB82CB3D4A148B</stationID>
-+			<name>Σκαϊ 100.3 (RDS)</name>
-+			<shortname>47</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312591B671B9655862ABA64375F40E746FA963F2A4505F0EDEA78AD33E03A339BBA3AF</stationID>
-+			<name>Ε.ΡΑ. Σπορ (RDS)</name>
-+			<shortname>48</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303126302C4C368C2349DAD777E3D6F4AD90894D48C29579859906DE59FF20C54BD187D7</stationID>
-+			<name>Δίεση (RDS)</name>
-+			<shortname>49</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312665CBE843B50F7F4895C9461709F956CEFD6ACC0AA75BD380E0D0241AB88670114A</stationID>
-+			<name>FM1</name>
-+			<shortname>50</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031268612ED29D140FC9FD11967DCF92C0DC33C82861B4F5089A394BA80AEF15D33ABF0</stationID>
-+			<name>Ράδιο Κουρσάρος</name>
-+			<shortname>51</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031274240D069495348EA1D28B8BD54A4A017B286E8444F2CBBEF72582F5438F6C4BEBD</stationID>
-+			<name>Ε.ΡΑ Σπορ (RDS)</name>
-+			<shortname>52</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303127692012CEFDB538BB251256AAFD024C4DB8BAC224CD6C9B7920211B6850C34A359F</stationID>
-+			<name>Sfera (RDS)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312809CCCC7D548CEB4151F8190472A6E0459B728B5E74930805AB103319560297EAED</stationID>
-+			<name>Nitro Radio (RDS)</name>
-+			<shortname>54</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312850905EE182DBAD8E79EE4386C24413E2154A31CDCEAD3AA12B457A9E2568122523</stationID>
-+			<name>Ε.ΡΑ Δεύτερο (RDS)</name>
-+			<shortname>55</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230312886817169D7A15A93410BFE95957996DC91D991585BEC1E45DAF693E26D317804F5</stationID>
-+			<name>Ράδιο Αναγέννηση (BlackMan) (RDS)</name>
-+			<shortname>56</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303130012B5ABE270738A8EC062B1E27F5154F2BF3F3672E6352C5DB44C6DE6AE22C5017</stationID>
-+			<name>Sentra FM (RDS)</name>
-+			<shortname>57</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031309044B0C6B4FC9EC701C76FF0E7A6768D86DBD12AE00ED80896B645BFBF87461CFE</stationID>
-+			<name>Dream FM</name>
-+			<shortname>58</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303130998219B153DCF3C8F424A9AA19CEFFE7655171852B4C342C55E8F22078BB431339</stationID>
-+			<name>Ε.ΡΑ. Δεύτερο (RDS)</name>
-+			<shortname>59</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031320703190AF84743CFFA4197D7281A023936BFFAA8F9B2C483D77FBE0BF4B608F9DD</stationID>
-+			<name>Παρέα FM (RDS)</name>
-+			<shortname>60</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313237B50AF8C2E59E8BBAB86DC11C0383988DF52F9CCC5925CE44E2A74C5EA3888D86</stationID>
-+			<name>Athens International Radio</name>
-+			<shortname>61</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313281C3A6919D43EB36613751890BA2A52B1A6B2A8468F7A2B234F6BB9256E77EE2BE</stationID>
-+			<name>Athens Shock Radio</name>
-+			<shortname>62</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303133198504BD0FD62C0E5041BB115CC1500975A0CD88AC5FE350A8BE98382B21CA5148</stationID>
-+			<name>Radio Paradise (RDS)</name>
-+			<shortname>63</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031336668A73E93D3A4F9DA8E629E9683521DE0914CD7E344AFC223ECC2A40732CE7427</stationID>
-+			<name>Στυλ FM (RDS)</name>
-+			<shortname>64</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031341161834E2B7904C834F82709132303CB4A198EF37D476079A8CD32AC5B283056C2</stationID>
-+			<name>Ε.ΡΑ Σπορ (RDS)</name>
-+			<shortname>65</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313446E73E13D8B03DAD2777B665D5BE7BA7D81E17FEC6F7E9003F27058BD6B1B59D32</stationID>
-+			<name>Atlantis </name>
-+			<shortname>66</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031358462B35AC7AE0E6C9192F6D5D3CAAF62F9239903610EFDAB3DC718B0A68168A021</stationID>
-+			<name>Παλμός</name>
-+			<shortname>67</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313617CC4B3C32327F712A220D7221443447E80E5D99A3C71E80E5A7878C78B5EE04C6</stationID>
-+			<name>Στο Κόκκινο (RDS)</name>
-+			<shortname>68</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313664E878568C085647D08491F498CBAA9369F76F2DCA407587E7C21BDA41BCF55738</stationID>
-+			<name>ΝΕΤ (RDS)</name>
-+			<shortname>69</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031368917BFC8A91497C0194CFE9D2D8CB058EE98222B86EF99944E17585F802C19373E</stationID>
-+			<name>Mad Radio (RDS)</name>
-+			<shortname>70</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303138141D53424848F1188AC3BC6E8F99E7A8437CD2316CCC05803F035198B3CE573573</stationID>
-+			<name>Ράδιο Αργοσαρωνικός</name>
-+			<shortname>71</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303138654AE79C55DE444E7393577333E613CBED20C0CA7699F84F99FBF3B36647789BA4</stationID>
-+			<name>Digital FM</name>
-+			<shortname>72</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031390634A5D157059B3EC7240BB2FC9E3CB2362A6276261AE13A6BCF96CC52B8B3F8DC</stationID>
-+			<name>Kosmos (RDS)</name>
-+			<shortname>73</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230313941D75FBD7052D139CDB27CC53A4284924C335A8604275D3E9F30BFE92CE32CEEF4</stationID>
-+			<name>Blue Space</name>
-+			<shortname>74</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303139928D015AE8A07354DD78F3E4696EE19A4C7A28355A6CFAB152F27A74F7B7E63205</stationID>
-+			<name>Star Radio</name>
-+			<shortname>75</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123031402535BB69B460FE9C4D04663F7E6B8979490B5C134369E42D10967DBA94DF832936</stationID>
-+			<name>Ακτίνα</name>
-+			<shortname>76</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1230314060D147B66919B197790141847E85744766CE02ABE25521EDBF9ADB038B1D549B5C</stationID>
-+			<name>Super FM</name>
-+			<shortname>77</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12303141163EA61198376BD854C55C07DB1AC4154AEF2F18FD38AD4D3A2882D45BA6BB4711</stationID>
-+			<name>Ηχόραμα</name>
-+			<shortname>78</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>108</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,665 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>Michael Tr.&lt;michtri@otenet.gr&gt;</maintainer>
-+			<changed>2009-07-02T14:16:43</changed>
-+			<country>Greece</country>
-+			<city>Athens</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555F8C6D2B7D76AB919961DED8B465344600D480097DFA0B9D8FD21EE4407743965</stationID>
-+			<name>ΚρΞ?τη FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355521C6A97AC143F04E4FFEF9B3296A8D76AAC854EA957FD9E73FE35DBCC613F56E</stationID>
-+			<name>Εν Ξ›Ξ΅Ο…ΞΊΟŽ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555B5D8B70524B3E069215BBD5F346D540F080C118092F4A5C20C46BA4913E9D333</stationID>
-+			<name>Oasis FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355592B516BDCAE2D5B5117E8380F5C41A7425C4D3602A9C50DCCDFADDA8772C5140</stationID>
-+			<name>VFM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035551849550D23A9C290AD1089418684403211056223761369428A5442BFB798845C</stationID>
-+			<name>John Greek</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035552856D73C8625ABB8CE79549854C486E994731F59D4D4E2F682134AC8BF610CEB</stationID>
-+			<name>Angel</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035559401473C68D712CFB05370CBACC513E3407AD70F06C4AE5EE66B0A6544DD8B87</stationID>
-+			<name>Arren-a Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555DF524877EA983F64260140F197B075D3BD3D535FBB6C6F78F58AD498B70A3180</stationID>
-+			<name>ΑΣ Εκκλησίας της Ελλάδος</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555B950E4E8944932CF5F899D284017823CA7EB448F5464BF512371E1407A515995</stationID>
-+			<name>Ξ”ΟΟŒΞΌΞΏΟ‚ FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555FE988948927F6B487000FA9AA7A5633C44653BF74C5DBDA3CE6D27A088350511</stationID>
-+			<name>902 ΑριστΡρά στα FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555BE3B63152696DFA54B3A92B66775A35264BB7281F2C2E2B342BFB3594D65F598</stationID>
-+			<name>Κανάλι 1 ΠΡιραιά</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363384889A1A75FA05DEE86039BD59FD19D83DB15CA0C9367271F0EA3AD6379241B77D36</stationID>
-+			<name>Radio Asty</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555D034E543C6CBD3A56BDD86E42C3B3786BB9DFB185CB7F2A73670A51769693FAF</stationID>
-+			<name>Ξ•.ΑΑ. ΀ρίτο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035557DC51B6683E28C647D0E16B52477B8BF2F7443F6D0F978F0D4123F89A2A53C22</stationID>
-+			<name>ΠΡιραϊκΞ? Εκκλησία</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355579A9ED56F6354B0F53FEF9102BCB7342FC6A8CCD369AAFE206C1DF7E83A6494A</stationID>
-+			<name>ΞšΟΞ·Ο„ΞΉΞΊΞ? Ααδιοφωνία</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123633865886ABEF0BD85FA264A328E2D52FC8C3E4893BF1FAADB1E04AE447B10495E4F403</stationID>
-+			<name>NET</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555025BCA17F8EF9A0B5B48AF56C02D07CFF8EAE7BECD66DEAE04FA39CC018DA682</stationID>
-+			<name>Galaxy 92</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355578828CC76A23BCDFCAAB11465BA737D79C719BB35FBE232B352442AD3C81563A</stationID>
-+			<name>Ξ›Ξ¬ΞΌΟˆΞ· FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035557B2403325DD733982F42829F4CA43FE9626BF7A1A5A68FD482AA36EBC6E6BBDE</stationID>
-+			<name>Best Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555E15EE72ABEC2D16F003455AC70685892F731AA36E818356AAFD6868297144CE3</stationID>
-+			<name>Kiss FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035554FA4D7BE8217DCC400C11D50231BDCC560E8D4467F3CFF12F91964CEBDC23A35</stationID>
-+			<name>Orange</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555CC91671E5F32D0EA8F6C7A47DE9DF968000FFEC1F096B74E65F35EDC31320775</stationID>
-+			<name>Kosmos</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555EE0F168A293A39F6B7715EB7015BBC5AE1B84F98B6894B60375913F89F3E3837</stationID>
-+			<name>Epikoinonia FM 94</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555D807F6B64385AFAFF35CA0C71E48D6402D8F6DD1317FD8985368202683E76F99</stationID>
-+			<name>XFM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355582F11794FA491D9AE942B99CCE9CFA385D60A76ADCA8272398798F66FF5023D0</stationID>
-+			<name>Nova Sport FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555DE36BA648307E877F5C340E34F10E7ED563BE03BD991A7450B73ADFE87611457</stationID>
-+			<name>Ξ‘Ο…ΞΈΞΌΟŒΟ‚</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555F619039E0DB51B3B3F55754A159449F4987CCC442060D32AE6E356090B8ACE70</stationID>
-+			<name>Athens DeeJay</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123633888677CEFB92E1F3A3633D56C3179ACF1EEC1C060BC7F7B1355614ECDC8F6D817F72</stationID>
-+			<name>Ξ•.ΑΑ. ΀ρίτο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555F019432F2B2A97E6A9289B3FA6E172E58C306F31E7D14BFEE8B6651DF6FFE4AD</stationID>
-+			<name>Floga</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>95.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555002B7464B001BD05C6D36F0DF95839816750FA47A4C4BB620522BE3313234FB6</stationID>
-+			<name>Flash</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555CE211857EA50B8116A8C780BFB75B354F0F24471E8A250D465E95B476C4C32D0</stationID>
-+			<name>Red FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035552BD28A667EDE6729B103EB0113819281D4FD8C9FB6ECCE791510744AEDE96470</stationID>
-+			<name>Hijack 96.6</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555B6DE03DB507ED282725F38D2126C7E2B53C99A15CB9C1D9E5D2FAAAA71B2C54C</stationID>
-+			<name>Rock FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035550F41ABC97DBFA000B3049E6BE2C8CC094565BA9CFA86419367AF83DA286A377E</stationID>
-+			<name>Ant1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555228F598B5C8AEBB9E7DEB479DBB324EFC609073E2A505C1DA9C65F024AF0A273</stationID>
-+			<name>Love Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555AF8701B92ED1DFAC5F94AA6D76D64ACC4045FFE126AE5B9D65890FB28F8001C0</stationID>
-+			<name>Radio Veronica</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555BB78B6473DCA5D19CD162E660D97C3DCC20C1B168BAD04BAEB393743DD4DE192</stationID>
-+			<name>Real FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>97.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355584EFCCA46C288369540AEA2E9177C6FEC32931B3A41BAAADC772302EC6B70C30</stationID>
-+			<name>Free FM 98</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035556772D03B3375CA4CBB4C77526F4C68665A982472337D7E6FB57A70C6AD08CB7D</stationID>
-+			<name>ΑθΞ?Ξ½Ξ± 9.84</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555D05113FEDCD174B864DFE6C363D64D8F0FEDDB93A0895D5951444A6FFC271DE0</stationID>
-+			<name>Derti</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555E3B5FBA84598C50E5D5AA5DEC44020AEF46F05CEA27B5962AF71A36302EB05DA</stationID>
-+			<name>Alpha Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355502E85E6E11163EC9CE92D641E96E23C2AB647D8F10E3C636572712FA388CFC59</stationID>
-+			<name>ΞœΞ΅Ξ»Ο‰Ξ΄Ξ―Ξ±</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035556B4FBBE8D6D94307A23452C23B7F1EF17470DEC6A261B1945480300877040849</stationID>
-+			<name>City 99.5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363391269EBCA96147929CD6EA80429E231A1F13C2AA9C45F1DDA930C0494BBF6F3ECC49</stationID>
-+			<name>Ξ•.ΑΑ. ΔΡύτΡρο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035556B5F9C8F7B4D768DCA637C204F25F1E298E6A404C7A97091261CDE9D4052451A</stationID>
-+			<name>Σκάι</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035553183FA84CE18D387CB46EBF5CC16505D39F9FF616AFAB34D809FBA59005473F8</stationID>
-+			<name>Αάδιο ΞˆΞ½Ο„Ξ±ΟƒΞ· (ΞšΞ±Ο„Ξ¬Ξ»Ξ·ΟˆΞ· ΝομικΞ?Ο‚)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363392215C1075EAAAAF5F8B68DC241DC64B73E74F8CA31C80B8CC5CDAA5A6FFA831CCE6</stationID>
-+			<name>Ξ•.ΑΑ. Σπορ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355546A9DBD579719C3F103D9BCD58C4A4A93E7EE0081B3878770CA4FBAAC69104B8</stationID>
-+			<name>ΔίΡση</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123633930939349E99E1583D905411E3A26A9F7A0F3B1854E36D8DD0ABD9D7ECF27C92A79C</stationID>
-+			<name>FM1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035550FB3D1826ADA343C62F12E359EC478299C150CAF5EB77600601A693C9AFEEA7F</stationID>
-+			<name>Ξ•.ΑΑ. Σπορ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035559F6943BECB480619307FB7846D0D6049CE6B63871E531C04D89126A9A0BCBEE9</stationID>
-+			<name>Sfera</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035553E482A95AA9987C3A13DD33143C23B73E7FFB25AA030805EFA54EA35F608B45A</stationID>
-+			<name>Nitro Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123633941752D1852572742677A43F7BBC58123BADEAC534375869AB801E5AEA35D3E27A54</stationID>
-+			<name>Ξ•.ΑΑ. ΔΡύτΡρο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555F437335446AED229C9B7173F51FE17C07E4E0BB2B9FFEAF9184B419391B80F27</stationID>
-+			<name>Αάδιο Αναγέννηση (Blackman)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035551465037E37D37C8643099BA790C9517BF50876E67333AE6F6013D7748AEA8299</stationID>
-+			<name>Sentra FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555BC9F9CFAF5E21430C6527BEAF2FB64E7C057ED24F1B6BAEFC4ECCD1FFBD55BF8</stationID>
-+			<name>Ξ•.ΑΑ. ΔΡύτΡρο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035555742A6CD0D32F6B7442B4F64A76D0F640673125BCC3D244B89C279B57C8020A3</stationID>
-+			<name>Παρέα FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236339576168E8F86D1EFEB569EC1BE7E8B9076FFE2DBEA320C1E10E46035FECF489C55F4</stationID>
-+			<name>Radio Laikos</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035552826561E0029161F6A503930BA1F6C47201A6E3C68D154371F54D64DC93204CD</stationID>
-+			<name>Athens International Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355532218320A3836943AEE9715736B1A30E09E8D04FCFF0E41E3325B8E57681C32E</stationID>
-+			<name>Shock Radio/Paradise Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236339857FD45FB7C8BF3CD34E2A81D8DDC0A4C533F9312A346A9E948CB848A1636C2AC2B</stationID>
-+			<name>Styl FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555B3AC4C4846304D7D5CB88AD564C7B9291D4119031D5D5B8B085251AF8E3EE4A7</stationID>
-+			<name>Atlantis</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355529017C5A217A450030806F0667B6AAE22A3D609C5A643A0E7AAAEC4CEC2C0938</stationID>
-+			<name>Στο κόκκινο</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555C56B7569D58DAFEEEBC35636A57418EA19C6C6487DDEF05D6E7FE9AB48222330</stationID>
-+			<name>NET</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355564CE6CC7B5934E7C847A55C2E13AE83F870C4DE984DAB56C100FE7D3F31C7D0E</stationID>
-+			<name>Mad Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236303555EA609BC93A37A5207464F74D75118039B2D584CE6452D6698CEBA61AE028C294</stationID>
-+			<name>Αάδιο Ξ‘ΟΞ³ΞΏΟƒΞ±ΟΟ‰Ξ½ΞΉΞΊΟŒΟ‚</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363404362D264AEDDC91C1E2A212597D78ECAE4C633315101C2D1C96789CD265CC45C9E9</stationID>
-+			<name>Digital FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035553FC9D2C8AAF40C2FFDBE37510033B111AD1B323C66ADC3F0019DDB838EDCA999</stationID>
-+			<name>Kosmos</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123634057618FA5E35E2D3FD8BD5242DC258A594E14B15F717CB25EA5F2890892747DE622F</stationID>
-+			<name>Blue Space FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12363035556CEBBE420E1068460097F219C8A46A51A6ED734B28FA9644F3F85F64A1D8D923</stationID>
-+			<name>Ακτίνα</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123630355527CE70F600EEEF1844A053FD3A3E2635FB28AA296D8D8B180AB413D3158329B7</stationID>
-+			<name>Ξ—Ο‡ΟŒΟΞ±ΞΌΞ±</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>108</frequency>
-+		</FrequencyRadioStation>
-+		<InternetRadioStation>
-+			<stationID>1246530641771960F6E09566E2D1FC981BA989DB7371D1C962E23D5B859B78ABB9E60A</stationID>
-+			<name>NME</name>
-+			<shortname>NME</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<url>http://shout.astream.com:80</url>
-+			<decoderclass>mp3</decoderclass>
-+			<playlistclass>auto</playlistclass>
-+		</InternetRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,243 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Kotorkis Constantinos &lt;kkie68@gmail.com&gt;</maintainer>
-+			<changed>2007-04-26T19:30:02</changed>
-+			<country>Greece</country>
-+			<city>Kastoria</city>
-+			<media>antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407E05886942B080C70E9095C4F9EF8862C65C78A24F00C860909A8F2DF1D8E4276</stationID>
-+			<name>NET</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854072B0E0DC480808BDB1B13DE7C9EAD8922118AA2308E8EAE5734F497B27D0E5CA4</stationID>
-+			<name>Kastoria FM</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407BAC77165139F07C89AC054801FFCC28D35D934283F02B9BCED437CEE6AC0714E</stationID>
-+			<name>Star FM</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>90.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540734A200C587C92B80A77C200463AB2E267EC19752C4A9437DEB5F536717B94D20</stationID>
-+			<name>Second Program</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540752061A546AA001A586665BCB54004C1C1347298E7283572C82D64949DBE9C957</stationID>
-+			<name>Radio 1</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854076453138F76391F38AB129A608316C5D09E32485167705CA7955F77678A2940A0</stationID>
-+			<name>Kastoria FM</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407C1E6152C11A5C05EC1A9B26344BC96855CB5499B0FE9A34778570B790E42D350</stationID>
-+			<name>Love Radio</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854074684F1C732220572385076AA324545DAA6F665760E56C87A810D7993A286798F</stationID>
-+			<name>Radio Galatini</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>92.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407C2FDA891449DE0C03E5E7932F799722FAA4FF13B03CBE4C99A0917B6C7ADD6DB</stationID>
-+			<name>Radio Kastoria</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854075A7010C56169D354DA3EF48A44A96CD0A0D0E37B3901BE8D3BB0A8C463EFC47B</stationID>
-+			<name>ANT</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407DE46F8206EF76187D23429152202A1B933189E4B1058E32A2F9B4CA7633CAC14</stationID>
-+			<name>Church FM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>94.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407B76A1FDD10FBFF5530744D064D6BAA8B830B25EF0A574F0392AA52CC9B12C6E8</stationID>
-+			<name>ALPHA - Kastoria</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407B364D20C095E208175C40582AF362B2AFF3BA446358B43A75D885C7089181318</stationID>
-+			<name>Radio Top</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407925B3F89E35DCA26D0FDD23B201FB3B5D913150A0B2ED13406D4550A8F225EE7</stationID>
-+			<name>FM 95.7</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540763F9B74ECB3A3738307E1F8CAC58922C79D914D1A19D9DE507FB9F0AF73D481F</stationID>
-+			<name>ERA Florina</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407BBFCDA7EEB359F7449A9AB09788E3B61611A75A52A0132D62A97345D4AE5120E</stationID>
-+			<name>Radio Argos</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>97.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407EC895CE1ED4BA554256C9675503A14AE0A16204C31C96D1EF8DA5F5EAE1CDCE4</stationID>
-+			<name>98 - 0 FM</name>
-+			<shortname>17</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854073984D438913EB6D843C930D9E3C759F66D5D6844F62CD0B9BC13DE9D088D0E06</stationID>
-+			<name>ALPHA</name>
-+			<shortname>18</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407B773C66DE987BF3F6C54397272705D41947595F1627E186C69EC4869070517B5</stationID>
-+			<name>Astra</name>
-+			<shortname>19</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1097440937C315B67747A306C466CCCF55B8F055176DFD6A2061AADC235FD95FE5259545E3</stationID>
-+			<name>ERA Kozani</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540776AB993148427CF32961DF65E082B3746EE579B7F51228015D2C0AFEE5FE3B18</stationID>
-+			<name>Energy FM</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854072EF5E4D39CD2686DC398799C6BC06B33C6CF5AF8F49EF08AB2DDE87A1DF28CB5</stationID>
-+			<name>Melodia</name>
-+			<shortname>22</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854070216B895699C7066D736450D9AB7CE21915CEDEE4160943B05558B7DCA595F8B</stationID>
-+			<name>Radio Contact</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1177228968EE49047C34766F31EBA3CBC70B260C51795FF804520F3673FA4D31D60C29C5E5</stationID>
-+			<name>Siera FM</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1177228975E0F618803191F64E0F240EA42E64C2FE3CAF4220B5381EBF53F5C2DA7BF44774</stationID>
-+			<name>xristianity.gr</name>
-+			<shortname>25</shortname>
-+			<icon></icon>
-+			<volumepreset>0.7</volumepreset>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am kradio-3.5.13.1/kradio3/presets/greece/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/greece/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,13 @@
-+SUBDIRS =
-+EXTRA_DIST = "athens2-antenna.krp" "athens-antenna.krp" "kastoria-antenna.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/"
-+	$(INSTALL_DATA) "$(srcdir)/athens2-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/athens-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/kastoria-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp
---- kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,144 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Zoltán Kukk &lt;kukkzoli at freemail.hu&gt;</maintainer>
-+			<changed>2007-01-03T21:00:00</changed>
-+			<country>Hungary</country>
-+			<city>Bodajk</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167850373C82402EA2D65E2EF47C5AD84039FCA74B2C9606BDA3149E6D6BDF7FBE95D063E</stationID>
-+			<name>Juventus rádió</name>
-+			<shortname>Juventus</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167850406B8127A80BD8BD2C586FD1631292311B0CED2324E69418EC01B0557B9968CACAC</stationID>
-+			<name>Ezerjó rádió</name>
-+			<shortname>Ezerjó</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167850435CFAC2599DDD436BF567F4271775919A5B073D86F44E1F4060A7C28B8F0F6A2F2</stationID>
-+			<name>Danubius rádió</name>
-+			<shortname>Danubius</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167850498CCFA6F317518BF91DF109749ECB2DFDB6E9EC8166C0A969B744DAEEF6ACF8242</stationID>
-+			<name>Sláger rádió (Budapest)</name>
-+			<shortname>Sláger</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167850855354EC11F0524A66B56EBF339D03E94CFEACCF7CCD5321509F1FA04047EC4AA7D</stationID>
-+			<name>Sláger rádió (Kabhegy)</name>
-+			<shortname>Sláger</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11678510534FA202C2D87C91BABE55195F61FCF266513D3FDDD4FD825E1531ABA688DA9176</stationID>
-+			<name>Kossuth rádió (Budapest)</name>
-+			<shortname>Kossuth</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167851116A73EED2A8825C4D7FDB0CF782E800B989D0AE371B5B0DCD7DE29C0B9A3E729ED</stationID>
-+			<name>Kossuth rádió (Székesfehérvár)</name>
-+			<shortname>kossuth</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116785116398AF0022838BE746A818A591D40E0724E64E12194140D15BBD54A164999C2128</stationID>
-+			<name>Petőfi rádió (Budapest)</name>
-+			<shortname>Petőfi</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11678512258B63DE67579D3C8A129EDBCC01F899B13BBBE330F0A9639354957A85A7EFA3E0</stationID>
-+			<name>Petőfi rádió (Kabhegy)</name>
-+			<shortname>Petőfi</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116785126176BD6278000E1B61D6456B665421F90C2399723E2FF720C6A422748F6B10086F</stationID>
-+			<name>Bartók rádió (Budapest)</name>
-+			<shortname>Bartók</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11678513005B487EEA72C73F5C6C68C219F140943028F878063E44F6DB114EFF24F51C60A0</stationID>
-+			<name>Bartók rádió (Kabhegy)</name>
-+			<shortname>Bartók</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167851614C4E8169C6CBA010DE341C04C2945D0F372DBCE50FDF23A6EAFA8BFE50ED1AF72</stationID>
-+			<name>Fehérvár rádió (Székesfehérvár)</name>
-+			<shortname>Fehérvár</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11678516557A409DB4975E5AFCF59176FAF534BAEFC5AB5AE0828EA0F3EAB932A502D26F02</stationID>
-+			<name>Vörösmarty rádió (Székesfehérvár)</name>
-+			<shortname>Vörösmarty</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1167851693B85F04BD653789133040263C907C468621EA5E96E1546A763B543243B3BADA55</stationID>
-+			<name>Rádió 1 (Székesfehérvár)</name>
-+			<shortname>Rádió 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,14 +1,16 @@
- SUBDIRS =
--EXTRA_DIST = "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp"
-+EXTRA_DIST = "bodajk.krp" "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/"
--	$(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bodajk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp"
- 	$(INSTALL_DATA) "$(srcdir)/budapest-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/budapest-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,66 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Sveinn í Felli,
-+&lt;sveinki@nett.is&gt;</maintainer>
-+			<changed>2007-09-19T16:06:04</changed>
-+			<country>Iceland</country>
-+			<city>Akureyri</city>
-+			<media>Antenna</media>
-+			<comments>Skýrustu stöðvarnar í Þorpinu, beint á móti
-+Hallandssendunum og í sjónlínu við
-+Vaðlaheiðarmöstrin.</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1116455444C0A53C88CF0B0CDA23B95FF522492EDC8D85A8A49E1FFDEC642F996299EBB966</stationID>
-+			<name>12spor AEY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>111645544483CB529B5F78FB43D62D676F8E160605DDB4EF2740153A1C170D9E77B153CEB7</stationID>
-+			<name>Talstöðin AEY</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1116455444EF6B983A00E17071CFDECD828F1BDC0B8D79AAEA6B7070982F29B978DAAAA2E0</stationID>
-+			<name>Gamla Gufan</name>
-+			<shortname>RUV</shortname>
-+			<icon>/home/sveinki/Documents/mnt/myndir/Skype
-+Pictures/ruv0.jpg</icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1190205101A69868A03E013E9129D67A1A2C905B0269D0F028844017DE11058713DB990936</stationID>
-+			<name>Bylgjan AEY</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7504</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11902051081962E6F35CE1BCF2BC88F69F37181A8D9D354ACC18945492247F99F3C75D886B</stationID>
-+			<name>Raus 2 AEY</name>
-+			<shortname>R2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.5256</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,10 +1,11 @@
- SUBDIRS =
--EXTRA_DIST = "reykjavik-antenna.krp"
-+EXTRA_DIST = "akureyri-antenna.krp" "reykjavik-antenna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/"
-+	$(INSTALL_DATA) "$(srcdir)/akureyri-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/reykjavik-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp"
- 
--
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,90 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>R Deepak</maintainer>
-+			<changed>2007-03-31T18:43:18</changed>
-+			<country>India</country>
-+			<city>Chennai</city>
-+			<media>FM Channels</media>
-+			<comments>All the FM channels in Chennai.</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>11753445936E9E0E3CB2F8B796DA65739E538B78054D02FC4FF552D5AD5322BF9096662427</stationID>
-+			<name>Suryan FM! 93.5</name>
-+			<shortname>Suryan</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>117534478397469F0EE509B25EC447D0FB792BAD25C215AC5030FCE0A5526753581D51EE8A</stationID>
-+			<name>AIR Chennai! 106.4</name>
-+			<shortname>AIR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11753448532F6C07DB566ADC38950FBEFE3BA1B7A17C67588FCFE42ECF91EBC93060C5484E</stationID>
-+			<name>Radio Mirchi! 98.3</name>
-+			<shortname>Mirchi!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1175344609AEBF26E4585D6BB9451B35A6B79D28D60BB45191557CEABE2B70DE9B73286723</stationID>
-+			<name>Hello FM! 106.4</name>
-+			<shortname>Hello</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1175345266393FFD660E04396BD99D66EF2B285E20CFEE6F34EC7C1D76D6CE7CD5678A5A99</stationID>
-+			<name>Radio City! 91.1</name>
-+			<shortname>City!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11753453722D6047CF4D052685FF27306A5E4EB1D199E8F73B96D8F6FF98D2ECD83377B214</stationID>
-+			<name>Aha! 91.9</name>
-+			<shortname>Aha!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1175345415AB9DF01C90B137E3F59A6D461167A3DCA48358E634B8018ACB4302D67004B137</stationID>
-+			<name>92.7</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1175345458D724DBB612353F3FEE62EF46FDF1262938FB884B7DB68746D40ADB11E4B44824</stationID>
-+			<name>Radio One! 94.3</name>
-+			<shortname>One!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1175345587560034B04EDFB7D495329917971B0D575ABA42943DE907244C2712EAFDC58C7D</stationID>
-+			<name>All India Radio 105</name>
-+			<shortname>AIR 105</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am kradio-3.5.13.1/kradio3/presets/india/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/india/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,9 @@
-+SUBDIRS =
-+EXTRA_DIST = "chennai-antenna.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/india/"
-+	$(INSTALL_DATA) "$(srcdir)/chennai-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp
---- kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,239 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Gabriele Armao - &lt;armao@cs.unibo.it&gt;</maintainer>
-+			<changed>2006-10-04T19:27:15</changed>
-+			<country>Italy</country>
-+			<city>Bologna</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1159867796E4871EB13C28A4A30D192702AE16A05157116050944CD6793E90BF9431658294</stationID>
-+			<name>Puntoradio</name>
-+			<shortname>Puntoradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867800ACD74C759A92F0A0145B76486A9BA709640E3C8F5E09F4AA2349729389715EEB</stationID>
-+			<name>Radio 1</name>
-+			<shortname>Radio 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5252</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598678056B10C8341D5C385A6E8083B51B686CF65A96E423BB96146AB0EBB15F12EBAEAA</stationID>
-+			<name>Radio 2</name>
-+			<shortname>Radio 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6753</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867815F32674A7E6FCF9D777C56835DE55FD2EF382991E57FA34D17B6084D8AE6A96DA</stationID>
-+			<name>Radio Gamma</name>
-+			<shortname>Radio Gamma</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115986781556CB6407ED08D4399F2B64B0D712DF67904FE87E846290502F5E7D29F74273D7</stationID>
-+			<name>Radio Company</name>
-+			<shortname>Radio Company</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.3755</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115998100090243491D552054F89D8AE7CC4C1BBB8E5A75979E8623EDCE4B4FA88E66F5259</stationID>
-+			<name>Radio Città del Capo</name>
-+			<shortname>Radio Città del Capo</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867821D06CE1DEFACAE89FA611D6C23F51494EF2AA0E9644A204A103574E4246A500F4</stationID>
-+			<name>Radio Nettuno</name>
-+			<shortname>Radio Nettuno</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867823CDAAED89B09854AE271D642C9CA742EEAD75D17800B0139C21BA29E8C3A48F45</stationID>
-+			<name>Radio International</name>
-+			<shortname>Radio International</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.5756</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867824DFE7DA44AA821CEF20013FB9698274C644DA33DCFCDB594271F69B9B7B21782A</stationID>
-+			<name>Paneburro</name>
-+			<shortname>Paneburro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598678290325C9320F5DE2D693129FAD419939421E812A1C96B5A41EF5DCFC3951EC0B15</stationID>
-+			<name>Playstudio</name>
-+			<shortname>Playstudio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159981753D8BD52A46D7EAFD830788FE999D83B1A3CBF25070AED7694DA606FFFC5359D60</stationID>
-+			<name>Radio Deejay</name>
-+			<shortname>Radio Deejay</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159981844BCA202D2B3664A3DF04F9A5B0CC018D76C0BF6D378608CD6A7CD5198C44896DA</stationID>
-+			<name>Radio Fashion</name>
-+			<shortname>Radio Fashion</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867834C67A4C4EFF36BBBA44B89F4EEFA5A0FDA68318BE7C332940741BE05CC9FC4E02</stationID>
-+			<name>Radio Maria</name>
-+			<shortname>Radio Maria</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867835AA567DCB00F1CDA9CEC1D422F70EBDA6D4F7DA7013A2BCC645F4B8AEEEC9BFAE</stationID>
-+			<name>Radio Monte Carlo 2</name>
-+			<shortname>RMC2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115998202597FB17CD324D30D4365EBFAAB74C28DB868BB8D425D1D730113AB84587524351</stationID>
-+			<name>RTL 102.5</name>
-+			<shortname>RTL 102.5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159982065046E122F7603346855EF8A55392F69BAFD8A73FA43B2C1A7CD10325A2E7F75DF</stationID>
-+			<name>Kiss Kiss</name>
-+			<shortname>Kiss Kiss</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115986783739E74C73DCAE72789AB048FB7551DCB819C63A7F1870A746B08AB62F3BE80B2C</stationID>
-+			<name>Radio Anni 60</name>
-+			<shortname>Radio Anni 60</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.351</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115986783967AD82D48D91060A6D094CC266C7B84667EE0219D268835AD5B65A9E7B835DC0</stationID>
-+			<name>Radio Bruno</name>
-+			<shortname>Radio Bruno</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11599822368F30FEE3569AD480E8E9EDDC59E3ADB3F077542FD82BED3B147C62ACF47268AF</stationID>
-+			<name>Radio Città Fujiko</name>
-+			<shortname>Radio Città Fujiko</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867840EC49187AF76B4CC4862BD711948CF56DB9FBCDB0040409329E5918F1C4FB9E8C</stationID>
-+			<name>Radio 103.3</name>
-+			<shortname>Radio 103.3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.251</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11599823610B03AD0A2BA306E94007E0E548C1FDF3F7A2960FA9E2F745A08C80CF286FEF31</stationID>
-+			<name>Radio105</name>
-+			<shortname>Radio105</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867842CC2EB15567BD3B2BB8167B7D0A467877326888C087BE7FE78FE8826CDB70FBB7</stationID>
-+			<name>Radio Sabbia</name>
-+			<shortname>Radio Sabbia</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.976</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598678446057BC4116C3FD33AF7BAF73951B6DAEE334DC8A35311D6952232AC131AB86D2</stationID>
-+			<name>Radio DImensione Suono</name>
-+			<shortname>RDS</shortname>
-+			<icon></icon>
-+			<volumepreset>0</volumepreset>
-+			<frequency>104.501</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115986784537E07F9C327005C0DB00C6D1BB6749175482EB87FE5C7DEE67AEDEC6EAB06921</stationID>
-+			<name>Lattemiele</name>
-+			<shortname>Lattemiele</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.026</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11598678482059D4D5764000004CF5FD49E8796D8E1E1B5DA24CBAFB3670FCBC1F9D644FFF</stationID>
-+			<name>Playradio</name>
-+			<shortname>Playradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.076</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867850B8776E8E5D779CC8EC9CD4FBEF53C3A6CBDBAB1049FBC64455B0BA3222B9B964</stationID>
-+			<name>Radio 24</name>
-+			<shortname>Radio 24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.001</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867852D619DE2433296B2FD51950E7A1F34D750801F1D90BBEEC2750851A9166F65C0C</stationID>
-+			<name>Lattemiele</name>
-+			<shortname>Lattemiele</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.526</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1159867853CCFF791DEAD366D390AB80F332149BE5523826D5927A027319AABD4A118FFCF2</stationID>
-+			<name>Radio 101</name>
-+			<shortname>Radio 101</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.951</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am kradio-3.5.13.1/kradio3/presets/italy/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/italy/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,14 +1,17 @@
- SUBDIRS =
--EXTRA_DIST = "bologna.krp" "rovato.krp" "torino-antenna.krp"
-+EXTRA_DIST = "bologna.2.krp" "bologna.krp" "rovato.krp" "torino-antenna.krp" "trento.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/"
-+	$(INSTALL_DATA) "$(srcdir)/bologna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/bologna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/rovato.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp"
- 	$(INSTALL_DATA) "$(srcdir)/torino-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/trento.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp"
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp kradio-3.5.13.1/kradio3/presets/italy/trento.krp
---- kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/italy/trento.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,367 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>ClaudioFior</maintainer>
-+			<changed>2008-02-23T12:21:33</changed>
-+			<country>Italy</country>
-+			<city>Trento</city>
-+			<media>Generical commercial radio</media>
-+			<comments>The first private radio for audience</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037788327C5000A1E1C3107F31D06EE254802E7FE64344B8508BD16B33321349F935F092</stationID>
-+			<name>RTT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037784512E058DF3EB180F961037205703CFA3E43AD176232529B6F7A694C83C90133064</stationID>
-+			<name>Radio 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037783990F5404D815267E1CEFBEBD2AF561F18B4AA33DE9DBC766067B0BE8A04398B6EA</stationID>
-+			<name>RTT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203778152A526CCA7DA26245392806D9EEBC290A91EEC1D318C9D80F87BE2F00C41B8B27C</stationID>
-+			<name>Radio 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203766148E30AA19F10875C0E4491222EF1665EFFC0D39FD585D8A7867309FD8AE02D2E13</stationID>
-+			<name>Radio Italia</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203765566F4E2677160964DE0F02C40E19C974AF24CA370A5497DC8684CDA0971F1565234</stationID>
-+			<name>Radio Italia Anni 60</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120376511549E6B71A3CE890F8B8676EEFD32C390819740918C2141BA47DD3150368D636E3</stationID>
-+			<name>Latte e miele</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.05</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120376467696B11D09DBAE0D31FC25BC86C345975673125B1C3E0DE0962A9CDB822548D482</stationID>
-+			<name>Radio Maria</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1195497782E78C6F58B61A33B081034F832CAF523A81F48BB5DD73D145CAE67C6D658F8E91</stationID>
-+			<name>Radio1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1195498225CD235FD6E77F1BB29DF7303459C6ED8F08603A713F988646EBE11998E54D4122</stationID>
-+			<name>Radio2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>11981031163FC9FCF9F8557F554E7B70F10ABD1D8709C53C0AB9932DC9352467EEC8C00603</stationID>
-+			<name>Radio3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>119810398361E8DC092D02E9643CA66BDCCC5EB080057E8BB1BF8534EC6FFE3277DB186A7F</stationID>
-+			<name>Radio Montecarlo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203150062CB034C1991734F1DC16A7F45C94824B25183111A6C807DE86FED49C10EB41DE9</stationID>
-+			<name>Radio Margherita</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203150356B2B3BF5088BF9B9224B6E44A13843E8D5FCCC9C9E6CD722DFBDEF67DB7B3D571</stationID>
-+			<name>Radio Cuore2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203150494711D017990E1A8C63D001A814F39BF5CD86E7FA27B31EA5B7832962E769FC1F2</stationID>
-+			<name>Radio Studio pi�</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120315071062B241694CA1A60BAE348E8EF398A0E787A9DCC3C217A146CC5BB5D063EADD92</stationID>
-+			<name>Radio Italia</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203153606B8A32AD018D71B5804D33FC84739B120ED1E04180E44E0234D5A200516DC3EE1</stationID>
-+			<name>105 in alta quota</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120315396131FC29130C20B77297DF7D1F37C78079FC106952987C864AE6D5F492AC1D6E06</stationID>
-+			<name>Radio cuore</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203154501D15FD503F381C2FEF7661D720D5F52963461D72CFA9FA21127CFA667CADF9A33</stationID>
-+			<name>Radio cuore 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12031568517DD2548E0946F0065974D5A21507A3E08350C7AA97AE0957D887E276AD99C019</stationID>
-+			<name>NBC</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203200613E74CEFC21DA7C4B61BC16A599C136A70D129B325476B181C2C1CAECF6556E90E</stationID>
-+			<name>In blue</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037568765ECB0C523B1E78437E39371DC85BC474862827FA874A2B15D66D1B352B10AB26</stationID>
-+			<name>Radio Dimensione Suono</name>
-+			<shortname>RDS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203757011E882BF401D989C42961F043F263E18467AECBB0A10E00652EDC1D82337D405D1</stationID>
-+			<name>Vergin Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037570988FB0B1EBE148AC82B42FB155E3429D704D950EE22ADDA71D55DB145A65CB1ABA</stationID>
-+			<name>Radio Dimensione Suono</name>
-+			<shortname>RDS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203757250F1C78881D6FF295D020E80C91C4AC8E56329C223B3F87837CE44E4C78D08CF0D</stationID>
-+			<name>Radio Latte e Miele</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203757675DF3EB701C74C7CF82B8B9173CEC28CB21C70F61A87CC91025EA6C021E3898B5F</stationID>
-+			<name>Radio Dolomiti</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120375786255B98C202F837DD293EEF55471EACA537B331E228B2EE835E494F4866C4E9A2F</stationID>
-+			<name>Radio Genius</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037583500BB86685BFC434BE7675EC38DD2E7604E0220C0DE8D1D65695A0E7B06378AD6A</stationID>
-+			<name>Radio Dolomiti</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037584063E07EC045C029EDBFE8499AC6E21E4342C33B8CF7C4824DD2DDA12A21C852D03</stationID>
-+			<name>Radio Genius</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>12037584836A28EE00AF9C12F3FAD88367F1DB27C939CE4DA444200AE57017191D0813614E</stationID>
-+			<name>Radio Capital</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203758731A214755DC7D0A2FEC3927765269DCE92958E7D5C3D83B8C884D9212621CE9644</stationID>
-+			<name>Radio Gamma</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203758996A5D1C5CF5289364B936E933C047EFA878B2663A679F56B0A8DE1DEEF029E5526</stationID>
-+			<name>RTL 102.5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120375929353FA1323BD876CCF878483DDE94B4A6AC5CDB97FC16B4C4CFE460C901B60CCCD</stationID>
-+			<name>Radio 24</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>120375997547B7A1EDB73B248BB273EB8CD513AC1D2B3C0DC882208B4DCEDE1CFB244DACE3</stationID>
-+			<name>Rete 101</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203761052A4C36EDEEE1E12F8452070F64678AD816B2E449E2C1B9D761A9644F7DB1FE18A</stationID>
-+			<name>Radio Radicale</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203761721500B262A77C5F20170FCE50704F412CB4C55AA7B7CAF552F636CD4E307A3FF4A</stationID>
-+			<name>Radio DJ1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.65</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203764354DE34015364D5C788E9EE6BB21CF1286AF4BBD7CCA54E4836D6536E5B8D68C3A3</stationID>
-+			<name>Radio Maria</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203764542A23343C3040B36F14B8B65AE6D8298113863B25247836B094DDC21E962A0279A</stationID>
-+			<name>Radio DJ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.25</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		
-+<stationID>1203764641F20C7E2AC6EBD257052162471AE4DEFD3773757B400E480176B471F07CEE6612</stationID>
-+			<name>Radio 105</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,12 +1,13 @@
- SUBDIRS =
--EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp"
-+EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp" "vilnius.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/"
- 	$(INSTALL_DATA) "$(srcdir)/kaunas-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/panevezys.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/vilnius.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp"
- 
- uninstall-local:
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp
---- kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Andrzej Valchik</maintainer>
-+			<changed>2008-08-27T23:00:25</changed>
-+			<country>Lithuania</country>
-+			<city>Vilnius</city>
-+			<media></media>
-+			<comments>Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12198672179D04D8F6F96417B40484863BE066FC65D89EB7336B216618B7319056873D6999</stationID>
-+			<name>Zip FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1219867219728EC984D598E6FC962752395F584B659E6D7C2DCF837FCE3C20951C5DD66969</stationID>
-+			<name>Russian Radio</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1219867220014EF13080BDD4E133C40C717013A6D0E184DED3CE7D49C820379D0F4ED69288</stationID>
-+			<name>Radiocentras</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1219867222255675B2B22E8A9936E9BCE61691DD75DCE674AE5CD3A0D1B83C717CB64D7FCA</stationID>
-+			<name>M1</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.801</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121986753461099673260F43AC1048500BA8CD6A48CE88E7C3655AC55029A0533699DEEE5C</stationID>
-+			<name>Power Hit Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121986760885465B9D5A74B4022D81F51C0478BAA1BF2E57D4C4A983FFB26616F66E28491A</stationID>
-+			<name>European Hit Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12198670760B330000E51F0F3617E1C73F67120DF45ACE16AB33D101129A0F65BEF43D2847</stationID>
-+			<name>Opus 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12198677026740FED9FAD2BC544E5FFDF0F11F5B9FCF3C84AE76210C237B238794FE3E35B0</stationID>
-+			<name>M1+</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp
---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,324 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Loes Alex &gt;alex@linux.lu&gt;</maintainer>
-+			<changed>2006-11-12T12:25:01</changed>
-+			<country>Luxembourg</country>
-+			<city>Esch/Alzette</city>
-+			<media></media>
-+			<comments>Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0</stationID>
-+			<name>S�dwestrundfunk 1</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359</stationID>
-+			<name>S�dwestrundfunk 1</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262</stationID>
-+			<name>S�dwestrundfunk 2</name>
-+			<shortname>SWR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E</stationID>
-+			<name>S�dwestrundfunk 3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808</stationID>
-+			<name>S�dwestrundfunk 3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08</stationID>
-+			<name>Classic21</name>
-+			<shortname>Classic21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343</stationID>
-+			<name>Premiere</name>
-+			<shortname>Premiere</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7</stationID>
-+			<name>Vivacit�</name>
-+			<shortname>Vivacit�</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6</stationID>
-+			<name>RTL L�tzebuerg</name>
-+			<shortname>RTL L�tzebuerg</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.9001</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42</stationID>
-+			<name>RTL L�tzebuerg</name>
-+			<shortname>RTL L�tzebuerg</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Oldie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Oldie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F</stationID>
-+			<name>BEL RTL</name>
-+			<shortname>Bel RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B</stationID>
-+			<name>Musique </name>
-+			<shortname>Musique</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85</stationID>
-+			<name>Musique 3</name>
-+			<shortname>Musique 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6</stationID>
-+			<name>DNR</name>
-+			<shortname>DNR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36</stationID>
-+			<name>DNR</name>
-+			<shortname>DNR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561</stationID>
-+			<name>100komma7</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.701</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0</stationID>
-+			<name>Radioara</name>
-+			<shortname>ARA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639</stationID>
-+			<name>Eldoradio</name>
-+			<shortname>ELDO</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.002</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C</stationID>
-+			<name>City  FM Esch</name>
-+			<shortname>City FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606</stationID>
-+			<name>Inter</name>
-+			<shortname>Inter</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F</stationID>
-+			<name>Radio Festival</name>
-+			<shortname>Festival</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9</stationID>
-+			<name>new station 9</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45</stationID>
-+			<name>Radio Latina</name>
-+			<shortname>Latina</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A</stationID>
-+			<name>Lokalradio Betebuerg</name>
-+			<shortname>LRB</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D</stationID>
-+			<name>Radio Contact 2</name>
-+			<shortname>Contact 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39</stationID>
-+			<name>RGL</name>
-+			<shortname>RGL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E</stationID>
-+			<name>Radio Belle Vallee</name>
-+			<shortname>Belle vallee</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF</stationID>
-+			<name>Radio Contact</name>
-+			<shortname>Contact</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA</stationID>
-+			<name>Radio Challenger</name>
-+			<shortname>Challenger</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890</stationID>
-+			<name>95,5 FM</name>
-+			<shortname>95,5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6</stationID>
-+			<name>95,9 FM</name>
-+			<shortname>95,9 FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7</stationID>
-+			<name>106,5 FM</name>
-+			<shortname>106,5 FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp
---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,324 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Loes Alex &gt;alex@linux.lu&gt;</maintainer>
-+			<changed>2006-11-12T12:25:01</changed>
-+			<country>Luxembourg</country>
-+			<city>Esch/Alzette</city>
-+			<media></media>
-+			<comments>Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0</stationID>
-+			<name>S�dwestrundfunk 1</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359</stationID>
-+			<name>S�dwestrundfunk 1</name>
-+			<shortname>SWR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262</stationID>
-+			<name>S�dwestrundfunk 2</name>
-+			<shortname>SWR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E</stationID>
-+			<name>S�dwestrundfunk 3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808</stationID>
-+			<name>S�dwestrundfunk 3</name>
-+			<shortname>SWR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08</stationID>
-+			<name>Classic21</name>
-+			<shortname>Classic21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343</stationID>
-+			<name>Premiere</name>
-+			<shortname>Premiere</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7</stationID>
-+			<name>Vivacit�</name>
-+			<shortname>Vivacit�</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6</stationID>
-+			<name>RTL L�tzebuerg</name>
-+			<shortname>RTL L�tzebuerg</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.9001</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42</stationID>
-+			<name>RTL L�tzebuerg</name>
-+			<shortname>RTL L�tzebuerg</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Oldie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL Oldie</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F</stationID>
-+			<name>BEL RTL</name>
-+			<shortname>Bel RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B</stationID>
-+			<name>Musique </name>
-+			<shortname>Musique</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85</stationID>
-+			<name>Musique 3</name>
-+			<shortname>Musique 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6</stationID>
-+			<name>DNR</name>
-+			<shortname>DNR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36</stationID>
-+			<name>DNR</name>
-+			<shortname>DNR</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561</stationID>
-+			<name>100komma7</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.701</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0</stationID>
-+			<name>Radioara</name>
-+			<shortname>ARA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639</stationID>
-+			<name>Eldoradio</name>
-+			<shortname>ELDO</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.002</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C</stationID>
-+			<name>City  FM Esch</name>
-+			<shortname>City FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606</stationID>
-+			<name>Inter</name>
-+			<shortname>Inter</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F</stationID>
-+			<name>Radio Festival</name>
-+			<shortname>Festival</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9</stationID>
-+			<name>new station 9</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45</stationID>
-+			<name>Radio Latina</name>
-+			<shortname>Latina</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A</stationID>
-+			<name>Lokalradio Betebuerg</name>
-+			<shortname>LRB</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D</stationID>
-+			<name>Radio Contact 2</name>
-+			<shortname>Contact 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39</stationID>
-+			<name>RGL</name>
-+			<shortname>RGL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E</stationID>
-+			<name>Radio Belle Vallee</name>
-+			<shortname>Belle vallee</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF</stationID>
-+			<name>Radio Contact</name>
-+			<shortname>Contact</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA</stationID>
-+			<name>Radio Challenger</name>
-+			<shortname>Challenger</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890</stationID>
-+			<name>95,5 FM</name>
-+			<shortname>95,5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6</stationID>
-+			<name>95,9 FM</name>
-+			<shortname>95,9 FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7</stationID>
-+			<name>106,5 FM</name>
-+			<shortname>106,5 FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,10 +1,13 @@
- SUBDIRS =
--EXTRA_DIST = "walferdange.krp"
-+EXTRA_DIST = "alzette.krp" "esch.krp" "walferdange.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/"
-+	$(INSTALL_DATA) "$(srcdir)/alzette.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp"
-+	$(INSTALL_DATA) "$(srcdir)/esch.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp"
- 	$(INSTALL_DATA) "$(srcdir)/walferdange.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp"
- 
--
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/Makefile.am kradio-3.5.13.1/kradio3/presets/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/Makefile.am	2012-11-30 23:52:48.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS = switzerland norway bulgaria new-zealand ireland sweden iceland italy portugal brazil germany russia catalonia usa australia finland lithuania england slovakia canada spain luxemburg turkey belgium argentina romania netherlands south-africa austria uruguay hungary poland czechia france
-+SUBDIRS = argentina australia austria belarus belgium brazil bulgaria canada catalonia colombia croatia czechia england finland france germany greece hungary iceland india ireland italy lithuania luxemburg netherlands new-zealand norway poland portugal romania russia slovakia south-africa spain sweden switzerland turkey ukraine uruguay usa vietnam
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp
---- kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,360 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Wilfred van den Assem</maintainer>
-+			<changed>2004-08-14T13:45:29</changed>
-+			<country>Netherlands</country>
-+			<city>Ede</city>
-+			<media>cable</media>
-+			<comments>got data from http://www.upc.nl/</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916D6D60211155A9867579BD00D8BAAB1B161379528845A471C2473820166ACE223</stationID>
-+			<name>Radio 1</name>
-+			<shortname>Radio 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916674F270FB0E48154D32C1348A18098757C8FBB5B2E6DD4DBE531C44F80E55850</stationID>
-+			<name>Radio 2</name>
-+			<shortname>Radio 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916521DF9F0D8CC313B63094A26C58A3EF43281F65F7405DC7ED9F250F50877E6A8</stationID>
-+			<name>Radio 3</name>
-+			<shortname>Radio 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916875497BD80A8B3EB56FDD97D8BCD15143EF3A7FB072C8B3AF77BFC9B8B077F41</stationID>
-+			<name>Radio 4</name>
-+			<shortname>Radio 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106176891671E2CAEA45B3503F03EC1C51826002CBD7B24604CA6379650E39A727905D27A9</stationID>
-+			<name>Radio 747 AM</name>
-+			<shortname>Radio 747 AM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106176891660FD79DFF18BF25EE5732FDAE5A7F4DE53C34511719A9D9A192A52FCDAB424FB</stationID>
-+			<name>VRT Radio 1</name>
-+			<shortname>VRT Radio 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161153582384EAC06B0BE166AB53A183932FF5B20B5E78210FDACD304E3E73F651DCD3C03</stationID>
-+			<name>VRT Radio 2</name>
-+			<shortname>VRT Radio 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689169CF30DDBE712348BEF827B9C3992B2E4761C7BE090E611BA3F3639F4C1B9ED68</stationID>
-+			<name>VRT Radio Klara</name>
-+			<shortname>VRT Radio Klara</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116115361665D32BD758259F77358067404F00097689E170441AE61F4A31352285D328250E</stationID>
-+			<name>Radio Oost</name>
-+			<shortname>Radio Oost</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161153652CCFDA5E3632D597D89537123A32442359230A708945E6893FC34A713DAF3CFB7</stationID>
-+			<name>Omroep Fryslan</name>
-+			<shortname>Omroep Fryslan</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916CCBEFA171CFA37C0C9504D15C9E5D25D4307FAB210169CE31D93B3EC2639EFC1</stationID>
-+			<name>Omroep Gelderland</name>
-+			<shortname>Omroep Gelderland</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916DAD184A2F4074D993CBB883601E987A73B79E77DF27EC7B59BBE06D9E3F1C25A</stationID>
-+			<name>Lokale Omroep</name>
-+			<shortname>Lokale Omroep</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689169DB2EDD8EC100A91AEE995A3803046E75F4C2E9FD96C4A9F4F4E572ACFD76E60</stationID>
-+			<name>BBC Radio 3</name>
-+			<shortname>BBC Radio 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161153719E945B75BBAE2BE88E1D6708CA899C38812377F524084DC17799B28EF95A7449F</stationID>
-+			<name>WDR 1</name>
-+			<shortname>WDR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11611537345314B57844DCB83ED1854B2DD0AF2C0F35DE85056B2C31076E0C233C546ED8FA</stationID>
-+			<name>WDR 2</name>
-+			<shortname>WDR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161153750FEF87459094374CCA4D2C2D3184881B0E0490493088F22BF3F9EBA30857E4256</stationID>
-+			<name>WDR 3</name>
-+			<shortname>WDR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116115377178116A777931577FF53165625081CB5D288FD6584D5FDA80359B75305E9CE512</stationID>
-+			<name>WDR 4</name>
-+			<shortname>WDR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916B8192E1A210DEA36E235662832013CA5A99264A14A07BA0933F5079FA526A1CE</stationID>
-+			<name>Arrow Rock Radio</name>
-+			<shortname>Arrow Classic Rock Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116115335888BB7FB1792AB5778FA5020D15B6D27B83D36DA1707E3135AED4395FA4DC6DEA</stationID>
-+			<name>Arrow 90,7 FM</name>
-+			<shortname>Arrow 90,7 FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11611538298006F042F5BA4800CCB6E984D134258D0ED47B33E519D2D3E29AA1D3A138D734</stationID>
-+			<name>Het Gelders Geluid</name>
-+			<shortname>Het Gelders Geluid</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11611538849F64970DCE09509546044C9CA3819FF67DD1EC1EF0ECCE744D74D2E4F1C64E6E</stationID>
-+			<name>BBC World Service</name>
-+			<shortname>BBC World Service</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161153903EFD4B3ED578A480A62461EEBA0EABBE5603346C9DF183154881E81A7080A6F83</stationID>
-+			<name>BNR Nieuwsradio</name>
-+			<shortname>BNR Nieuwsradio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689169DB024ABAAA652F2C5476890B717855DBD52903DA0E0F5255A8E98AC2BB3E732</stationID>
-+			<name>Classic FM</name>
-+			<shortname>Classic FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689164394C7A3D38B4FEDE5625C2E7534ED6AD44B8EE956712A802388A26DB075E098</stationID>
-+			<name>Concertzender</name>
-+			<shortname>Concertzender</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916FC58F6080AA9D2E99E4EF096A27242230717633F27CEAD62834C228FEE869BCC</stationID>
-+			<name>RTL FM</name>
-+			<shortname>RTL FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11611539802AD1AF72DE7F31516F32690C20DF5CDFCBD9FFF73B11B5B7066A3F17EDEF95F6</stationID>
-+			<name>Hot Radio</name>
-+			<shortname>Hot Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161154009DFC37030D6C2614E5E925F3B92CA4F8987B0C6079BF0A79CA6C69D0810CE5DCA</stationID>
-+			<name>Slam FM</name>
-+			<shortname>Slam FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116115403704F8DC30EF1E672D16616263E4423BECE77A6247368F1003E605F23E3CADAB70</stationID>
-+			<name>Keizerstad FM</name>
-+			<shortname>Keizerstad FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106176891684678CE4B308A8A6F724F5C73506E16E27268EB819FC720AE7AD5B483473E4B6</stationID>
-+			<name>Kink FM</name>
-+			<shortname>Kink FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916248E70F2866B0754758FA4F16D395369F9B3550559E24A77C1B48B5C1EEB0684</stationID>
-+			<name>Q-Music</name>
-+			<shortname>Q-Music</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689161657EC736540B26C223EC40019E316770DD54F30EDD58351F305A7CCF58CF42E</stationID>
-+			<name>Radio 10 Gold</name>
-+			<shortname>Radio 10 Gold</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916495B2FFD8C70DEA15BCE8BCD882F1ECB21F05F8713D6610A04BE9690F59CD956</stationID>
-+			<name>Radio 538</name>
-+			<shortname>Radio 538</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161154174EE98D5510463A0C07109A56AD2303F0B1E6EC5A22EF3B9918775924D8921C7B5</stationID>
-+			<name>Radio Donna</name>
-+			<shortname>Radio Donna</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1061768916C3BBEBD88D7BE50E0D66854AAFC41402F07BCC2B609B8D70D7B1BE9E0551D162</stationID>
-+			<name>Radio Veronica</name>
-+			<shortname>Radio Veronica</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161154202F08ECD8CB447AAD23BB63C38C144E82BCC2C6258E4E774BEB0AC1E958B9945BF</stationID>
-+			<name>Rebecca</name>
-+			<shortname>Rebecca</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689165763D6C843F7F6EC887BCB341263385A26A6AF2E11CB926DE91932882C30DCF7</stationID>
-+			<name>Sky Radio</name>
-+			<shortname>Sky Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10617689166BA97C6B690CD30B8E86DA28E1B815A478FD6B58504AF435C114B2CFD4177318</stationID>
-+			<name>Yorin FM</name>
-+			<shortname>Yorin FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11611542299B25F62676B0D3F897FE54E785DFE3A527F5EBD866C1F49207CADEBF1A1EDB6A</stationID>
-+			<name>2e Kamerlijn</name>
-+			<shortname>2e Kamerlijn</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,30 +1,31 @@
- SUBDIRS =
--EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp"
-+EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "ede.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/"
--	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
--	$(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/alphen-aan-den-rijn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/amersfoort-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-+	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/amsterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/ede.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp"
-+	$(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/groningen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-+	$(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,104 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>rado-1.0beta3b</creator>
-+			<maintainer>Mario, &lt;mariuszwr@o2.pl&gt;</maintainer>
-+			<changed>2008-03-30T14:19:27</changed>
-+			<country>poland</country>
-+			<city>czestochowa</city>
-+			<media></media>
-+			<comments>antenna</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>109569822506C857816E13E27DEC856024B05151EB43DE1B656728CCA49EB2B9427D135846</stationID>
-+			<name>Polskie Radio Bis</name>
-+			<shortname>Bis</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1094719793C323351FB798EF728B232148DC066B49C9E7C8CF11D7F9AC32CBFF70F79F25B0</stationID>
-+			<name>Trójka</name>
-+			<shortname>Trójka</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1095697872BBA803C49A13E8248BEA59AEE7B241A7AC35BDAC2A07159E8935A7768571ED15</stationID>
-+			<name>Radio C</name>
-+			<shortname>C</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1095697962016FBF883B757A23FDD3AD28778C46353A6FF8D656EA6AE8A7377F44AF09B63D</stationID>
-+			<name>Radio Katowice</name>
-+			<shortname>Katowice</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>10956981207850CC6E93BB5799DE6342A15BCBBC2F6EA512A458D1624CFF503292FB19F94A</stationID>
-+			<name>Jedynka</name>
-+			<shortname>Jedynka</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109569817873B0C0A37E18F984E4D9CF9E9A9F2C7B3A48D230ADDEABD4DF0CFB7D4F220B79</stationID>
-+			<name>RMFMAXX</name>
-+			<shortname>RMFMAXX</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.55</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1095697990DB89F838E5B480B6023336F88A88670804126D366D2D42B241FB499AE0EDC18F</stationID>
-+			<name>Radio Zet</name>
-+			<shortname>Zet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1094719872EA2412A37C582F0EE766611FB36914F824B944B872DDD8D42DF884F1682F485B</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>105.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1094720563210A2A1BCA82A429BECEC40E1CC444660EE2B573EA7E032282B2B66E89A8B8A5</stationID>
-+			<name>Dwójka</name>
-+			<shortname>Dwójka</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>109569825516562B261D7E9C26E0DCA51E196A1F79A8B0AA5978B7D2AD4003D354DA8FB186</stationID>
-+			<name>Radio Fiat</name>
-+			<shortname>Fiat</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1095698040CF98DFCCAFF2E5690ED9E44F33E5F9DA2A96FF5FE1D6B81D5BFAA6A578E3791B</stationID>
-+			<name>Radio Jasna Góra</name>
-+			<shortname>Jasna Góra</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.55</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,151 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Marcin Dabek</maintainer>
-+			<changed>2005-05-02T12:01:20</changed>
-+			<country>Poland</country>
-+			<city>Gdansk</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>12215568287C61A88AEC8635FC5CCFF7171F303401B1DCFD2CA5CE3D81AA7F3224E90BC742</stationID>
-+			<name>RMF Classic</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>122155684736B50D0EAE6D579A11236D29B3B4469F8F9C1CDBEA36913DBD03F5FFFE7B1204</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12215568727DFE9D88CDC83160CCC15526A6CF26D8701917D5244503A3B7E285F14E141377</stationID>
-+			<name>Polskie Radio Program 2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1229710262F4878A7B00BE2D7F76D54B3BA03B9A47463EC5FD828B08F5D0BFA7EE0B966028</stationID>
-+			<name>Chilli ZET</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221556917BE7AC365D5DDF2C108946E1D0152AD5A703D3C68DA2DDBB40B911CBB6A6E693B</stationID>
-+			<name>Radio Kaszebe</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221556932BF6B314ECB047845EF8614D8B46B954ECD37DD45B8DF865F9743E15AF2D64CA8</stationID>
-+			<name>Polskie Radio Euro</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12215569572CE92640C495542FFB927F221407B75D9BF2555272C335DBA68110863E696996</stationID>
-+			<name>Radio Eska Trójmiasto</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221556988D9342A99AFC0B1A9E59692FC1FB6E06F164791963D1F5D88F9065195F35C37C6</stationID>
-+			<name>Polskie Radio Program 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557013882E0532BD346FFFD9A5EA1CD212D9C8E152E98DAB619AC6E927E7DDD1233BAB</stationID>
-+			<name>RMF Maxxx Trójmiasto</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557038E31C4C464C57757EB85F937BA47741C3B136900BD84054C1CE3452114747163A</stationID>
-+			<name>Radio TOK FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1219857722931B3EEF9145FBCFF13C6034AB67BA25D1207ADCA53F82364AA593224F7109CF</stationID>
-+			<name>RMF FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557083CE00FD4802E76A9C8E7FBF6379D9AC6BC454404BDCDD1E517F5BA60209B1D3DD</stationID>
-+			<name>Polskie Radio Program 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557119075B6D8D3C90DFC53DBEE7AD2FDA2B6B9D025437E41D40C49DB45EDE918430DC</stationID>
-+			<name>Radio Plus Gdańsk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557141040C86265FA2B11B772DB78368F5D3FFCD9A20DAEB3BA239B0D04864925CAACB</stationID>
-+			<name>Radio Złote Przeboje</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1221557171CAB3A2B6E4E3CAD3F6E293D318C15489374FF7EE504CB68DFAA2E08B704C14B7</stationID>
-+			<name>Polskie Radio Gdańsk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>122155719504D8B63D209DF87C9FAB419641D87FFED865596883C203FDDE6E86F663BEDC81</stationID>
-+			<name>Radio Eska Rock</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1219857671CD41C2FF7BAB36A8B4E4FCD5B5675ABC24E423D3DFE2705995D5719CFDDC022D</stationID>
-+			<name>Radio Zet</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,197 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer></maintainer>
-+			<changed>2007-06-20T00:25:42</changed>
-+			<country>Poland</country>
-+			<city>Lodz</city>
-+			<media>Multimedia_cable</media>
-+			<comments>Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11822951592B62AD0B29DA188FC37D5BC6DF251E8831E9B25E1B08D8217AC8C820314A5E87</stationID>
-+			<name>Tok FM</name>
-+			<shortname>Tok</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11822954375392ACECD74C5E8F829F49E89C6538C88A683A95FCB11D5E442DDD7B5EDD3841</stationID>
-+			<name>Polskie Radio BIS</name>
-+			<shortname>BIS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182295070AD54E88C72A2EA8AE4C3EFBDFEA8522D6E560D5FE3C8EC0371C49CA6E65BF29A</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11872808081B25C94B7555C7F8A4B9888E9AF25C6358CDF7F9B27C951BB0E9A7E7230BCFA8</stationID>
-+			<name>Sunshine Live</name>
-+			<shortname>Sunshine</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11872803804CA47D3949558F9F50EDC13DB1BE5D6067FE476C4C3A52378A7C2608AB8D9FDD</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>Klassik</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11872804261AA8FF934BC24FA59871DC47CCED08ECDDB0A9B5B16EB8E4208775A98DBA10F4</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>RTL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11822950461598E1CEBE4AD1116E623E7F82824779228D49FCADF3F6967F2D3A7C5A5E9DA2</stationID>
-+			<name>Radio Zet</name>
-+			<shortname>Zet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>118229530168E7CC202D9FCE6928BE23CD43DDEA8EBDED271636F820F3396FD86454CC3C5B</stationID>
-+			<name>Radio Z�ote Przeboje</name>
-+			<shortname>Z�ote Przeboje</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182294924AA0C337B114539C8878F2697138156C0DBD5AF8CB4E6BEDDEF2C6AB020BFC334</stationID>
-+			<name>Radio Pogoda</name>
-+			<shortname>Pogoda</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>118229190344092EF2F0D2AA89D78EF8CFE8A2BEFE42FAFAB2F4D9C2C57C6D54D384A366BD</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname>Maryja</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11822950051DEE65FC7A6D1FD85B2A696A21081EFAC6A3492731946B1B99E99C2F31FEF73A</stationID>
-+			<name>Polskie Radio Program 2</name>
-+			<shortname>PR2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>118728050865D611D8D6A580F01787B91B3C88FE6ED168D744FE6597A6A3832AC1C506CDA1</stationID>
-+			<name>Jam FM</name>
-+			<shortname>Jam</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182295497B82166CE2968E66B97BA2BD60C955F6076B475B0713DA5CFD1F3A855347991FD</stationID>
-+			<name>Polskie Radio Program 1</name>
-+			<shortname>PR1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182295121FE742DD14B3861BE7C0767ACD3C14BD1CEF344EC37AFCC8E69DB26C706202EB4</stationID>
-+			<name>Radio Parada</name>
-+			<shortname>Parada</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>118229519080D140BF6665ED6B0E319197C0796B202C344D457245805ADCA1A324BD6DB024</stationID>
-+			<name>Radio Eska Rock</name>
-+			<shortname>Eska Rock</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182295224A5CFF0376073A55D56260F2D0BDF72CC0D9E0CD0444C96E5B053B12352276040</stationID>
-+			<name>Polskie Radio ��d�</name>
-+			<shortname>Radio ��d�</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11872802306FD47B3725D04E5C840EA16346C835BE25A43B27AE9EA709ECCC5A60E400AC12</stationID>
-+			<name>Polskie Radio Program 3</name>
-+			<shortname>PR3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11822952706BCBA8B1F212D43FF9CD77304D15248CCBB36D99CBFE1717E6FC70B5328FB9AA</stationID>
-+			<name>Radio Vox FM ��d�</name>
-+			<shortname>Vox</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1182291526776BF1C96CE85AC3882781A6821B58BDA25507033F693A442094A1E6CF7B40CE</stationID>
-+			<name>Radiostacja</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>11872807143C41BCDB4450D8F024BB289D4434AB639B2C9BB430A5F37BE3CF44F40BACAEFF</stationID>
-+			<name>Eska ��d�</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am kradio-3.5.13.1/kradio3/presets/poland/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/poland/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,30 +1,47 @@
- SUBDIRS =
--EXTRA_DIST = "bialystock-antenna.krp" "elblang-antenna-fm.krp" "katowice.krp" "krakow-antenna.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp"
-+EXTRA_DIST = "bialystock-antenna.krp" "czestochowa.krp" "elblang-antenna-fm.krp" "gdansk.krp" "katowice.krp" "krakow-antenna.krp" "lodz-cable.krp" "nowy-sacz-antenna.krp" "opole-antenna.krp" "poznan-antenna.krp" "tarnow.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp" "warszawa-cable.krp" "warszawa-ursynow.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/"
--	$(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/bialystock-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/czestochowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp"
- 	$(INSTALL_DATA) "$(srcdir)/elblang-antenna-fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp"
--	$(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/gdansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp"
- 	$(INSTALL_DATA) "$(srcdir)/katowice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp"
--	$(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lodz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/nowy-sacz-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/opole-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/poznan-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/tarnow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp"
-+	$(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/warsaw-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/warsaw.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warszawa-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/warszawa-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,70 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta2</creator>
-+			<maintainer>Marcin&quot;WASYL&quot;Basiaga, 
-+WasylNS@interia.pl</maintainer>
-+			<changed>2005-11-30T14:36:51</changed>
-+			<country>Poland</country>
-+			<city>Nowy Sącz</city>
-+			<media>antenna</media>
-+			<comments>Contains merged Data</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1104422521ECAFDA4C92BFABDCA1C6CE092CD4E64C696A81194D6FE9F26DEF7D9999466F8E</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>103.196</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1104426638C6D4851AD1CE10470FBE94C2FFF50A6011843F618E3E5453686AFA1C1EB1AE23</stationID>
-+			<name>Radio Zet</name>
-+			<shortname>Zetka</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>97.796</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1104429437CB3574C52E0E9C7C5D92D4C557A2B457B005AE4DF83176CC2CD5F9E9DE65FD04</stationID>
-+			<name>Polskie Radio PR 3</name>
-+			<shortname>Trójka</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.796</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1104429442C8D842CAF84FE1C33EA30EC6CA2E7653E11E1C384D4EF4946409D66EB2334273</stationID>
-+			<name>Polskie Radio PR 1</name>
-+			<shortname>Jedynka</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>99.2007</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>110449736641CF389791C851CE7ACA60328CECD88E3722CC969EB7C3DF4ABA7DDEF7D86FA3</stationID>
-+			<name>Złote Przeboje ECHO</name>
-+			<shortname>ECHO</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.7999</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+		 
-+<stationID>1104849921CBBF6A08B9FF1C1FAE90125D357C387AB173C28038A02076EF970BB49C181077</stationID>
-+			<name>Radio Kraków</name>
-+			<shortname>Radio Kraków</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>90.05</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,100 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-snapshot_2005_11_27</creator>
-+            <maintainer>Krzysztof Kusiak, 
-+&lt;szyszart@poczta.onet.pl&gt;</maintainer>
-+            <changed>2007-01-24T16:57:09</changed>
-+            <country>Poland</country>
-+            <city>Opole</city>
-+            <media>Antenna</media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>1</stationID>
-+            <name>Polskie Radio Program 2</name>
-+            <shortname>1</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>2</stationID>
-+            <name>Tr�jka</name>
-+            <shortname>2</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>3</stationID>
-+            <name>Radio Eska</name>
-+            <shortname>3</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>4</stationID>
-+            <name>Radio Zet</name>
-+            <shortname>4</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>5</stationID>
-+            <name>Radio Z�ote Przeboje</name>
-+            <shortname>5</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>6</stationID>
-+            <name>RMF FM</name>
-+            <shortname>6</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>7</stationID>
-+            <name>Radio Maryja</name>
-+            <shortname>7</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>98.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>8</stationID>
-+            <name>Radio Opole</name>
-+            <shortname>8</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>9</stationID>
-+            <name>Radio Planeta</name>
-+            <shortname>9</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>10</stationID>
-+            <name>Radio Plus Opole</name>
-+            <shortname>10</shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.9</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-+
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,213 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0-rc4</creator>
-+			<maintainer>artur.zaprzala@gmail.com</maintainer>
-+			<changed>2009-05-23T11:21:38</changed>
-+			<country>Poland</country>
-+			<city>Poznań</city>
-+			<media>antenna</media>
-+			<comments>Na podstawie http://nadaje.com/miasta/Poznan.html</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1243073856B7CB5AE3A8DD7F64D99162701127E8EB17921157D47B4F1CD2C1B35300AC</stationID>
-+			<name>Radio Merkury</name>
-+			<shortname>Merkury</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1181345500C8D8A94219DBBC463934BEFA6CB0DAB24F33C6ABA71DFB08DF33AB483E441B55</stationID>
-+			<name>PR Program III</name>
-+			<shortname>Trójka</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243091725823AD6BA86EF676F69423FC8246C52646B4D3AC6A598D678C8FC8DECBA06</stationID>
-+			<name>PR Program II</name>
-+			<shortname>Program II</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11813450874FEFBFE9D9664744CED00CC429A41AF491A0F341950699E506F2833995048115</stationID>
-+			<name>PR Program I</name>
-+			<shortname>Program I</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>124307402214A45EF45919BAFF02EA193FD2BFD73C6A1489C197787A21C309564028FC</stationID>
-+			<name>Polskie Radio Euro</name>
-+			<shortname>Euro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>100.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1181310720D76397D1E0CE3FA017DE0FF960A280D3994F75AB6512563E93B6BCC932D2C33E</stationID>
-+			<name>Radio Złote Przeboje</name>
-+			<shortname>Złote Przeboje</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243092477BD500CBB54A00F1BBDEF4DD16A2F7E2EC9B6F8E2047E22A40611BCB7476D</stationID>
-+			<name>Chilli ZET</name>
-+			<shortname>Chilli ZET</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12430741057023A3CC5976ADC55C0E886946A60A4205CBF98A166CFC41C4CFEB8C198D</stationID>
-+			<name>Radio Eska Rock</name>
-+			<shortname>Eska Rock</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243073700ECE65C3E99B2CE8049C7498B1732137742C789DFC70A2113D921DBE69A02</stationID>
-+			<name>MC Radio</name>
-+			<shortname>MC Radio</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1181345133A04BF742C340E1FC6BDA16A09CF9612919DA70DDEA02798BD190B0F0762FB7C9</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11813451171B80122E5B2FC18587A666F545EBCA4E45F41A816A2C9FD381DA957E0188263B</stationID>
-+			<name>Radio Z</name>
-+			<shortname>Z</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>97</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243074060EBA788F812C95004302AB34F8D515473E912E93F3E6DC9006E712955F619</stationID>
-+			<name>Radio Z</name>
-+			<shortname>Z</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11813107167D3CC8996BCF9B44DDADB08B9AAE804FA337940B03AA28F18B2AB02E28CDDD51</stationID>
-+			<name>Radio Blue FM</name>
-+			<shortname>Blue FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1181345115714F0A6908202C3FE5BC5ED7D62A8B0A0DF97CFFCE612011CD1EDAF67CFC4AC2</stationID>
-+			<name>RMF MAXXX</name>
-+			<shortname>RMF MAXXX</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>93.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1181345101A37EB521C0D4DA7736962278AD3B3961D3DB8853572FD1AAF554A20C2D68B89D</stationID>
-+			<name>Radio Eska</name>
-+			<shortname>Eska</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11813451194A150D2B5165FA1DB1E53F35E32978BDBE46BAB7D4445AD3333CE5D7EC48095F</stationID>
-+			<name>Radio Afera</name>
-+			<shortname>Afera</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>98.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243092539C04A6CD4C5B25CD713CCD794592A56DE0274843B85D9FADA0064A9DE8456</stationID>
-+			<name>Radio Roxy FM</name>
-+			<shortname>Roxy FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243073918646EC6C3D2F64E7C33C1B2C375E6130AB50FFFB0CC15BCE2DF66E82F219A</stationID>
-+			<name>Radio Planeta</name>
-+			<shortname>Planeta</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>90.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12430739360FD65A37249E783AE38ED70BB151627FBE6B6CADDAF83EC4A4445EEACAFF</stationID>
-+			<name>Radio Planeta</name>
-+			<shortname>Planeta</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>118131069508E2B7F26DF1C5B1CE1A577EC08E051873B7C21C86B13ADBE50257B825F6C941</stationID>
-+			<name>Radio TOK FM</name>
-+			<shortname>TOK FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11813450899FC57789CC3A44DDAE5C22E6BB61251A7438BC16C1566D9ABA9C2A9EA5B27698</stationID>
-+			<name>Radio Emaus</name>
-+			<shortname>Emaus</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1243074085F655034EB7C8D95088C8A951706DA80D4DB373C89ED8DFA968CF396FDA4C</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname>Maryja</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>106.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,167 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Jacek Drobiecki, j.drobiecki@mwi.pl</maintainer>
-+			<changed>2006-08-13T13:05:16</changed>
-+			<country>Poland</country>
-+			<city>Tarnow</city>
-+			<media>antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>11554744911E6260E25520A4AF03462D1BF650D3A46C33D2DF18E13B711A0B093BD9B0C97D</stationID>
-+			<name>Polskie Radio Program 2</name>
-+			<shortname>PR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474531FC82F3BA0DEC16DE3BD16B08971EDE5158F6ADE06830918279C8ECB6418ADEA9</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115547460387D53144D776A4650C37E47E15D549DB99E130D7FF101CEABAE3B24887F22DE3</stationID>
-+			<name>Polskie Radio Program 2</name>
-+			<shortname>PR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474640001219B3008B89483DB18A6FF42AAD83D6707D0C985063B4E848D5731369B58F</stationID>
-+			<name>Polskie Radio Program 2 (Bochnia)</name>
-+			<shortname>PR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115547434749EC4CD78DAF20EF8E4B6E5333C45F003ACFBD12AE2C32298739B8B7DE02AF6F</stationID>
-+			<name>Radio Krakow</name>
-+			<shortname>Krakow</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474669C49CEC64EE4291EA8A8CEE82E09F00DEE28C746C3D111AABDF776A0168D0F773</stationID>
-+			<name>Polskie Radio BIS</name>
-+			<shortname>PR BIS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474725CCD85AFA6208AD4153E9335229304383B405A12BE66C7898150B48B976FC2EDC</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11554747499B0D4864A56811C0894BD0900CCAA7FD2505CEA0C5110492C072EE7A93A4947D</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474784D6818BED1604A6E700CF77A5403ADE565C559553F56FFAE046586F7BEF76B2D8</stationID>
-+			<name>Radio MAKS</name>
-+			<shortname>MAKS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115547481284433E6F0785342958176E418F731D56E1BDB9A28A6CBFAE1278B26BAA3BBC8B</stationID>
-+			<name>Polskie Radio Program 3</name>
-+			<shortname>PR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474827CDDBE861AEF4E59966935D8DE6DD1534825BF9877CFF5467F78F2A2161669997</stationID>
-+			<name>Polskie Radio Program 1</name>
-+			<shortname>PR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115547485978A3B6D7231EB91CB3E4FBD591C21233389FD21B0F23CD69DDD81063B7FA920F</stationID>
-+			<name>Radio Krakow</name>
-+			<shortname>Krakow</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474884CD983E4A9E47EA99CD475E1287382B5B43A8B9971F26AA5725D15601D075ABF9</stationID>
-+			<name>RDN Malopolska (Nowy Sacz)</name>
-+			<shortname>RDN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115547489596B110A4C03019FF4EE2856C2E1110DDD10E37BFEBD32D8AB2F2EBE2472E76D1</stationID>
-+			<name>Radio Krakow</name>
-+			<shortname>Krakow</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11554749149AE9DBE9A8C74D5237F782051EEDB4417F3D784F19323506F3DDCF2FB48609DD</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname>Maryja</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474928C7C7EE5700DCEC117911DD5E0424E053B50A99FDD440B9825AE78B530A824B07</stationID>
-+			<name>RMF FM</name>
-+			<shortname>RMF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474940ED3934C9676750AB9D3BA445FDF5E129BA3663825AA3C85476F8C9878ABBAB9D</stationID>
-+			<name>RDN Malopolska</name>
-+			<shortname>RDN</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155474965831D096128378DE1965F5323CF342B7058B96847CA59CF9905AD7760B68CAD35</stationID>
-+			<name>Radio ZET (Krakow)</name>
-+			<shortname>ZET</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1155475014BBDCB24424B44D1097D4B2D69580AAD5AE0A045EFC0FD28813BCF95113EAD5CE</stationID>
-+			<name>Radio ZET</name>
-+			<shortname>ZET</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,97 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>andrzejk@aster.net.pl</maintainer>
-+			<changed>2008-12-08T09:11:31</changed>
-+			<country>Poland</country>
-+			<city>Warszawa</city>
-+			<media>astercity cable</media>
-+			<comments>pakiet basic</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E</stationID>
-+			<name>PR Program 1</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9</stationID>
-+			<name>PR Program 2</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244</stationID>
-+			<name>PR Program 3</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11</stationID>
-+			<name>Radio Dla Ciebie</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122872309592995F81CBC12BF16FFDDA976EF54E3ACEEEDAF287D916DA723E1CFA3BD173FC</stationID>
-+			<name>Radio Wawa</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8</stationID>
-+			<name>Radio Zet</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471</stationID>
-+			<name>RMF-FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667</stationID>
-+			<name>Radio Bis</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp
---- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Andrzej Koz�owski, &lt;andrzejk@astercity.net&gt;</maintainer>
-+			<changed>2007-10-10T18:21:22</changed>
-+			<country>Poland</country>
-+			<city>Warszawa-Ursynow</city>
-+			<media>astercity cable</media>
-+			<comments>pakiet basic</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E</stationID>
-+			<name>PR Program 1</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9</stationID>
-+			<name>PR Program 2</name>
-+			<shortname>23</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244</stationID>
-+			<name>PR Program 3</name>
-+			<shortname>21</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471</stationID>
-+			<name>Radio Wawa</name>
-+			<shortname>24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11</stationID>
-+			<name>Radio Dla Ciebie</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667</stationID>
-+			<name>Radio Bis</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8</stationID>
-+			<name>Radio Zet</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F</stationID>
-+			<name>Radio Maryja</name>
-+			<shortname>20</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,71 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta2</creator>
-+			<maintainer>Hélio Guilherme &lt;helio.guilherme@bluebottle.com&gt;</maintainer>
-+			<changed>2006-11-18T22:54:01</changed>
-+			<country>Portugal</country>
-+			<city>Aveiro</city>
-+			<media></media>
-+			<comments>Sintonizados a 10km a Sul da cidade.</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5</stationID>
-+			<name>Antena 2</name>
-+			<shortname>ANTENA2</shortname>
-+			<icon></icon>
-+			<volumepreset>0.5</volumepreset>
-+			<frequency>87.34</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554449DE41CDB4FBD7A49098CC696567AD524945B94899CC3498B6C5752A8B04D06B8</stationID>
-+			<name>Rádio Renascença</name>
-+			<shortname>RR</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>88.17</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878</stationID>
-+			<name>Aveiro FM</name>
-+			<shortname>AvFM</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>88.57</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8</stationID>
-+			<name>Antena3</name>
-+			<shortname>ANT3NA</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>93.06</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444150CB66C475C9CB684A9CCAB396CEB9A29EEE7E5536B3E7E272032275E24187A</stationID>
-+			<name>AveiroFM</name>
-+			<shortname>AvFM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.81</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11172936389B2769CBDCDC246EE4A75B8E6727EE985F3A839B55A40DBA9B558400165B803F</stationID>
-+			<name>Rádio Clube de Aveiro</name>
-+			<shortname>RCA/RCP</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>115075507171272DFC8631DB6A60AE46717B8FF41F7927414A02E38E3E9A0B1C732A6B584C</stationID>
-+			<name>Antena 2</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>101.245</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,10 +1,11 @@
- SUBDIRS =
--EXTRA_DIST = "lisboa-antenna.krp"
-+EXTRA_DIST = "aveiro-antenna.krp" "lisboa-antenna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/"
-+	$(INSTALL_DATA) "$(srcdir)/aveiro-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/lisboa-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp"
- 
--
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,159 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.2</creator>
-+			<maintainer>Andrey Tomilenko (aka Thom) thom82@mail.ru</maintainer>
-+			<changed>2012-06-22T20:57:29</changed>
-+			<country>Russia</country>
-+			<city>Khabarovsk</city>
-+			<media>Antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1305638939C1FD865E64BAC19C5F57AA772A41E3154D83B787C6A8BBE41BA59C2D4F50</stationID>
-+			<name>Радио Юность</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>71.24</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305638967B8157796236B9C31EA6815AB3C48379EF65E79F49A3C79C36703B1F4D915</stationID>
-+			<name>Радио Маяк</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>72.02</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056389922F1F70C837614DE48AE22EF0FEFBFCBF25660BC1196A68629EE08CB0F3C1</stationID>
-+			<name>Радио России</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>72.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130563904442B5A2DDA4F2CE53202F339A5EDE755CEE833D693FC05B308A26E05303B5</stationID>
-+			<name>Ретро FM</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056390981FCC9EC91AA3DC33CE07779742EDC01DFAD322F810AA5C641578B689A25B</stationID>
-+			<name>Авторадио</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056391188DDE01EF727CF401895206DAA0BB3FF7E907AC8105D76121359DEA67894A</stationID>
-+			<name>Русское Радио</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13403587309CACBC90948F03CBCD705121A11FCB3C08F1015195B38A61E19CA9FF1B7C</stationID>
-+			<name>Юмор FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056391680029FBFC1E1A539CD8847454B89ACC8B316221B4FE23591283568D29EB74</stationID>
-+			<name>Милицейская волна</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056392023511D5D2255D527F78A9F3A2773304264B21F4431550D50A0C7935A891B0</stationID>
-+			<name>Радио 101.8 FM</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1340358776C1D2B150D77B86BB2AC6634B476162CAE427444FC5FD63B7F5428393489A</stationID>
-+			<name>Серебряный дождь</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130563925202974C20BE1F41D064DF0F58F50BF73A3FD4C3DFD97D4CF50362D7ADC943</stationID>
-+			<name>Радио Дача</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305639289B512A628A955D08E53324832FB8CDCEBDA010C75CD50714594D7633004AC</stationID>
-+			<name>Восток России</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130563932489FDF6E2BD0FE5CE07D11879AB3EC67D4504F7245EBE90EC3372BF8E9401</stationID>
-+			<name>Дорожное радио</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305639357C85ADEAA9CE0A129200D98B6FC5343251C2F74FBE88C22E5A5808BE77F0C</stationID>
-+			<name>Вести FM</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305639381A545F9CA03ED0BFEAAE4186B78418905B20AF41ADF875DFF7E13F9282768</stationID>
-+			<name>Европа Плюс Хабаровск</name>
-+			<shortname>15</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305639414A15F8313B28FA6B1F1DD6DB5C43F107C068A2E9F0B46D5C3C024F5CA8562</stationID>
-+			<name>Маяк FM</name>
-+			<shortname>16</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am kradio-3.5.13.1/kradio3/presets/russia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/russia/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,12 +1,27 @@
- SUBDIRS =
--EXTRA_DIST = "moscow.krp" "saint-petersburg-antenna.krp"
-+EXTRA_DIST = "khabarovsk.krp" "moscow.2.krp" "moscow.3.krp" "moscow.4.krp" "moscow.5.krp" "moscow.krp" "saint-petersburg-antenna2.krp" "saint-petersburg-antenna.krp" "samara.krp" "vladivostok-antenna.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/"
--	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/khabarovsk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp"
-+	$(INSTALL_DATA) "$(srcdir)/moscow.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/moscow.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp"
-+	$(INSTALL_DATA) "$(srcdir)/moscow.4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp"
-+	$(INSTALL_DATA) "$(srcdir)/moscow.5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp"
- 	$(INSTALL_DATA) "$(srcdir)/moscow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/samara.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp"
-+	$(INSTALL_DATA) "$(srcdir)/vladivostok-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,142 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Wasiliy Cheremisinov &lt;wasiliy.ch@gmaill.com&gt;</maintainer>
-+			<changed>2007-12-08T10:59:46</changed>
-+			<country>Russia</country>
-+			<city>Moscow</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466317A41A714F7A3C70B72A8F4F88EFF1AD5870570230FAC49A74C6528C4359C32</stationID>
-+			<name>Busines FM</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466947F92FD80D121BD0DF4EDFEE9874FC5EB83A080586606778F480426C7442561</stationID>
-+			<name>Humor</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10643304662D3779EBD6858C0583607EBF2788213464832A85F4205B19D671A503DF4BAB30</stationID>
-+			<name>Jazz</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1014</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106433046664F3991076F0870D839F4065A92B11B3059FAAF1F7AF006AFE06F56FDEC49E93</stationID>
-+			<name>Auto</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106433046619C3366A5F5A7EC91799AAEF32A445F3424E9E10E41C636539CF59CC24C082AB</stationID>
-+			<name>Nashe</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED</stationID>
-+			<name>MonteKarlo</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466CA4EED0736CAAB36E71A839D40008B0C5AC9AA2C82C643A9AFED34C2B1B13AED</stationID>
-+			<name>Maximum</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.727</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466979D59DE67FAA40E5E5408F6F709FC01B7A01AAA3434B64A6270A375091BD753</stationID>
-+			<name>Europe Plus</name>
-+			<shortname>Europe Plus</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.203</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>106433046610DCFA997911331B73CDB8ECD23DE325DD1105AF6768E6E071D4CD51DAF72FF5</stationID>
-+			<name>Love radio</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.603</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10643304660D5013C5720489386C78C7990FEB7F6A8AC21D623CB23A6B02B123D892B08E02</stationID>
-+			<name>Seven Hills</name>
-+			<shortname>Seven Hills</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466E85A0C0833E61EED4D7180C6B2186A20ED80D94859E7B7764ED980E964796459</stationID>
-+			<name>BestFM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>10643304668EE856A49266E70C96D6371545017E454330FFC78F72BDA85BE1B1A7D8BEF6E7</stationID>
-+			<name>Silver Rain</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466EE8DA6A56D9A920D2BF0E7C52A7B72423B0552B652EE24CD3859998B5702B762</stationID>
-+			<name>Classic</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.902</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1194197244ED4A8A191D1807FCF73D636896F020AFDFB2DF7A765FFAD1F322D06AA154B896</stationID>
-+			<name>Relax</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,466 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Ser Moro</maintainer>
-+			<changed>2008-11-09T07:40:00</changed>
-+			<country>Russia</country>
-+			<city>Moscow</city>
-+			<media></media>
-+			<comments>На 09 ноября 2008 г.  (09 nov 2008)</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122828023F212F976473C4E93995D4891E8C777646EC34AA187F3448C0EC7E543609CBC2</stationID>
-+			<name>Бизнес FM</name>
-+			<shortname>Buziness</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122827990F65AFCF6B3859E87971677CE6871AA71F6DA2E00B58C3BCFDF04A57035AE67F</stationID>
-+			<name>Сити FM</name>
-+			<shortname>City</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121228279796B23241487AFED5155A28232E67B9EA7CE628A67F0AC2F6BCC433C01A4369D8</stationID>
-+			<name>Ретро FM</name>
-+			<shortname>Retro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212282794C55B646493A81EF00526173AAD59794E0A8C92E10D5E87C4A47973F2379A26F2</stationID>
-+			<name>Юмор FM</name>
-+			<shortname>Юмор</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212282794B5DE3840CC9B45A581943EF925529837BEC12B66C3D85E90F3996B65BA0DCA58</stationID>
-+			<name>Радио Джаз</name>
-+			<shortname>Джаз</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122596825C81908E711F49D34E2488F9E0CBC975C4B3DCA073F6DE213A8A01920BC096E0</stationID>
-+			<name>Megapolis FM</name>
-+			<shortname>Megapolis</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5002</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122597039752418C5847057F3705AC380BE3BA5FD830328E221B3D353EED65850266ACE7</stationID>
-+			<name>Кекс FM</name>
-+			<shortname>Kex</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121225968579A6748F6F0976C2DE6D1CB4A53B97CE0F1C3ABBB08FCBB45106E48DC5BFDD98</stationID>
-+			<name>Авто Радио</name>
-+			<shortname>АвтоРадио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212259688DA536296403BFE6C53E376FEBC230247FF0A589D0483AB91AD8F08557DEB6A41</stationID>
-+			<name>Relax</name>
-+			<shortname>Relax</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121225968939C1C287EFC31157B5BACC22FD61CB81A7A785C097349863FC892E23DBF888AA</stationID>
-+			<name>Эхо Москвы</name>
-+			<shortname>Эхо</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212259691C099D02DD657FDC1D535FFCC843C096BAA4D230DF1D0EF937282F477A9CB1AD3</stationID>
-+			<name>Культура</name>
-+			<shortname>Культура</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212259692167C08E0C5F1453D16DE8A855A0938E10641E9C7FE41B77FD5948D32F68F74D2</stationID>
-+			<name>Говорит Москва</name>
-+			<shortname>92</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122596961F2F8798C4AF031DC06C680A36A17247A632141493DA9C57B21540155AF20194</stationID>
-+			<name>Радио Дача</name>
-+			<shortname>Дача</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122596993B33CE7223A502CDE834AC553FD5B1ACBE52DA72FDF905583CCC03252456B392</stationID>
-+			<name>Радио Карнавал</name>
-+			<shortname>Карнавал</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225098463FAF803940A48CC5DD762C9533BDC42913313BC62C9A3E7C2459348A3E851558B</stationID>
-+			<name>Спорт</name>
-+			<shortname>Спорт</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12138945622084AC7C25C48D647BBC4E3E0CE9AD45BA5AEFA5B9B4E5458B9EC833ECCC0A9F</stationID>
-+			<name>Radio Newton</name>
-+			<shortname>Newton</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12250982552FF63D58F730C6F74FE8EE55569A165B6AEAF01CE9F319C8E21A8556B9436B82</stationID>
-+			<name>Radio Unost</name>
-+			<shortname>U</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>123196465419618E775ADB30B8FBA7BC0AC4ED246FCC72C7933EEC9D8A313395649F4C76E2</stationID>
-+			<name>Radio Lornet</name>
-+			<shortname>Lornet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12122827767F54AF294458E31567320F8D23209CDEE586C3DA2FCA907480AD37C291805057</stationID>
-+			<name>Радио Моя семья</name>
-+			<shortname>Семья</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121228278574DD0761AB27D245495CE6B980B40D7E886D1AB6B1C42091B893E48A46783853</stationID>
-+			<name>Rock Radio</name>
-+			<shortname>Rock</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123390445BBF6A3ED8F754C4156A0BB2B470DA04733F19754E36F1ED6FC19AC85F1D64C2</stationID>
-+			<name>Радио Звезда</name>
-+			<shortname>Звезда</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12348480920036E7BC9624E105EFE480CF03DC713FF687375B2041F2E26BA12F0BF95A6540</stationID>
-+			<name>96</name>
-+			<shortname>96</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339046DDCBDF85F15BE3CAB54C1C0F0A8334B83255E9131C72C5F1E831B2E0F7CD2984</stationID>
-+			<name>X-FM</name>
-+			<shortname>X-FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123390461714F20182DBDDF585EC9929A50864AE86074C3C8E1E02F5AED483D5B462D980</stationID>
-+			<name>Детское Радио</name>
-+			<shortname>Детям</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1219914057D2886AC3FAF181A0F36D2A9D76A1C252631C40E6E39BDF5ED016BE8242F100B9</stationID>
-+			<name>Radio Комсомольская правда</name>
-+			<shortname>Radio КП</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339047DFFBBFF46ADF915EDF6CA7D1FE79038F088FFF2291DBD34D9EEC0DA84893D70F</stationID>
-+			<name>Радио России</name>
-+			<shortname>Вести</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339054BC3DCB9C2D81802E0E77E6E82336E2D17F87C6ED63F400C263BBE6DB3C2E14E2</stationID>
-+			<name>98</name>
-+			<shortname>98</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12155099273AA79DF72C4062FA8C04E9D964815CB91829824065AFE9A8D2BAB1F4AA94463D</stationID>
-+			<name>Свежее радио</name>
-+			<shortname>Fresh</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339385229EBB7819AC5442AC0E1F41E58F10C72CA249BEF2BE9E3A659006684E6A8944</stationID>
-+			<name>Радио Алла</name>
-+			<shortname>Алла</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1226205404FBE117B1B15AECDF62B6FF796F9658061C68CCBD7A57E8CE1DF50CE7E1A4AA14</stationID>
-+			<name>Radio Orpheus Classic</name>
-+			<shortname>Orphey</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339386F7157F3BFC0DD589711E42FEE85071B689BEE4534AFFF55523ED54A7528BA870</stationID>
-+			<name>Финам</name>
-+			<shortname>Финам</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123393868B5B553B02B25F4DAD23C73657402F8383C1B9FC1E8620894774526C4AF6C1E1</stationID>
-+			<name>Радио Серебряный дождь</name>
-+			<shortname>Silver</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123393873AB899D7246EB39485864B2F04EAFDD1765682408BA8192975DA61DB7A83B3F1</stationID>
-+			<name>Радио Best FM</name>
-+			<shortname>Best</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339387F11C65FEA6E51B7B8E93C7CA337F5DFDFCA2F8ADAD249503D3C9D0E84EA26351</stationID>
-+			<name>Classic</name>
-+			<shortname>Classic</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339388EEE39E0BC4D3DA35192A71CE62993C32CEF36856FF682F80DDD3EF6B98C536D6</stationID>
-+			<name>D FM</name>
-+			<shortname>DFM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339659E2E4B8321BABF68F83B40DBB5178D9982E286066E756532578AE9312F77EA3E2</stationID>
-+			<name>Наше Радио</name>
-+			<shortname>Наше</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339658E751B53B44FE1F1A6CB6D173CFDE7BFD900D63319CAC8AD2BD17B5E130AADB83</stationID>
-+			<name>Radio Monte-Carlo</name>
-+			<shortname>Monte-Carlo</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123396589CF758161886D9EBCB3F9935FD928E7B62EAF419F10636D9E74CE75F03ADEC0B</stationID>
-+			<name>Радио Попса</name>
-+			<shortname>Попса</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121233979036412BB8D5C8E91549545A821460D7CD25921A5823B83D48072EB378C6CFE6D5</stationID>
-+			<name>Радио Шансон</name>
-+			<shortname>Шансон</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123397914DC4E206CE83692E6403D4A60E2B618F648D59DE5B1B86E0F1CC5BA7346A4E55</stationID>
-+			<name>Маяк</name>
-+			<shortname>Маяк</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212339791D7BD41F55ACAC72BB37828705B336858ED3872404B84D4B756CA3BC1C043B2A3</stationID>
-+			<name>Radio Maximum</name>
-+			<shortname>Maximum</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121233979674E163A4CB1750E1B5695178A3E6B6D2633C72DDB810B1E769975DB3B0A3301A</stationID>
-+			<name>Radio  Energy</name>
-+			<shortname>Energy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121234007486004F788B3D4D98C280330FFA2D9B472961C33C1604CFDAE47B0662F4864611</stationID>
-+			<name>Radio 7</name>
-+			<shortname>Radio7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212340074EE1D11E026C89F078E0829E75A80904A3503AE203E09F1620F350B680B74E472</stationID>
-+			<name>Radio Next FM</name>
-+			<shortname>Next</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212340075589879A76AA393BAFDF5DF4555B287B418A2225B182A0851A599A46B31FC6990</stationID>
-+			<name>Русское Радио</name>
-+			<shortname>РусРадио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123400752D0B01A4845E3747674600730689641EF7D2A58F5A6F9E475F590C2B17B3FB31</stationID>
-+			<name>Europe +</name>
-+			<shortname>Europe+</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>121234007591A90762201E3A7A025C8089D71E7D010F1BD6C1DC67621A5445559100BABE20</stationID>
-+			<name>Love Radio</name>
-+			<shortname>Love</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12123400761B5688D434BA35EFEA9E23F61FE0C066EF18F45E751B61F700466DA357388236</stationID>
-+			<name>Русская Служба Новостей</name>
-+			<shortname>РСН</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212340077A657F5A456F3AC7A05F638034484ED6CB2C508B5B7CE45CA49E4943B7AD3CB16</stationID>
-+			<name>Hit FM</name>
-+			<shortname>HitFM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1212340373F23364BD99C0FD26A8FE62CCC1FC2326409F5E1952746C8D45D693B34297DC61</stationID>
-+			<name>Радио Милицейская волна</name>
-+			<shortname>Милиция</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,486 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer>Basil &lt;614@mail.ru&gt;</maintainer>
-+			<changed>2006-12-24T14:00:31</changed>
-+			<country>Russia</country>
-+			<city>Moscow</city>
-+			<media>Aver media studio 307</media>
-+			<comments>http://www.radioo.ru/</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957632E1E6B773B16FAB3C9BBE8D8781249B51B85183FB4644F8B5BD4AFFC80B99918C</stationID>
-+			<name>Love Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>66.02</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957579D0832BBA97ACA268BF14E56BD550D114E1FDDE0BD8951CBFE0A2163E4069E3F9</stationID>
-+			<name>Radio of Russia</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>66.44</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957557AD5CF65A33753EB4783380B2D909A75959EA7DB49335DBCDA806DF576F9E88D1</stationID>
-+			<name>Maximum</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>66.86</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957531EE4C210521F42A6074AF09772AF1A72431482C98A0574EDBCB64D424B7939184</stationID>
-+			<name>Mayak</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>67.22</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695750623A2EE2D00B86A33412D256B8498339EBB7B57DE4BA1463879A1DCA077792B41</stationID>
-+			<name>Avtoradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>68</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669574847289DE68C47E37F6D780471358D18F59C685C0038723C9DDFBFF6BB204CAD87D</stationID>
-+			<name>Radio-1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>68.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669574457A4DC4E624827B2B132AE6A093289F54D91510995EA005AD458EBE226D3276C5</stationID>
-+			<name>Yunost&apos;</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>68.84</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669574079F9EC2AEF3ADB2D01D5FB77DA8E5101C2B1F33A47E7CB7A48C01E46DB5733E6B</stationID>
-+			<name>Russian radio-2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>69.26</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957372D0EFB9DD0E58F11A669F20C7636C4C7359BC74B57859603CABD6EA3E383F73E8</stationID>
-+			<name>Europe plus</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>69.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957329444CE214B5282ACBCCC9D0CFBB923D38FBD5881C2D85B762A6030FBD68B8790F</stationID>
-+			<name>Ultra</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>70.19</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669572935247BDFDED87C62DE211E85F85958BB19922B8A5CF4368B61D78548CA9A940D1</stationID>
-+			<name>Russian radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>71.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957221E055943148E8F9463BE8D5818BEA3BA30A08203786FB4ED16D913CDF79B0780A</stationID>
-+			<name>Orfey</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>72.14</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695719350C9F89CDA632EE1E5E8228C51FFB348E380A567776482D28A61E1FDAF919BCC</stationID>
-+			<name>Radio-Retro</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>72.92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166957083101FD14C6FB1C54314BE3FB7D301DE25AEBB388FA5E519560BF675C254B5D85B</stationID>
-+			<name>Radio 7 na 7 holmah</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>73.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669570483021426130F14BA799C4532A1E94CA33C15510D0808D726993F2D5CD12BF1A4B</stationID>
-+			<name>Echo of Moscow</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>73.82</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956990CD8B8893868F6156B295FE27607F49EEC77AFB3FB72CAAF4D565FD83074C5F42</stationID>
-+			<name>Radio-Arsenal</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956756A12CD220E711648DAEB58CB7ED10154187C2C0E24785EA12DDFA4BD25252DC69</stationID>
-+			<name>City-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669569236286CCBF2A0E5EA3DED4BC8C67FBE7FC72D3B80B331BC8C961A71BB176355171</stationID>
-+			<name>Retro-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669560101DEA7A9DD968F07112FDC44DD324224A38FBA5D5B865FB6D2955B682FC37D8BB</stationID>
-+			<name>Humor FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED</stationID>
-+			<name>Radio Jazz</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166955883D8A04151E06D760E4DF7842990744F8A91720F94CF971EC619F0740C4B6B3AE4</stationID>
-+			<name>Megapolis-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669558359E63EA7B5B2DEB6FE1FB2FEE89F013636EFD33BC5A9A9F45C2AD71A498C515F7</stationID>
-+			<name>Melodiya</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669557934A98B4E710AD5AF9869B1B2D144B8DC5561089B2955338935CBE122A135EA4BF</stationID>
-+			<name>Avtoradio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695559236C1ED99206B33F508E21FEE76AC7FE98FD022956184B0589A0F6676F99EAF4C</stationID>
-+			<name>Relax FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695562015B618A6F9D0548252841B7979C5E390A1B4F83B3FF1EE8E2D5D6405D5A00041</stationID>
-+			<name>Echo of Moscow</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669556985A865C27C521C9C97FACBEDCF297A972C453C4EC9044639AA5CDD4FE360B3393</stationID>
-+			<name>Culture</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166955387C3ABE1CF31ADA0BFAD068F592100A89A0BA5C06332ED7ECA15D66D9D7897FC42</stationID>
-+			<name>Govorit Moskva</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166955534C99366F4574B49157C6E49B1BE8C521C8D7C4369DFB4E11E1964C3939D654FC1</stationID>
-+			<name>Radio Udacha</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669554443AC0849DBF480743A2A75F80D1A5A0961437C1ABC792FE3B493E3B99B98FE438</stationID>
-+			<name>Radio Sport</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166955327A5A60A1BA10F9E45AB03057448A48CCC6BB6E2B869CF0347F5DEC4E5892865AB</stationID>
-+			<name>Zvezda</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669552470238A75168E4067074193A8BE904A83C4B142DF39BCAEB354B07C4B6505325E2</stationID>
-+			<name>M-Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695519894B4CA3641876C66F34BDB9784EC7FFDB8888F16901B26407D7D67389CCB8601</stationID>
-+			<name>Radio Rossiya</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>97.602</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166955120CE8553D7E2FA57F6C9CCDD1260A217C10EAA121E6193B630764EA91F2AB47692</stationID>
-+			<name>Russian Songs</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>98.802</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695501694031750D1F39D2B677CC9174F963EE0200C0F375F176DE5F2C1206D3BD73F34</stationID>
-+			<name>Silver rain</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>100.102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956114A7783981473BE9C2773D90392F9C647F1ACC07B4A630F92202E4921619FF571C</stationID>
-+			<name>Best FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956189FC9213CF6C51999DE90A5029DD8717E31A6C0C32C67C9B2704A6D23823E0F8F2</stationID>
-+			<name>Radio Classic</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956224013A6F091F5FACC187C80B7799774F17A454E988CDEDF05D3571BCA00A3CD0DA</stationID>
-+			<name>Dinamit-FM</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669562690A11198557EE507FFB7954DA34C38B676DEDA1509A6D66786C56203A28F9F94F</stationID>
-+			<name>Nashe radio</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669563019B8DB055ADA960C32A8AFC23AAE3940B38EE3C8F8766B91C8245D87E7932C8E4</stationID>
-+			<name>Radio Monte-Carlo</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695636884CCD5D7C5900B5796DFA6C9667EBBEB7B38A426B4D759A17C2BD91336829EAA</stationID>
-+			<name>Radio Popsa</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956399B5023480C7B42DA089AA87F6EDE92EC88AA4A3075D0D5B4FC80C9FEA397C2CE2</stationID>
-+			<name>Shanson</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956417F021C66B643D13FD46C17672F93228108D2E40A921E65C18643DB8A52F239201</stationID>
-+			<name>Mayak-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695644332BD22B7C117952C90E15739DA0F472D7E709C986DD3BB722CC9686304300B31</stationID>
-+			<name>Maximum</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956467C3FE528365A3FE4F02A089BDA4538722A94D5750B9B9F9B92E5C65E96C35C20A</stationID>
-+			<name>Energy</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956491E7F82945D14B1E17BDDFA8CE2DCF38607B2825A5D5384BC86C52724284AB0DCB</stationID>
-+			<name>Radio 7 na 7 holmah</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956520D811ADD05B13F61CEF11C3BC6077C25A641C2EED304AD183722B29C5E4B2EB44</stationID>
-+			<name>Radio Next</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116695655702F1446544A6D8FDDF1F18783C2E1250224F31BD4F1E52973D1762B1DE305B26</stationID>
-+			<name>Russian radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956582FCEEECE6B71538020E0FEE80F48B730A887DD24272958D8A3B833E67FA1A9CE8</stationID>
-+			<name>Europe plus</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956665BBE158E4AB6982810081D0CC0A8DB510A065244FC65E7E7DCDEC5375AC84CA46</stationID>
-+			<name>Love radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669566898A71C985BD4F702BD8E37FDD0FEFB4C061B8C1C0A173E3F78A2B3A78710C4531</stationID>
-+			<name>Russian news service</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11669567303B9760EE6E437AE2AB08E9A17A2863B75CA17AAA838C2EFB8BE4C68940A036C0</stationID>
-+			<name>Hit-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1166956816C5E7650467CD2ED1AA3DEA8FDB61220C5B53C6DC983094B1EE9A0F78F875B255</stationID>
-+			<name>Milicejskaya volna</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,456 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Дмитрий Смелков &lt;das@sidero.ru&gt;</maintainer>
-+			<changed>2009-09-29T12:52:24</changed>
-+			<country>Russia</country>
-+			<city>Moscow</city>
-+			<media>FM tuner</media>
-+			<comments>from http://www.radivo.ru/</comments>
-+		</info>
-+		<FrequencyRadioStation>			
-+<stationID>1254113419B3C18A92D0E731CE42E8D1B5422801904B133FA665DD97FAE73E96A00FBE8DB2</stationID>
-+			<name>87.5 Business FM</name>
-+			<shortname>business</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254113603879D10C2B96E3183D52959B8856D666C01DD7A0D3E2241083206A2DB0960B2D3</stationID>
-+			<name>87.9 City FM</name>
-+			<shortname>city</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254115232366C9DEA47B3A7116316F1EBE11D09C33A82D9CE30A7476990E14F8C8757ED0E</stationID>
-+			<name>88.2 Retro FM</name>
-+			<shortname>retro</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12541150826343FCCBF4C9FE2C48DC3AFF72223EC870B294904B965C7786164418D1ECEB61</stationID>
-+			<name>89.1 Radio Hour</name>
-+			<shortname>radiohour</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254115595A961F47B9FA95B97E461DB06938647202A847D49C0C24C59CFDBDEDEFE840190</stationID>
-+			<name>89.5 Megapolis FM</name>
-+			<shortname>megapolis</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254115803EE8AEC14BE9ED5C558908548FF16F6218299D22BBCC1EA13F357B4B2CB8C3D55</stationID>
-+			<name>89.8 Kex FM</name>
-+			<shortname>kex</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125411663098D26141ECE7630E94EC91620E2B11B29F55D97E66353E635912278CD06408EC</stationID>
-+			<name>90.3 Auto Radio</name>
-+			<shortname>auto</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12541167464545487460A4DFFC5CE6F8B50604319D36561246F36B8339961D7A05BFC02642</stationID>
-+			<name>90.8 Relax FM</name>
-+			<shortname>relax</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254116837998FD1B2F1CB9E369CC14D023BFD0E3F28C30E5670D2B3F90F3ADC7A329895B9</stationID>
-+			<name>91.2 Echo Moscow</name>
-+			<shortname>echo</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125411883682FF181084BEB9506C2BD92D573167086EA5E6A970BA7BF89C2F31C10F141BE7</stationID>
-+			<name>91.6 Cultura Radio</name>
-+			<shortname>cult</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254118931AEDBCC2332E787FB1BD109EF5339D3ADD39EC0D9BEF4D1647FC2E424B4D3DA80</stationID>
-+			<name>92.0 Speak Moscow</name>
-+			<shortname>speakmoscow</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125411900574B23E44E4A814887A6254349FF7EA6A63CF785968BDC2D4EB96235EC27FC613</stationID>
-+			<name>92.4 Radio Dacha</name>
-+			<shortname>dacha</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254119087D1C80EEDD9D50AE4C7EF5CE7AC1AC1924A2A151B0D06EABFACF49505FD189A22</stationID>
-+			<name>92.8 Karnaval</name>
-+			<shortname>karnaval</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254208038DC6388DAD27AEEC081627D18A85ECD56B732DFEDEFBD0EDFD3269B423E1FB0E1</stationID>
-+			<name>93.2 Radio Sport</name>
-+			<shortname>sport</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542080899D30F2FBBC0E46D5E7C438DB8250612B1BB1B295383A2B1F02B67523F2B26E0C</stationID>
-+			<name>93.6 NewTONE FM</name>
-+			<shortname>newtone</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254209832885D8EACB4781D6A59A016B0342F474B31C89E12FF6CD69C257924A82C368E8D</stationID>
-+			<name>94.0 Youth FM</name>
-+			<shortname>youth</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542099761A361B34C331CA5822DBF2A247297A1D420D89742BF3107DBA8E8C10AEEB7B81</stationID>
-+			<name>94.4 Lornet</name>
-+			<shortname>lornet</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254210228ED1569120CACBF54781E22BA8E1F327B44FE51705A8E9ACDECB3E416B1C97439</stationID>
-+			<name>94.8 My family</name>
-+			<shortname>family</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542103277D90DA1B11C2382160EF2748D4CCFFFAC5C27EF5231C933C41132EE1A00B3132</stationID>
-+			<name>92.5 FM</name>
-+			<shortname>92_5_fm</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421040801C66994144AE1BF4130B6E61B509D327F18D375A7DB7E0295834139FB18F2FB</stationID>
-+			<name>95.6 Star FM</name>
-+			<shortname>star</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254210555DC625D856752C6B8F5AD7E20419BB318E01A1895DBC9FA38BA755A9433240257</stationID>
-+			<name>96.0 Tour</name>
-+			<shortname>tour</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254210690E4B1BBA290BBC0633D3C5428B80A238A1EE76F8A8B78DE207ABE627BFA4EAE47</stationID>
-+			<name>96.4 X FM</name>
-+			<shortname>x</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542107788E5E6BBB75B20D94E632DEC2F2271010DCEDEB30464F9A9A9E6C1D1989B49D6C</stationID>
-+			<name>96.8 Kids FM</name>
-+			<shortname>kids</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542109468DF4D861CC4352DD73492D57049D752D0B7699AC2A8E21FFBD9AAA3E0ECA2BBD</stationID>
-+			<name>97.2 Kommi FM</name>
-+			<shortname>kommy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254211077FFBB611A4952B42E012F454F9A6856ACDD141621E0B1FD46EE1063A64B7732EC</stationID>
-+			<name>97.6 Vesty FM</name>
-+			<shortname>vesty</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542111368120FA07696D76E9051198BF7DD2A2203D1207D98DF67B154C158D950006022E</stationID>
-+			<name>98.0 98-Hits FM</name>
-+			<shortname>hits</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542111955D1C8602DD46E46EB51F985EB9B7D18B321EAE5AA52A367CC0DCD615F4E70DAE</stationID>
-+			<name>98.4 Fresh FM</name>
-+			<shortname>fresh</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542112900E007DE37B5945C000F14A7BDF6FE9353595FFDD5B7F10F70777B4A70769D98C</stationID>
-+			<name>98.8 Alla</name>
-+			<shortname>alla</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421137786885E1A519D06FC665D843621D57F354569E748BAED5BCC4ED24A45AA3BACDF</stationID>
-+			<name>99.2 Orpheus</name>
-+			<shortname>orpheus</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254211405D36EF5FFB3C3F976726AC733CF85E6C8D6010FDA058D7D4853FE4EA22DEB7AAA</stationID>
-+			<name>99.6 FinAm FM</name>
-+			<shortname>finam</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254211511B2F2B33598DF20767D683FEDBF14BCF48B8E421FB06B5CA7DC7FA48225B347F2</stationID>
-+			<name>100.1 Silver Rain</name>
-+			<shortname>rain</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254211695A7414A14CD8B6C8AEEA25BE7255BF911A2F49A43015857C206A89AD8A8F23FD3</stationID>
-+			<name>100.5 Best FM</name>
-+			<shortname>best</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542118336B9184DC2526A04E26068352F769930C2C179E0A0C1B4C97F13479AD80F92AE2</stationID>
-+			<name>100.9 Radio Classic</name>
-+			<shortname>classic</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254211957B53A0D5717BBFE765D179B97462295F20170616066BE0EBEFE3AB432F207ECA1</stationID>
-+			<name>101.2 D-FM</name>
-+			<shortname>dfm</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254212095CABACDDF1849CDE516C3721C546F839B688C25583C6B76BDE71F5A37365CDD4F</stationID>
-+			<name>101.7 Our Radio</name>
-+			<shortname>our</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421218101C4242DE07C4952D972476E047C29905300CD40E2C956ABAAB93F1343FF0703</stationID>
-+			<name>102.1 Monte Carlo</name>
-+			<shortname>montecarlo</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542122574A490326E90BA2143ED3CBA9ECE84D51ACE9888179A851E019D49C1BFD902E9E</stationID>
-+			<name>102.5 POP-SA</name>
-+			<shortname>popsa</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254212409B14B1DDD97729A43EFF2196C938431A6DFFFDDDEB708F71BFE3BA5FCD9481CD0</stationID>
-+			<name>103.0 Shanson</name>
-+			<shortname>shanson</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254212449AF5CCA7CCD0A0A429F6A0B1A280D071FF498AFFA110761B26A01FFBD3AE9AB54</stationID>
-+			<name>103.4 Lighthouse</name>
-+			<shortname>lighthouse</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421248712D3B6413968F909481424D8D32E99BDF14FD58DA9DA2FA8B624DCB6007035E4</stationID>
-+			<name>103.7 Maximum</name>
-+			<shortname>maximum</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542127050D97BAA80BDCE7504703E2A9C6F161999453E46AD3CC6D99F6767C6CF76C3743</stationID>
-+			<name>104.2 Energy</name>
-+			<shortname>energy</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421278240CFAB908AE144C301C4A01EB0C7D48A5CECE281E1B8C6E815B17B6496499C3A</stationID>
-+			<name>104.7 Radio 7</name>
-+			<shortname>radio7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254213566627DCF077D632A14DD76250EC1060682EE482A4AAC10315DA36711C347E50874</stationID>
-+			<name>105.2 Next</name>
-+			<shortname>next</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>125421372931ED002928F13BD48B38C77F57176B136C93C8A595624BEC8BD6A6B707AE695F</stationID>
-+			<name>105.7 Russian Radio</name>
-+			<shortname>russian</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254213794A88ECDB89C81F42B2CDDA09B66B4FCA62E33624331AA1BDE4031DB6169377C36</stationID>
-+			<name>106.2 Europe+</name>
-+			<shortname>europe</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254213892F9F02154427DE2C906EC61A784CF7ED2438EE6559BDE0A88AC1E42BE44A39AAE</stationID>
-+			<name>106.6 Love Radio</name>
-+			<shortname>love</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12542141315B35477A88C0C075181F1C74FFE56A2FA2087A6D8D06EB8BD7DA827B8EAB252C</stationID>
-+			<name>107.0 RSN</name>
-+			<shortname>rsn</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254214188565B3064EC814AA6F693342B771BF65AE9F77CAF3656E059FAECAEE6980134F9</stationID>
-+			<name>107.4 Hits FM</name>
-+			<shortname>hitsfm</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1254214270622D673398308291D95016FA8228F590BC02522A14F14D3018F9303B44B72CC8</stationID>
-+			<name>107.8 Police wave</name>
-+			<shortname>police</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,177 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>Hanataro (Александр Николаевич &lt;hanataro25@gmail.com&gt;)</maintainer>
-+			<changed>2011-03-04T16:29:42</changed>
-+			<country>Russia</country>
-+			<city>Saint-Petersburg</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>12992427093FBA5E1570243458E2D5F851F3BBFC99DF2268059177356E9A652BFD2E3F</stationID>
-+			<name>Дорожное радио</name>
-+			<shortname>Дорожное радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992267583B237AB8A0CA36A5978FDB4D934789809AA63B645C0D7EFB86FF3B224776</stationID>
-+			<name>Ретро</name>
-+			<shortname>Ретро</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>87.9996</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992267615D79138BF78E489668066A5F161E95CB0C2E1F0D2D2C7E8B3AED74947879</stationID>
-+			<name>Авто Радио</name>
-+			<shortname>Авто Радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.3496</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299245224DFDE600C4E78F81A578FBA1F2A45006C1A483D5738B2BF48ED284BC2C9FC</stationID>
-+			<name>Для Двоих</name>
-+			<shortname>Для Двоих</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226770ED601040E43EE3B93E2438C4AC6AFC01DDEACC98B1EE08302A04F82068E7</stationID>
-+			<name>Кекс FM</name>
-+			<shortname>Кекс FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.0996</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226773D02C541B6C989B46A7BE9E07EF3C544185FC9341F54F2EDBE86E17D89BC7</stationID>
-+			<name>Эхо Москвы</name>
-+			<shortname>Эхо Москвы</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.4996</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992450064E4AAA3432B8FCA126079FA296A86E336905CE3ABF2EFED8C373D58C3798</stationID>
-+			<name>Радио Рокс</name>
-+			<shortname>Радио Рокс</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992268058FEAF0C94EF06273EB673743E6258F75242AB4295D51C5B66F4EC057F2AF</stationID>
-+			<name>Студио</name>
-+			<shortname>Студио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.349</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992435281FDB16BE9B711DE92E41FCEA928DDD2FC1ABA6AFCD5B07A578393BD0EC54</stationID>
-+			<name>Динамит FM</name>
-+			<shortname>Динамит FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992268107030A254DC106BD62B943CE1313E4BADD282E927475E0B571AA5F3694D92</stationID>
-+			<name>Наше Радио</name>
-+			<shortname>Наше</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226813353F96B553C09BB1CC06CB806CA6EE34705D76534B42A70C5E8C2BB99596</stationID>
-+			<name>Русский Шансон</name>
-+			<shortname>Русский Шансон</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.399</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226815509A209761FCE70F2AA153A6D6118E92DD70A6516B2E44535A25AC5A117C</stationID>
-+			<name>Балтика</name>
-+			<shortname>Балтика</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.849</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992439342FE6A60DC705889C54E4E43102EE5BD7A70338627821A114AEA10A547484</stationID>
-+			<name>Love</name>
-+			<shortname>Love</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>129922681953A87D8654349F7F46E20C2482A6BE6EA8C59008AE1DD6F9650CFD33F414</stationID>
-+			<name>Спутник</name>
-+			<shortname>Спутник</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.899</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226822C937A9D0C21E95F9AB1D7A36CACD1AAD8751DF1E0868B8499D496E10F3E1</stationID>
-+			<name>record</name>
-+			<shortname>record</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.299</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1299226825ADD93E9496FBE70152AEF5833A1B98A1B2EEC51A47DE80A35C432EE4A6D7</stationID>
-+			<name>Маяк</name>
-+			<shortname>Маяк</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.949</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992448213D3022DC21C96DB5D1AED00A71539ABED1EB113698432D0D45C6B9CA1540</stationID>
-+			<name>Бизнес FM</name>
-+			<shortname>Бизнес FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12992448794E7CF4A66A7FAFC810B559EFE948480288CC3288AB469C6F84B28CC51F89</stationID>
-+			<name>Русское радио</name>
-+			<shortname>Русское радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.8</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp kradio-3.5.13.1/kradio3/presets/russia/samara.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/samara.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,239 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-4.0.0</creator>
-+            <maintainer>slider</maintainer>
-+            <changed>2010-11-25T11:06:47</changed>
-+            <country>Russia</country>
-+            <city>Samara</city>
-+            <media></media>
-+            <comments>ver 0.01</comments>
-+        </info>
-+        <FrequencyRadioStation>
-+            <stationID>12906697574C22D12352F932FBC406C8E4D27AA805ACCE94C1128DA618D2781B04FCB5</stationID>
-+            <name>Добрые песни</name>
-+            <shortname>Добрые песни</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>68.51</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906699108A5C3D49F59F5AA489785116892F2745E5025BFDAB5E583F3BF2926C83BE</stationID>
-+            <name>Радио России</name>
-+            <shortname>Радио России</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>mono</stereomode>
-+            <frequency>70.31</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290670109AC03A5A7B274C46EF2F54FB75D0E973F01E5E2CF14968E6D60D838D8DD69</stationID>
-+            <name>Радио Маяк</name>
-+            <shortname>Радио Маяк</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>mono</stereomode>
-+            <frequency>72.05</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669458F93F12F39C5CF1E698F318744E109C1D43985D0DFDDABCFCEDCB0D74F184</stationID>
-+            <name>Русское радио</name>
-+            <shortname>Русское радио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>mono</stereomode>
-+            <frequency>72.83</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>129066946284D16DEFE6A632919C49CC7B59DE24C76FF17D6659DE4F709941C1923CBF</stationID>
-+            <name>Самара-Максимум</name>
-+            <shortname>Самара-Максимум</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>mono</stereomode>
-+            <frequency>73.61</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669966CAFF3D2FE0BCA9C4ABE31755A703071613797EDBAE8220DFF911F71223C3</stationID>
-+            <name>Экспресс FM</name>
-+            <shortname>Экспресс FM</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>90.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669496B23BBAB0F7EA2F53447A2D2B5062D6F95A5634B03B8C642B2B6AB0DA857F</stationID>
-+            <name>Милицейская волна</name>
-+            <shortname>Милицейская волна</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>90.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>129066949955CCCD9BDF1541E3CBF2BD80CCD9D2169927CB1B7783CBD7EB7C84AB4E52</stationID>
-+            <name>Радио 7</name>
-+            <shortname>Радио 7</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>91</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906695025E8878640F18551035279789653DC1847C3ED7FCE3C17DA0DE00814C1277</stationID>
-+            <name>Ток FM / Серебряный дождь</name>
-+            <shortname>Ток FM / Серебряный дождь</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>91.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906701432579FB12F26EC4143B4075C5CA32161561C67469F2674F1D000639924769</stationID>
-+            <name>Радио Маяк</name>
-+            <shortname>Радио Маяк</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>mono</stereomode>
-+            <frequency>92.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669512AA728A2909B5DA1766DCBA8FEE7319FB691CC904D364B5FD63F0E091086C</stationID>
-+            <name>Юмор FM</name>
-+            <shortname>Юмор FM</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>95.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290670209D53A20DBE72609B8DD5D1C949AD9C717D957B7EA737EE0AF4555783A9568</stationID>
-+            <name>Kot FM</name>
-+            <shortname>Kot FM</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>96.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669520AFD73B2A79481561F353ADAAA8019C899B98EBD5BBC7C8C523D8B5E1F4AC</stationID>
-+            <name>Ретро FM</name>
-+            <shortname>Ретро FM</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>98.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669523EB55855C02E8D1466C0DD69923D0AECA8D1EA4638A4324CF005F1B9396B4</stationID>
-+            <name>Эхо Москвы</name>
-+            <shortname>Эхо Москвы</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>99.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669526015A03960BBB8AFEAE8434E5774A10912CE23D3F30E715BC3F6AF63E2B01</stationID>
-+            <name>Европа плюс</name>
-+            <shortname>Европа плюс</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>99.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669529F2C34EF9C4054325268B74145214ED93301E756EEF49D0B6B369F0472357</stationID>
-+            <name>Русское радио</name>
-+            <shortname>Русское радио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>100.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>129066953365186F4B19E0FFA6970EA7CF9BBE4CB8B4C8B29585CBEDCCADE3E0438A6B</stationID>
-+            <name>Радио Шансон</name>
-+            <shortname>Радио Шансон</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>101</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906695360BE1FF43000028BE7DFFAC09A6D1C3D8D82F4230ADAFB8A97EA67063A617</stationID>
-+            <name>Радио Рекорд</name>
-+            <shortname>Радио Рекорд</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>101.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290670428DB6665C4DA8315E1F9C1C3AEE22FE5F400B378BF01D0C2091AD1D6351815</stationID>
-+            <name>Радио Дача</name>
-+            <shortname>Радио Дача</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>102.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669541A995A471FD47505C9A854FA3283E543CFCF2CF49D755684FA403A8B707AE</stationID>
-+            <name>NRJ</name>
-+            <shortname>NRJ</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>102.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669543FBF9E4CC1B1852F655B37CAB7142F34981CBEE8CED47387B2B1D416A3818</stationID>
-+            <name>DFM</name>
-+            <shortname>DFM</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>102.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669547A5146B3B559C4AF1D19A78B25BCBC6C96FC3FB2CE096DBBC08E1121BED6C</stationID>
-+            <name>Радио Мегаполис</name>
-+            <shortname>Радио Мегаполис</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>103.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669551EF9AAACB0ED236913B13084702FB32333DA1D6057709066AE87252E866F0</stationID>
-+            <name>Самара-Максимум</name>
-+            <shortname>Самара-Максимум</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>104.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290670579C8F92CAD2D08031E938BAAC59BBE4DE2F00B83A172121D8E030078F04F1B</stationID>
-+            <name>Авторадио</name>
-+            <shortname>Авторадио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>104.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906695578486108D25E6524980F6692BAAD184350B1AD0404E9FF46D5E553E800991</stationID>
-+            <name>Радио Алла</name>
-+            <shortname>Радио Алла</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>105.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>12906695610B4001861F6297000F9E0163510F013380B0230CB87871A69A947A5603F6</stationID>
-+            <name>Дорожное радио</name>
-+            <shortname>Дорожное радио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>106.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290670650697A6A61F958CCF9DA5BBC65D36276B78CF50F7837A6B0102BDF4E3D51D0</stationID>
-+            <name>Love радио</name>
-+            <shortname>Love радио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>106.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+            <stationID>1290669568AF4C3FA28BC38A7BFB9FB288E3CD453E4E732F49B3C509F3FDECA89B4E16</stationID>
-+            <name>Детское радио</name>
-+            <shortname>Детское радио</shortname>
-+            <volumepreset>-1</volumepreset>
-+            <stereomode>stereo</stereomode>
-+            <frequency>107.2</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,141 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.2</creator>
-+			<maintainer>Andrey Tomilenko (aka Thom) thom82@mail.ru</maintainer>
-+			<changed>2012-06-22T20:47:29</changed>
-+			<country>Russia</country>
-+			<city>Vladivostok</city>
-+			<media>Antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1305629847E4E1C8DFAE28601AA9FF6FED89E658E93D0FB8E6CD6E38CAE5F9FD312294</stationID>
-+			<name>Радио Маяк</name>
-+			<shortname>1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>69.68</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056302742651484CC5912F72A23F69F67301C3D59DE23FEE9DDBB143FD366F972D12</stationID>
-+			<name>Радио России</name>
-+			<shortname>2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>71.84</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630309F71DD598694A4024E35B0E728919D3C07279C5A8517CCD3CAF6665D50FDE</stationID>
-+			<name>Авторадио</name>
-+			<shortname>3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630337CE26C7EFFA5A35679CA6A2014859F842B5784AE6CD400457AAB500DA93CA</stationID>
-+			<name>Радио 7</name>
-+			<shortname>4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630407C3530D192583FA82B955F4DC456E7280CA9FAAF485DCDB1017EF8AFDBCAD</stationID>
-+			<name>Радио VBC</name>
-+			<shortname>5</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130563042542AAA24D5F407A403C4A7197B4CFA710A0DC193EBD8830AAC41C95A4ADF1</stationID>
-+			<name>Радио Лемма</name>
-+			<shortname>6</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630440AAD7287143E964761B40147B5B4300A6F0E875FD2F16CB7CF19636145C52</stationID>
-+			<name>Радио Шансон</name>
-+			<shortname>7</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056304542589A59330FDFD3BC5C59CF6F361BD834A851576B85BC0B2DD0882E7A094</stationID>
-+			<name>Ретро FM</name>
-+			<shortname>8</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>13056304729BC63FBCDAEACF9BF8E31BB50C14D2A3BA718D7CC67516720549D43308ED</stationID>
-+			<name>Европа Плюс Владивосток</name>
-+			<shortname>9</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>130563049042596A28FF0B0A75A1EEE2646A0F66383E7ADACD04F3CCFEF9CD2D291A32</stationID>
-+			<name>Радио Дача</name>
-+			<shortname>10</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630506C7D70286FAD616EDC0D58CE0E911282596E00793C5A5D9E1D402700207F7</stationID>
-+			<name>DFM</name>
-+			<shortname>11</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630522CCF6CD3D24E933D486C62C00D4279BC46C85AA7B71F9170ECB4900CF7899</stationID>
-+			<name>Хит FM</name>
-+			<shortname>12</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630536EF153D9BA1638772799D7C1D066D0C8E431B98476DD073FC4B05AA07C4A9</stationID>
-+			<name>Владивосток FM</name>
-+			<shortname>13</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1305630551DEB55372DD2D6225FD2472EB4B5926B50BD2F6D652E4E9DBB8F8E8E590B8</stationID>
-+			<name>Русское Радио</name>
-+			<shortname>14</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp
---- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,114 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Karol Slanina</maintainer>
-+			<changed>2007-01-30T23:57:25</changed>
-+			<country>Slovakia</country>
-+			<city>Bratislava</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>11701979358557D176BE181F7A4D73F6B3E363053727BB4B2865AEBDF6522AA23B496A4BC6</stationID>
-+			<name>R�dio FM</name>
-+			<shortname>R�dio FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170197995A51B2D6F23369B1E32CD8732D47EF18E7DF3DE59A10F1E552EF0D5192E082F2F</stationID>
-+			<name>Lumen</name>
-+			<shortname>Lumen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170197864908C92A275FF4EB11D627A70C50F184AC5025AD1EA23B1F2C2E5545DF4604377</stationID>
-+			<name>Fun Radio</name>
-+			<shortname>Fun</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170198029A2525F10FCA4A80FC4C9920DE5317291C7E3FA88F7439AF8554FABEF2C505A7B</stationID>
-+			<name>R�dio Slovensko</name>
-+			<shortname>R�dio Slovensko</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170198058FF77AB835BD24D973DBD19FEE90CD52C897DBD56454EAC40FF6EE6299530E2BA</stationID>
-+			<name>Lumen</name>
-+			<shortname>Lumen</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170197883FEF499284D6512B6D124C6AEE06954813B19D0677B9FAE1E25841F047E506DAB</stationID>
-+			<name>Regina</name>
-+			<shortname>Regina</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11701981540C8BA3C5FEE26BFEBC1C21757EAECF0F8812D60536CF462229E28D88D79D3614</stationID>
-+			<name>Hey!</name>
-+			<shortname>Hey!</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>117019818318BF1A3FB6743C67752E82D4040BEE751A2DFA097586C0745590238E429B140D</stationID>
-+			<name>Viva</name>
-+			<shortname>Viva</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>117019823636B4E4B502BC79238346E03946C14B71DBF94119255C2C80249382E9E9596E76</stationID>
-+			<name>Dev�n</name>
-+			<shortname>Dev�n</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170198249A7B52138DFC2490C760F9B63E3089848E5530558F197A85AF75E491DE3752EF8</stationID>
-+			<name>Okey</name>
-+			<shortname>Okey</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170198200C27DA842FC3E41A94178717FD57CDA4B3637AEE94EE432559A51406C152BE867</stationID>
-+			<name>Jemn� mel�die</name>
-+			<shortname>Jemn� mel�die</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1170198173C7877B76C83C5A1D305D71333F95BF44E85E4981BFC901138A6D8B4161CB9DDE</stationID>
-+			<name>Expres</name>
-+			<shortname>Expres</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp
---- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,95 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer></maintainer>
-+			<changed>2007-01-03T17:10:50</changed>
-+			<country></country>
-+			<city></city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1167837266A46C6BD80A9B05DB8191BBA2DF07FBD9C06260FFCD10A5C14F99B37A4A1264E1</stationID>
-+			<name>Radio FM</name>
-+			<shortname>radiofm</shortname>
-+			<icon></icon>
-+			<volumepreset>0</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167837523A6FCDE20D4D66BFB2D2DEC1BE1027C01007A26E6BBB1E674B7E9B1B5F2B69282</stationID>
-+			<name>Radio Wien</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>89.95</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167906947508A1DFDFB2DCC3217FE7DE77F0896F34EFCE5C1F01A3481D8B13DEA5AAE0D03</stationID>
-+			<name>BBC World</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11678375991034A86E0C2F24E0262CECC9917EEADEAAAC6738B5CE2DB74B4210B84E60E6DC</stationID>
-+			<name>Fun Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167837739B15816FFEC00FA6F46359F18C7E4B88DEDD1D1EDF4E2E25A5DA0117CB3CF1E73</stationID>
-+			<name>SR1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>96.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167840523320901F854CBA0C6099B0F680738AB4EF8B7375882DD6C1C9BC639C14A0075DB</stationID>
-+			<name>Radio FM4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11679064372E55132CD63194C6DF57BED568063822F8DB897F58D7F1F2AEAE396B1E0BF242</stationID>
-+			<name>Radio Okey</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167906269AA3003C8F5BAE787A4B93AC008C8DF8FCE0F184E50FBA8C7EAB68F194DD47442</stationID>
-+			<name>Krone Hit</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11679069873DD5DB69565B0F08A2A6C7D0922333B8E956C9B23DC2066513ED88F091BDF922</stationID>
-+			<name>Jemné Melódie</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1167906370C374296A0729322F2FE591A959E9927D815F5AC53FEC71DF3EEF3A2B6868B6E1</stationID>
-+			<name>Radio Expres</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,10 +1,13 @@
- SUBDIRS =
--EXTRA_DIST = "kosice.krp"
-+EXTRA_DIST = "bratislava2.krp" "bratislava.krp" "kosice.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/"
-+	$(INSTALL_DATA) "$(srcdir)/bratislava2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/bratislava.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/kosice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp"
- 
--
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp kradio-3.5.13.1/kradio3/presets/spain/leon.krp
---- kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/spain/leon.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,114 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<maintainer>Roberto Garrido &lt;garrido251@terra.es&gt;</maintainer>
-+			<changed>2006-10-16T18:47:38</changed>
-+			<country>Spain</country>
-+			<city>Leon</city>
-+			<media></media>
-+			<comments>Emisoras de Leon capital</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5</stationID>
-+			<name>RNE 1</name>
-+			<shortname>RNE 1</shortname>
-+			<icon></icon>
-+			<frequency>87.60</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+
-+<stationID>1116455444F58348060F6B3951D032CE2AE3962570045A854578FE3718D634442C77547493</stationID>
-+			<name>40 Principales</name>
-+			<shortname>40 Prin.</shortname>
-+			<icon></icon>
-+			<frequency>88.2</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>	
-+			<stationID>111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8</stationID>
-+			<name>Radio Clasica</name>
-+			<shortname>R. Clas.</shortname>
-+			<icon></icon>
-+			<frequency>91.10</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+
-+<stationID>1116455444E3C16AFC5033065A79EA2ACB983CD130F211DD90B5191135A7A0406A415E9E32</stationID>
-+			<name>Radio 3</name>
-+			<shortname>Radio 3</shortname>
-+			<icon></icon>
-+			<frequency>89.30</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554446CAC6C1662A7B7CED73A73B393EDB080B0BDF83DB7FF69DADA2B1CE6EEB5227C</stationID>
-+			<name>Cadena Ser</name>
-+			<shortname>C. Ser</shortname>
-+			<icon></icon>
-+			<frequency>92.60</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11164554447A9C68C227A551F40419A4A90C43709DE94082A0EE08024CCC55365C051D497B</stationID>
-+			<name>Cadena 100</name>
-+			<shortname>C. 100</shortname>
-+			<icon></icon>
-+			<frequency>93.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878</stationID>
-+			<name>Cadena Dial</name>
-+			<shortname>C. Dial</shortname>
-+			<icon></icon>
-+			<frequency>94.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+
-+<stationID>1116455444509F0036299C12C83B7ABEA8000845DC5D38E34AAEA04346433F6ACC64860751</stationID>
-+			<name>M80 Radio</name>
-+			<shortname>M80</shortname>
-+			<icon></icon>
-+			<frequency>95.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444787E3904290A56E16C4808EE0C7117893EE19A27D621326FA4FEA44334A6AAB4</stationID>
-+			<name>Kiss FM</name>
-+			<shortname>Kiss FM</shortname>
-+			<icon></icon>
-+			<frequency>96.5</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444C8F7100921C174D17234BB109181FB1D1891D59C31A09771D0400BA46015D36F</stationID>
-+			<name>Onda Cero</name>
-+			<shortname>O. Cero</shortname>
-+			<icon></icon>
-+			<frequency>98.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1116455444524D3835E4E98FA48D0822236F7A2C4881D4D3314D9740CDE086B1DCF400850C</stationID>
-+			<name>Radio Maria</name>
-+			<shortname>R. Maria</shortname>
-+			<icon></icon>
-+			<frequency>101.3</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>111645544434E00A4B79D5AF6F50BCA073B4F0075DB98363F2965208360ADB384FC9C9261F</stationID>
-+			<name>Radio 5</name>
-+			<shortname>Radio 5</shortname>
-+			<icon></icon>
-+			<frequency>102.2</frequency>
-+			<volumepreset>-1</volumepreset>
-+		</FrequencyRadioStation>
-+
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am kradio-3.5.13.1/kradio3/presets/spain/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/spain/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,26 +1,27 @@
- SUBDIRS =
--EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp"
-+EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "leon.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/"
--	$(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp"
--	$(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp"
- 	$(INSTALL_DATA) "$(srcdir)/barcelona2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp"
--	$(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp"
- 	$(INSTALL_DATA) "$(srcdir)/barcelona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp"
- 	$(INSTALL_DATA) "$(srcdir)/bilbao.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp"
--	$(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp"
--	$(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/leon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp"
- 	$(INSTALL_DATA) "$(srcdir)/lugo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp"
-+	$(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp"
-+	$(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp"
-+	$(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp
---- kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp	2012-11-25 00:48:01.000000000 +0100
-@@ -0,0 +1,87 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_11_27</creator>
-+			<maintainer>Magnus Holmgren &lt;magnus@kibibyte.se&gt;</maintainer>
-+			<changed>2006-10-19T16:57:24</changed>
-+			<country>Sweden</country>
-+			<city>Link�ping</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11612679722C3AE9D70B2B3DD46C4065608BA1CAACE6896B3D6F823A492BBC2530D8F59698</stationID>
-+			<name>Sveriges Radio P1</name>
-+			<shortname>P1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161268014C8DA05F96C556DF58C27DCA0B7EB4D76C21088188AB8FD914878185BD0F9D949</stationID>
-+			<name>Sveriges Radio P2</name>
-+			<shortname>P2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161267649469715870FF0D03695CA6A24454360C86BFBE9C63852DBE7C345B2F78588CDCA</stationID>
-+			<name>Sveriges Radio P3</name>
-+			<shortname>P3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161266725517FE1ECC390A4AD8164724F361C1BBC9663B69AE58DA4D18E922C95E7B94877</stationID>
-+			<name>Sveriges Radio P4 �sterg�tland</name>
-+			<shortname>P4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1161267804D5E933F12EFCD66F8EEF4B28C4345A2D2986DE5A121E68825E481A4197D46171</stationID>
-+			<name>Link�pings n�rradio</name>
-+			<shortname>N�r</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11612659565F0D48B7FB6AE89FFFA0F61FFC2C342AFF99E6AFC86F0E8FFAE65DE6AEAE3BCA</stationID>
-+			<name>Rix FM</name>
-+			<shortname>Rix</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.376</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11612667154BB764EE3775FEA4FC6159E50300742ADD5E58B519E357ACAE84BA532BCDD8E8</stationID>
-+			<name>Lugna favoriter</name>
-+			<shortname>LF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>116126856640E5698A4438B690C4BFE5601F11D852BAC3164C921A42AAB231681183E40603</stationID>
-+			<name>East FM</name>
-+			<shortname>East</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.2</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am	2012-11-25 00:48:01.000000000 +0100
-@@ -1,18 +1,19 @@
- SUBDIRS =
--EXTRA_DIST = "gothenburg.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp"
-+EXTRA_DIST = "gothenburg.krp" "linkoeping.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/"
--	$(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
--	$(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
- 	$(INSTALL_DATA) "$(srcdir)/gothenburg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp"
-+	$(INSTALL_DATA) "$(srcdir)/linkoeping.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping.krp"
-+	$(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
- 	$(INSTALL_DATA) "$(srcdir)/stockholm.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp"
- 	$(INSTALL_DATA) "$(srcdir)/stockholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,421 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-09-20</creator>
-+			<maintainer></maintainer>
-+			<changed>2008-10-29T08:32:41</changed>
-+			<country>Schweiz</country>
-+			<city>Baar (ZG)</city>
-+			<media>Cable</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731615C37190398400074872507711380CC9F801C63990D7D1216B681209CEA7786A9</stationID>
-+			<name>Deutsche Schweiz 1�</name>
-+			<shortname>DRS 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731615F3EC8840F1D28547F96E5F851757FD7E43F14DAC1D84B35BBD2E4B3CBACA8EC</stationID>
-+			<name>Deutsche Schweiz 2</name>
-+			<shortname>DRS 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>87.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161571CAE333F51B6DF76B9FC350D3B8241CB010CC415F45A11DDF89938B7E48F20</stationID>
-+			<name>Deutsche Schweiz 3</name>
-+			<shortname>DRS 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316101F7DBAA4FC8D120BA86942BB54C774119B175AEFDBF07313E9BC380645E5979</stationID>
-+			<name>Deutsche Schweiz 4</name>
-+			<shortname>DRS 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731610FD0B97EA983008980BC88F6C246C1B0DCA90B2298759E39A2485A68FBD08284</stationID>
-+			<name>Radio Eviva</name>
-+			<shortname>EVIVA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161DD5A7B47F06219EE6B287410846E68A2F9645FBE56CDA64055EBE9FD50F400CA</stationID>
-+			<name>DRS Musikwelle</name>
-+			<shortname>DRS M</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316150F8094927669160C81E11488EE683D7D51643444F74930B441A71E741AA8D1E</stationID>
-+			<name>Radio Swiss Jazz</name>
-+			<shortname>CH-Jazz</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316144A1588DA40CC54E54E8FD1955699F6E590FF05128F551C188B50781BFA2E429</stationID>
-+			<name>Swiss Clasic</name>
-+			<shortname>CH-Class</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161E93DBEAB0A4B385E7F8638081FF4FE77F082AE85AFD05E79A86074C450274ED4</stationID>
-+			<name>Swiss POP</name>
-+			<shortname>CH-POP</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161A8049CE900367D1B4609C408D051B68E68CC148E1E4AFAE7C6210EB569563F5F</stationID>
-+			<name>Tropica</name>
-+			<shortname>TROP</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731615AE584B8080DBA4FA802E756A6CA14DC0B1999843A435E10D0C016073AC04964</stationID>
-+			<name>Rock Nation</name>
-+			<shortname>SM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161F381A9211F4AD4D44F7DF22218F520FD15E20AEC8F90520E8EF44FDBA9D8BE49</stationID>
-+			<name>Radio Virus</name>
-+			<shortname>VIRUS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731616CA06E1C2AE30BB75D0A55BEBCDBB0430F29D75E9065E394C07C91234513F35D</stationID>
-+			<name>Radio Sunshine</name>
-+			<shortname>RSH</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161425F93755AFA25B35C884916F0ADC90D5AD7C7FBB55A6FD8CBDC5F9FEF5DCB9F</stationID>
-+			<name>Radio Pilatus</name>
-+			<shortname>PIL</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161AB5F78DEF5E32376FDFD550AEFEBC2B8D3870C2F241C3B2A799343A4B8E181C2</stationID>
-+			<name>Radio Central</name>
-+			<shortname>RAS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161422E70DA14D5688197F0463779CDB698D20B05A5EF117F0EA81F427FF665E65D</stationID>
-+			<name>Radio 105</name>
-+			<shortname>R105</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731613B91C4CE87B38152A108B17DFF853A5EF3E30A85E31709BF2A86FF4E6FAE1EB7</stationID>
-+			<name>Radio 24</name>
-+			<shortname>R24</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161DEE2378679617AC0F38BFBE73B34344C5DAAB629FD54F6CA96BDE14AAE8307F8</stationID>
-+			<name>Radio LORA</name>
-+			<shortname>LORA</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161B50423C2C6D3A258BAE99CC96F1C2A7DBFA5632C321CE714DB38AAE38C346710</stationID>
-+			<name>Radio Energy</name>
-+			<shortname>NRJ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731614A07E5A4D217F410E3D11188E49B4FB392835BB6B33BB5667D39EEF9C77DFFDD</stationID>
-+			<name>Suisse Romande 1</name>
-+			<shortname>RSR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161EE7A4CB25EA346F4C855D21D92C8DA38A3FFAFDE9BFBD109E3FA6791FD9ED0C5</stationID>
-+			<name>Suisse Romande 2</name>
-+			<shortname>RSR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731617BF310CCF020C3ECB8AF3A1F9FC7ECCF63C53B2D2CDF1E8E6314EBDBB84A48FB</stationID>
-+			<name>Suisse Romande 3</name>
-+			<shortname>Couleur 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731612E058C045EB2E699CE7A457AD516992A350A702579000BA6C5A17EF171454EBF</stationID>
-+			<name>Svizzera Italiana 1</name>
-+			<shortname>Rete uno</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161774BDACFA3A2D1010ACDA1358A21BDEE9D11EB4BD544ACAABA25E9C81D3D9877</stationID>
-+			<name>Raetoromanisch</name>
-+			<shortname>RAT</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161DA24AD3329D2F6A2F676CD4A618F3E9B00F3398DBA3248F87B18C1062C566065</stationID>
-+			<name>Suedwestrundfunk 1</name>
-+			<shortname>SWR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731612C2E8DB69C060D2B9F6D99B76A0C6915CA9C1F570DAD0BA21633CCDCA6968999</stationID>
-+			<name>Suedwestrundfunk 2</name>
-+			<shortname>SWR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161D5A748788A860FA1780DD3A85D63C4B7A24338B84D949FE74913F310D1281550</stationID>
-+			<name>Suedwestrundfunk 3</name>
-+			<shortname>SWR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161017919BC747D3C3050F193AB1FDD0F0B82062E2AFE4A9A04A9164264186C2298</stationID>
-+			<name>Suedwestrundfunk 4</name>
-+			<shortname>SWR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161310AC50726DB4819FF3E73563B2121FC09B2624B0AAD25AC1C639DB73EED8DD7</stationID>
-+			<name>Bayern 1</name>
-+			<shortname>BR 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161BCF2994106AAD995088C4AEDD8F0901CE0864622EA856A5E4BD8B09C8C0A481F</stationID>
-+			<name>Bayern 2</name>
-+			<shortname>BR 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161F93BA8D4C7D85846202BC721054391B03E0FE53A0A25A5CFB27E56D49F5A84ED</stationID>
-+			<name>Bayern 3</name>
-+			<shortname>BR 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161C5E00C7CED1D20457FD741161A38C3D2E89849DA70700FD9B4053AA554FF31D4</stationID>
-+			<name>Bayern 4</name>
-+			<shortname>BR 4</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161E936AD3F2AA5E9AE3C541FF6AE99ABB898C3D8FB485F46E811C7FC68DD14D70B</stationID>
-+			<name>Deutschlandfunk</name>
-+			<shortname>DLF</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316144EFE270366507B0E1DC5B5D9CA2650577187AC960D27D0B063152EBCF43A076</stationID>
-+			<name>RTL Radio</name>
-+			<shortname>OLDI</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731615F50D3ADC6C7CADAEED6BE118E60ACE86C254FF12BE25AFC2A578EEA92F7A1A3</stationID>
-+			<name>Oesterreich 1</name>
-+			<shortname>Oe 1</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161EB926A11E10642DFF9732D249A77006949B6141F7E541DC09149F03447AA1B5C</stationID>
-+			<name>Oesterreich 3</name>
-+			<shortname>Oe 3</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316111AD7DEF5739C998C08D84F388A1E7AC8B6A3B44BFC614A83E2894F818E015C4</stationID>
-+			<name>Radio Vorarlberg</name>
-+			<shortname>Oe 2</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122527316181DDE5688DAC8A726278689857F789B201D9BFECA62AACFAD6039B1FF103AEDF</stationID>
-+			<name>Klassik Radio</name>
-+			<shortname>KLAS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731619C8109156AB1A348BF532BBCF4DAF1B77311C8B00BBC1AE4259A2BF82F1A2C99</stationID>
-+			<name>Sky Radio</name>
-+			<shortname>SKY</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731613FD044AB1BEE2C8AF97A15DC1A1558AEDA9FAB84399E834459AAA8E73BD6F6E6</stationID>
-+			<name>Deutsche Welle</name>
-+			<shortname>DW</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161B078B9CCFB310C45D6DF651133CF77D5E9CD6C4162A1292BF5FF9DCE6CEA6A58</stationID>
-+			<name>France musique</name>
-+			<shortname>FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161247F897CFB0D11FF8DDCF3BF74EEF92D78187BF0FC3BF6A48B726DE551B65D44</stationID>
-+			<name>France culture</name>
-+			<shortname>FC</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161089D4E01B7FCDE677247DBBE8112EC1B6D59860843F08720DEB6C0F314150928</stationID>
-+			<name>France inter</name>
-+			<shortname>FI</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1225273161FB03759B05089B0E9B49DD4C1BAFBA08AF0F697E11D37F931A337DB02710F30A</stationID>
-+			<name>BBC World Service</name>
-+			<shortname>BBCW</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12252731612C2CF11CF81CAB1D6BF82A4CDFC854050815CDEFF9FC3F4EC54A3B5B9DFF71B1</stationID>
-+			<name>World Radio Switzerland</name>
-+			<shortname>WRS</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,14 +1,19 @@
- SUBDIRS =
--EXTRA_DIST = "diepoldsau-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp"
-+EXTRA_DIST = "baar-cable.krp" "diepoldsau-cable.krp" "egg-cable.krp" "spiez-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/"
-+	$(INSTALL_DATA) "$(srcdir)/baar-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/diepoldsau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp"
--	$(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/egg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp"
-+	$(INSTALL_DATA) "$(srcdir)/spiez-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp"
- 	$(INSTALL_DATA) "$(srcdir)/stansstad-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp"
- 
- uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp
---- kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,361 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+    <stationlist>
-+        <format>kradio-1.0</format>
-+        <info>
-+            <creator>kradio-snapshot-2006-09-20</creator>
-+            <maintainer></maintainer>
-+            <changed>2006-11-25T18:25:59</changed>
-+            <country></country>
-+            <city></city>
-+            <media></media>
-+            <comments></comments>
-+        </info>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164475721C836B02D3F9FB5323F9B91DCC801F18604275400966F77F8438EE0DFD21004A3</stationID>
-+            <name>Musigw�lle 531</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>87.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476030DBDA7CE1895880614BD880D190BFF85874123D1EA380A59325BA85DAD0E36B75</stationID>
-+            <name>Radio BEO</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447645722BEEB11FBAE650D5B6E528AA5BE6550F03E5A316B7D12360F42AD9ABBE71A49</stationID>
-+            <name>Virus</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476485623C22102A116C99B38AFFB8899E4C63E7CED92DF119968181A3D45E6B1E082D</stationID>
-+            <name>Radio Regenbogen</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476522F136F4B1AB6D4A0F9B8640C7C52001600D8812FC2AC614AF11B13117F9100683</stationID>
-+            <name>DRS 2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>89.9</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644766088531147C8EBFB983BD17E35EFAEFAB6AA2910217FB62BF2CC43087B928E20052</stationID>
-+            <name>DRS 3</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>90.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476645F8334668B73282FC0CDDE1E642E1A4B1F4068638961E8E73BFCEEEEB21E08A08</stationID>
-+            <name>Oesterreich 3</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644767132F795AABE1F145F8EC35E7EA1D9FDD1125452F31152EF022E3D77DDE4002C436</stationID>
-+            <name>SW-Rundfunk 3</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.29</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644768047E4A9DAFF301C6C6B33D8CC33F9BA07E6000AB137E484161BD939A14063DFCA4</stationID>
-+            <name>Bayern 4</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>96.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447709817EED4BED4A4579737F308C6D1510E8578017F10D3D3DB349B32AAB44A1ED9CC</stationID>
-+            <name>Radio Melodie</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476632F724A008F02E6D3AD51D39DC085CE1B82F9FA9EFB1608AC16C5F26D9020A9C82</stationID>
-+            <name>Oesterreich 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>91.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447711474A26EC5B9D08F4F13D196CEBA8A340ACE82EBD0B8E9FC61BAC8125C82C013D0</stationID>
-+            <name>RTL-Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>102.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476846FC95432884DBDC07B8FF2792A20AA3D097403536C233BD1BAF0BBF08C2C58F13</stationID>
-+            <name>Radio Svizzera Italiana</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644771468AA776EFE5705F034B7D8C34A8825AA572D8C8EABC803DE94A4F540E4018EF89</stationID>
-+            <name>Radio Rumantsch</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447673275A830CAE620C2602AC63CF04DC44B22EF74C7B9C0B7D34F9559968C3FA5DDC7</stationID>
-+            <name>SW-Rundfunk 2</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>94.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476871DC16BE6BE1FC8EBF76E8C1D96294EB0AFDFDBB681D07C6E629295715E93760EB</stationID>
-+            <name>Radio Suisse Romand 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>98.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447719145CA243A149CFC3CC5B277C8C952C68CC4AFE241170805028B9D8F4C6F8EFC6D</stationID>
-+            <name>Sky Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>104.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476689247ADCA226D16E3A1A47B3F109347DC3A07082682F51A09946D8CDEF76FADBF0</stationID>
-+            <name>SW-Rundfunk 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>93.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644772145A80A226FE3438AEB2CD7C67CC50D04D9A6963445C389F8544829335827FB68B</stationID>
-+            <name>Swiss Pop</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.6</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644768870A3FC50ED9BB1F3FDEFFBBECC9510AA8113A440A46895F6467573AFFB1DF7D82</stationID>
-+            <name>Swiss Culture + Jazz</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477240CF1F4C25E2A3F009578B936EE6802812D0351938C0B0A38F7E268D4F5D010653</stationID>
-+            <name>Radio Eviva</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.1</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644767613828AAB12B9DA61869FF71B91D28FA83ADEF88D7FA446D0927C3DB626A0FB90C</stationID>
-+            <name>Bayern 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644772595D1023FE4609DB5BC01A162A2A370269F79F81AFB6F8C6B575C778A3CD11B4BE</stationID>
-+            <name>Swiss Music Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>106.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447700658B7827F2F1C3EEC396586A5694F03645A8C0BC343E030D1B49F58CBE66B3E03</stationID>
-+            <name>France Inter</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.15</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447727511838E69F94FB51A15470F7EFA96E9AE099AA1836A7562ED95671C0F1E0E0C31</stationID>
-+            <name>Radio BE 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.3</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164476665D42950581695565798A8D7D864F8ABCE5D945CF141430F2D7EF9245F54829B88</stationID>
-+            <name>Swiss Classic</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>92.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477303B8282E6DA0AA48A55E59F852CA2935F99E6E4ADE05329EDC2F39F90064B8E914</stationID>
-+            <name>MDR Sputnik</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>116447703272325203D3A39FF25A9013A17926FC95911E8A2B3E0508C8A1911F65B54316E9</stationID>
-+            <name>France Musique</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>100.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477369E78B9920982741ACE5BF2403152CBF4EBE4E51E9AFDDE6481FD84B61DCB539AA</stationID>
-+            <name>DRS 1 Regional</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644767869F8A1A9D954FDA85F658D53C4C4F463ABF512D00DD6ACE2A7E183AE736C3E2E7</stationID>
-+            <name>Radio Network 105</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>95.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644770561E9A7C4F01D692E947D4EB715F243D6340CAEB5FDA1AFF9BB6C38ABBC75427F0</stationID>
-+            <name>Klassik Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>11644777782CECEA00CDCCCA218FADB5451F25842A2AB8C8D397694C6A7235EF1A892EDC9A</stationID>
-+            <name>Couleur 3</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>97.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477077DF2B858361FA4F6EF082A705A96D694DCA0E7665C753CBC1EFD9117753616E08</stationID>
-+            <name>Capital FM</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>101.7</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477882C2E4BE3D45186DC9A9DAB61CCDD0FA342DD5865C8154713B73638D36E76FC1CF</stationID>
-+            <name>France Culture</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>99.5</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164478027D46AFC7CD8F5F0F27BC708272780F0447F1FC0E532845417F4900ED08038267C</stationID>
-+            <name>BBC W-Service</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>103.4</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164478081D5D6FD1F78B4466274D593B544F3484C1CADE593A1668D108C4C451E287E2ED6</stationID>
-+            <name>Bayern 3</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>105.2</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164477159F2E7FEB9CAF1D312DC9D665718F264E2B23BEFEF956E0F53F4D48DB4E9829CB1</stationID>
-+            <name>Sky Radio</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>88.8</frequency>
-+        </FrequencyRadioStation>
-+        <FrequencyRadioStation>
-+           
-+ <stationID>1164478115A1CBD0F9B921FF6D38E14579A8AA498D2A05DCB3A7020A5C059EE4A507B6CAAD</stationID>
-+            <name>Radio BE 1</name>
-+            <shortname></shortname>
-+            <icon></icon>
-+            <volumepreset>-1</volumepreset>
-+            <frequency>107.3</frequency>
-+        </FrequencyRadioStation>
-+    </stationlist>
-+</kradiorc>
-+
-+
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,239 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Tolga Kaprol &lt;tolga@kaprol.net&gt;</maintainer>
-+			<changed>2009-03-22T16:56:00</changed>
-+			<country>Turkiye</country>
-+			<city>Istanbul</city>
-+			<media>antenna</media>
-+			<comments>Based for Besiktas District</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256F976C1C9EE76F2A0358FF48D0C8CA359A63AB04AE6170E6E6DD15E535DEDCE6F</stationID>
-+			<name>TRT FM 1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>113310325667257411AA7CDAA02CF2BF8682CFAE0730F602AE53D1E377B6AAEA8D73644F41</stationID>
-+			<name>CNN Türk Radyo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032568361DC126F4320BB3A88CB142BAA17B6381608ED1FE62C0C23E09BC8385E7A40</stationID>
-+			<name>NTV Radyo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032560BC71AF1443D07D68F7AA660D6ED3CB72F51561D0868328E48112C379A2ECEFF</stationID>
-+			<name>Haberturk Radyo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256027AE7ACDDA8B25B6DD21B02DA5E86924D65EAC985866CA95C42D97D285CA211</stationID>
-+			<name>Radio N101</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032564E7A550EEE6211419FBC18C3E9B0AB9BC2A5E73A99F889A811893A0BCE956F81</stationID>
-+			<name>Lig Radyo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256B7EB1EBEEFA0A2990C6F6E6CA8BBF4EDB07B47E815062EBD5D39B497610F843B</stationID>
-+			<name>Radio Dinamo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032560F7121DBCB34D537AD1A03F44CA586717903F6A5A280127C508F5CBFCD924991</stationID>
-+			<name>Metro FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032566E340315A3C3FFD132FE6A71D036623CD6A6D3437FF98BD12681CA47B71A784C</stationID>
-+			<name>Number One</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256F9BF82DF0814AD9897CB0CEDFBEBA9911945B367CA3271986F54C6F7A31D9A07</stationID>
-+			<name>Radio Mynodose</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256AAC27E61C4EBB1104FBA47A7912A2D1FE2741E5C2A770041D85BE6EDC05B1BDA</stationID>
-+			<name>Radyo D</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032560DAF105BA4EF17AEB45103D9129DFEA293409989B56A7C8952D1818DBB25042C</stationID>
-+			<name>İstanbul FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123773385189517947A19528E9A57CAC0894995D3247B4AD8B5C2448FF8A873901995B2C54</stationID>
-+			<name>Joy Türk</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032563063855FA8319AA8C9683B9329810FCD7AFC25153815CFF082FB5235EA02B146</stationID>
-+			<name>Alem FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256DA5A6933830D45EE5115C15AEBC121DA36ADCD16308642B9FE159234C4FDA992</stationID>
-+			<name>TGRT FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032564A1086A845369C8F051B1FBC9F021A505A4BD4A812D2A5049418CB3EE677E07E</stationID>
-+			<name>TRT FM 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032563CCD20721596677CE8F9F5590205147CA1F6D2E9F2F0C638C3C2A9138AB733B4</stationID>
-+			<name>TRT FM 2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1133103256993932C327E1E6728B2991C26A117AA31507B69F280FC07885EDD4B6C94444F9</stationID>
-+			<name>TRT FM 4</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032564133D26A4C9D715126DA6A05821C2C8547ADB0B6E292ED2AC5D886CD695A9AA3</stationID>
-+			<name>Pal Station</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>113310325652A761312F07237C7671866B97CBE6B48547F34456FCEE48957F9607C6569023</stationID>
-+			<name>Akra FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11331032560A559D71BE292F346B96164129EB47905681168232A8129E3FFDCD626BB1F9B3</stationID>
-+			<name>Power FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12377345702367CB1D14908BAF372C84879F6014A9EB3C2D84388EE34A0786123B38D10913</stationID>
-+			<name>Radyo 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12377345953C28151FC597DC78EAE3322BD8C12AEAD7337873397BE9C3A350BE4A90D67C5C</stationID>
-+			<name>K-Rock FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237734609DFBDCB3B4121E1080EB6F6791918B96C2EC8453558FC2131B60AE9CB393C9FF0</stationID>
-+			<name>Açık Radyo</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1237734626985324B699C0AC2C37DDE0AF723CB325AEF1AFCA5C66DC4E9DBD1DB35570F599</stationID>
-+			<name>Radio Oxigen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123773464032B65D46D84318ABFEB1E880E6B9B9691E282445A5DDB69E68E8375FA73ED14B</stationID>
-+			<name>Radyo Eksen</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12377346804EA0ABAE9A3C8BA69FABB4F07B268E771F7F0BD5DE98389DF80D9F800F28E128</stationID>
-+			<name>Capital Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12377346942C7A5A6FDE6C5A6E1FDFF7D6F040C823E9D0DBB9923884C7AFB5200AA05F9047</stationID>
-+			<name>Joy FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.6</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp
---- kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp	2012-11-25 00:48:00.000000000 +0100
-@@ -0,0 +1,501 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot_2005_12_04</creator>
-+			<maintainer>leopartux, &lt;leopartux@yahoo.com.tr&gt;</maintainer>
-+			<changed>2006-09-24T16:19:46</changed>
-+			<country>Turkiye</country>
-+			<city>İzmir</city>
-+			<media>antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607FA7E2E4A53A41AE958DB98159D59BEEBD842C5DF5F6322151D6BBB2A029A07D9</stationID>
-+			<name>RADYO KARADENİZ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>87.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607B40A26E67591AE45B92DC144480D83B900716DBCD0608DC88818AD7C74264ADA</stationID>
-+			<name>TRT-3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607DC9FC312AF54A5820F54F6D69F13B6DA7834E3EB8449B1001039ABD906FFAB6F</stationID>
-+			<name>MORAL FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607EFF83345BFCEFBAEFAF1881B9FEB912ED88EBB5F9C4C28450B4A1C3430EDDCBF</stationID>
-+			<name>RADYO 35</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560775C8F2F2262D92720199F1766DC82E20C507D29B926D7F027CBF7F7040CEEC62</stationID>
-+			<name>ALEM - FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056078312289400695553F47805AC33DDE809782DE802697526527568315202F9FAED</stationID>
-+			<name>SHOW RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607B5E20EC323A8E43E9553520088A61D9B0BFB32B8E61EB1A089FEF16654F633A9</stationID>
-+			<name>İMBAT FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607EC1A0C9EF7B06E83D93436764017E649C1B4F90CDE9C09E1CD414EBBCD4CCCCC</stationID>
-+			<name>NUMBER ONE FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607FAE384F5B5F1E3B604B5612D64BCD9450BF8385755621A2DEAEEA0B1DE1AE04D</stationID>
-+			<name>SÜPER FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607E505526A4CAF0C67C9579B9DE0ADAF67664515CA85DC1780BC78EAA24A23075C</stationID>
-+			<name>TRT-FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560756282CAC18B01D0EC3397BF5B75167B3A0B249DB684EAE9336C14A4FB71BAEE5</stationID>
-+			<name>TATLISES</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560734851591640F1FB0B7CC04962AD8C2EF2CF8097700FCB7B1567A3630B9031AD0</stationID>
-+			<name>TGRT FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607B8C8EE6D45D70363E9D5FDEEA005097D8CFE64BCFB17C55CF4997EA999CF5DF6</stationID>
-+			<name>RADYO EGE</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560798C8FD6E5B3CFFCDAE6FF62B05835EBA661CDAD465511335D4CE222E5EDA796C</stationID>
-+			<name>S SBS TÜRK</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056070F3750DB792C0D8E7A82C170894000493F167FC34457EA674E4C5E918F36A3C7</stationID>
-+			<name>CAN RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560752926AA64A6B4EB4BF08023558E67F3934CA10086150EED0E6D724AB2D0D7F61</stationID>
-+			<name>BATI RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607C2B3A02FE39ED42C6C500CC73BC8F3348B3B0384180C28440220F9BCFBC95EB0</stationID>
-+			<name>RADYO HERKÜL</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056073C37C0249646B9579684894FCBF257164C13EC62E959F45959314281D8292F84</stationID>
-+			<name>DİNİ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560748518A040B4D49C702A8234BA8B2F7F7535D057275B82E35B774E7448977B1A8</stationID>
-+			<name>TRT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607E4D0917B5CC0C5C73B223F6F22D7027E88EC628B76F5714628215FDA0DC0B455</stationID>
-+			<name>ROMANTİK RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056071310D735CBD17F34FC9E0796AD7224AA70652439B4373BCA9FCCDC28C5C8F02A</stationID>
-+			<name>NTV RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607C63D293FFC07F5D40C466CBC59E902DF12D5053986DF725ECA46E9C1E6A2B5B9</stationID>
-+			<name>RADYO KLAS</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607E2AA531318CED2328BEFD30BE86DD8AB6C938D99A12E140D9DAFBF5FFFB5CA16</stationID>
-+			<name>KRAL FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607F7EAB9637AC2DEC25EF87FC9C4BA3E6053E105E3267439970F74E23271C9A94F</stationID>
-+			<name>KORDON FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056075AE767CC1742EE410890A3434BF841DE4CCF8E04384C668F48FCF7A295EBB241</stationID>
-+			<name>AKRA</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607E23C551FF00DA5D3B6900CFC96A53967A5A3D06B321E20F272B10D52B66D3A9D</stationID>
-+			<name>METRO FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607C29AEC7E64F2BD94D8F90B69DDD92AEF6F8219916B6A4C1D6370AC3986BFE78A</stationID>
-+			<name>RADYO ÖZMEN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056070AE78D419999974A013C8B1DE244AE6F8AB229050B4BFC3EF2A3C8E1818AECDD</stationID>
-+			<name>RADYO ÇAĞ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607A0554A722F050281FB640527CD582CD086A783D05314DF7DA99868FB51027C6E</stationID>
-+			<name>BEST FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607261BF429647FEC9AF5F182BECE1ABFDE5E6841AB4751779F19AA4E44A48C2064</stationID>
-+			<name>TRT RADYO 3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607DC02FAA3C60B19BF7D463FE4E57FF6D1754E336F2EB5C09269A0C4CC9FADED7F</stationID>
-+			<name>KAPİTAL RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560718F41B55DA2C22C8CAFC7E646FB818DD5F3FA899E4B716D0B081E9783EF2EB1E</stationID>
-+			<name>POWER FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607AC13C9B2E73B51979ADC9E07FE4E975B0EB34CEACEEDCE31338BD8CEAFC1565E</stationID>
-+			<name>POWER FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056070DE8C2C54FC76A0CE7A5804E004F6843E0993FF66783850FD14B5A27B9B06B00</stationID>
-+			<name>TRT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607B5377E3FDAE59A8798658C4F60F97AF71D8B83DCF21BB780E63EB31AAB6A9F6A</stationID>
-+			<name>FM İZMİR 101</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607A2D18FDB42A8746E13B11517D5399E0C3E97810CA2137BE97264E6174A1C5F2A</stationID>
-+			<name>RADYO 7</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056070AE74CCF17E01A748B57E7FB9B90E1CBD7832D22D52808F73DB4B74FF73A1B90</stationID>
-+			<name>BUCA FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056078A9AA84174307D34A82FB4934AF5AA9FE8D127E21ED075EEDC81D3B10EF660C3</stationID>
-+			<name>YAYIN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607866A5463E5CDE0B629E0448E2019F9DF6BF9FF6CAB3E5CC01371F184743D6161</stationID>
-+			<name>YAYIN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607F161CDA7E8B7716584D06C42DCBC31ADEA54E41A89E5533C7C755FBD01457233</stationID>
-+			<name>ÇAĞRI FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607E3DB104F21C6D584C2470DA6757609FCB5F041BC8DF37995D178CD501CD6E3E7</stationID>
-+			<name>RADYO KLAS</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056074FBE7B317764E18E47444F0C5605B7A4AA0E6E8C48E995846ED16A9D447F5DF4</stationID>
-+			<name>KISS FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607813B68DE1187BC92E8443057F779259412E0F5C5A19B6F48234809F58ED80E74</stationID>
-+			<name>RADYO SAHİL GÜVENLİK</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607FDD595CBC65F79B5308FA63D07B3492AF46849A8892EECF9D50907E5A49F75C3</stationID>
-+			<name>RADYO MEGA</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607FD0B95759823566EF1414449C2B4A747605E9C9994A559E3DD3AE72B603ED397</stationID>
-+			<name>YILDIZ - FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>11591056072E1066F35321AE34E12FEEF7B0EDBBB65CB33830D9026DFC936049285A0F7F90</stationID>
-+			<name>RADYO İZMİR  1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607F87CE144CC085AE076248CE7689A592571F142D16E26261229BE68BD99E69C0F</stationID>
-+			<name>POWER TÜRK</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607957DCEA71BC3720EC830BA271A93149816AF306870516E1B4E5F62EFD22DC213</stationID>
-+			<name>RADYO MAYDANOZ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>115910560765128416B0A5B64C0F1ACD2416FA82F09BC57C729FA982D1333C43016761F906</stationID>
-+			<name>RADYO 5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607ABADBA5D050666CD5490144F32CC52C8DFCB1697610B885FA4B3E4ACA0489C5D</stationID>
-+			<name>MARMARA FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607B430DF02D6E1DF350808F9BB1259A2DA0C0610EF236A642DC8EB6015DE926E2B</stationID>
-+			<name>RADİO SPORT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607DEFBE0652474F7C9279D33917322527B9B49AB91D0F5BA571B38BCFCEC5746D4</stationID>
-+			<name>DEMOKRAT RADYO</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607D69CD982A9991158EF55CF55931CE256E36CB987D47EE8F96BAB7599DF323996</stationID>
-+			<name>RADYO GÖKKUŞAĞI</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1159105607C5C1733FC47A4D8400C1FE885FFF45C80A378DC50971AB47AA459209E7B188B9</stationID>
-+			<name>RADYO DOKUZ EYLÜL</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>108</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am	2012-11-25 00:48:00.000000000 +0100
-@@ -1,10 +1,14 @@
- SUBDIRS =
--EXTRA_DIST = "adapazari-antenna.krp"
-+EXTRA_DIST = "adapazari-antenna.krp" "istanbul-antenna.krp" "izmir.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/"
- 	$(INSTALL_DATA) "$(srcdir)/adapazari-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/istanbul-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/izmir.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp"
- 
- uninstall-local:
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp"
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,285 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+        <stationlist>
-+                <format>kradio-1.0</format>
-+                <info>
-+                        <creator>kradio-1.0beta3b</creator>
-+                        <maintainer>Igor Shavrin shih@i.ua</maintainer>
-+                        <changed>2007-09-24T01:34:37</changed>
-+                        <country>Ukraine</country>
-+                        <city>Kyiv</city>
-+                        <media>antenna</media>
-+                        <comments>Generated from http://www.proradio.org.ua</comments>
-+                </info>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568285E2B7D4E87359DE08E1C16FF2A41E2CC4B4079B9D587F66F9DAE1943C32413C48</stationID>
-+                        <name>1+1 TV</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>91.75</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568345ADD24685A544861E9BB16C04C9E3D475CC7A53B57AB349052F68D130F313C4B1</stationID>
-+                        <name>Retro FM</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>92.4</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190585238FF5CDED1F6E49D979E1C6E8586464ABC5963D3821EE8A2700E280242DBEAD939</stationID>
-+                        <name>Europa Plus Ukraina</name>
-+                        <shortname>Europa+</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>92.8</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568386558A019551B727BAA9B7E6597371BE9B786A7FA4D579B90CE762BB193AA7B441</stationID>
-+                        <name>Radio Kontinent</name>
-+                        <shortname>Kontinent</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>94.2</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905684061104A7FFAF246E4D84AA2387207120AA39C33D45E589BB89055F4F7FDEFB82DD</stationID>
-+                        <name>Love Radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>95.2</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905684242BF5811F0423AFCB4073E9C8A3CFFBF24665B4F909CA9A4F99CBD5BBC036BE3B</stationID>
-+                        <name>Jam FM</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>95.6</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056843858C509C9C78DF4C47EA8A8DAC2C52B0A337905BA53708A22DD133B01C0B1B824</stationID>
-+                        <name>ERA FM</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>96</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568357D10207D487D67CF384A86594ECAFE68E392EFCA113BFF7E46CEB0D8B931DAFB8</stationID>
-+                        <name>HIT FM Ukraina</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>96.4</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056848271CC0E7F7A1FBFBCF9199138ED8A9A0C523EA5108ABA25E1307C126E7BD74401</stationID>
-+                        <name>Renesans</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>96.8</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905684983370750F90BD5C902D66EBDFE5296BD5651766EFD709E4704B22548DBDAF7308</stationID>
-+                        <name>Radio Kyiv</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>98</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568511F84481912290B9578CF4B8E7919E6638815FCD4570430CD1B0DEB4C711F64BF0</stationID>
-+                        <name>Russkoe Radio </name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>98.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190585757834E40A75A390555FDAF2FD8F879BE84C1A4200B48576DE998BCEA2FC5E62DF8</stationID>
-+                        <name>Nostalgie</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>99</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568560F0EE4F93BBB53A68B0281C926A5BD23C335B5D1D329947E2C0A52DAE396749C7</stationID>
-+                        <name>Radio One</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>99.4</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905679324E90F6002986D3368F12F1CFEE67E990F11A9C6DEE84CB5AF68299405FD665D2</stationID>
-+                        <name>Gala Radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>100</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568578411C4F3F6FA8981F3F2BFD5CCA61C19A25F35BEE712D3C71E030FACD22E99B0B</stationID>
-+                        <name>Narodne Radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>100.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905686031692090120A5CCB19D0C832CE9CBAF0F82401488F5D50998B59251BE3ABED287</stationID>
-+                        <name>Melodiya</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>101.1</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056861728940CAC20705F67C7F2C856BBA6848E21899374B76A38EBDB313B8591A9686B</stationID>
-+                        <name>Music Radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>101.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056862470D26DB3B12FED7B8ED2DC4508E163BD9BAABA42D048F56B213F13C597D69025</stationID>
-+                        <name>Garne Radio &quot;Shanson&quot;</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>101.9</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905686391B87595BB9BEC38746C9C3E947AA6D55A0A4C552772A10E0F80CE500953927FC</stationID>
-+                        <name>Prosto Radi.O</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>102.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568655B5EB86D24DD802856EC39BBEBC51BF22050169329E05C2F860A484FBD6313DFB</stationID>
-+                        <name>Lux FM</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>103.1</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905686799F70922A7C9F9FD1EB52C97F2151C5AB4821C2C3BAEAB8A665CC01994442666C</stationID>
-+                        <name>Radio Rox</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>103.6</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568692FD2A3434E88AE180B7DDD0B4F56A5E5AE51759D6F3F56DF9CC27718AFA269676</stationID>
-+                        <name>Radio Sharmanka</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>104</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568717454DE097A03235C880EACCC7C40BDDBFC2EB270C88B8734B91595DF4BA8D5249</stationID>
-+                        <name>NRJ Hit Music Only</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>104.6</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056872687EECA44E2309197D198412A1887DE7F0B2449EF314EA607FF35B5F170FC7A37</stationID>
-+                        <name>Ukrainske Radio 1, Promin 2, Kultura 3</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>105</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568745E5015664A7B31B09C9613B79F8EC8962BF2CB26175427DAF927F844A0287C479</stationID>
-+                        <name>Perets FM</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>105.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056875609A0A52CFBE42B09E02389F481B47B3A0F4788D7FA244C0348D39A55E58022B0</stationID>
-+                        <name>Dorosle Radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>106</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>119056876964244E846B8E8C747093DD99C135F11B0CD12BCD83B3425453F00E76FE83686E</stationID>
-+                        <name>Dance radio &quot;Kiss FM&quot;</name>
-+                        <shortname>Kiss FM</shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>106.5</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568784E96F88515B6C5A632D94FD3DDA890DF833807614BA2B3B48B73E6FA2A47D2CA1</stationID>
-+                        <name>Europa FM Kiev</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-0.01</volumepreset>
-+                        <frequency>107</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>11905687949FDD940404BDB04A08D1D424537F3BA1B276ADDC688AC7B08BA7F8509C9DF904</stationID>
-+                        <name>Auto-Radio Ukraina</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>107.4</frequency>
-+                </FrequencyRadioStation>
-+                <FrequencyRadioStation>
-+                        
-+<stationID>1190568804C04E9CCFBED42FE3B715B52A019A58DDA156C4E489D2F782F2E63C96D1DEF49C</stationID>
-+                        <name>Nashe radio</name>
-+                        <shortname></shortname>
-+                        <icon></icon>
-+                        <volumepreset>-1</volumepreset>
-+                        <frequency>107.9</frequency>
-+                </FrequencyRadioStation>
-+        </stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,274 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer></maintainer>
-+			<changed></changed>
-+			<country></country>
-+			<city></city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>119273391379030B77DD389261E2FBA0A991B6701AF3A5862288308F40C544DA814C20062B</stationID>
-+			<name>Перший Національний</name>
-+			<shortname>ТБ1</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>65.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316494B73351D34EF40803093A58359F67A37F7E8ED38E149F13D094A7905E06E42474</stationID>
-+			<name>Українське Радіо 1</name>
-+			<shortname>Радіо1</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>68.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933165321752787BF1002D79ACE570EE9B87CCBBCF246E72E419A7BE774439E089F5D44A</stationID>
-+			<name>GALA Радіо</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>69</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316570E34F57BD024F9CB7EF6C51C4F87FBF1411D36A02B804C5087321F7D3DD0ECA90</stationID>
-+			<name>Радіо &quot;Промінь&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>71.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933167682F7B1489DDF8BA166B64AEAC020BD9AB32BC286C12CCABDBEA80A35B5E43BD6E</stationID>
-+			<name>Студія Майдан</name>
-+			<shortname></shortname>
-+			<volumepreset>1</volumepreset>
-+			<frequency>72.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11934927917C3A29AD199B030CBC096B56CF0305BA7D65E112F492AB599F562F27493D6107</stationID>
-+			<name>Радіо &quot;Культура&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>72.86</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11934928943D70A4E7FE3DAF3F5BF2705C3969F3B99BB6C0553CA824E1F68E5EA9F1A8C884</stationID>
-+			<name>Радіо &quot;Ренесанс&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>73.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316628EC33AA5B9929BF4C2631419F0D92BD2F7383D5D729D88DBAC41A26E508A85A7A</stationID>
-+			<name>1+1</name>
-+			<shortname>ТБ2</shortname>
-+			<volumepreset>-0.01</volumepreset>
-+			<frequency>91.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316720AA067FCA76F0C1D40116F62296E77CA12F35FD747922056E9A187C9EB78BB8B4</stationID>
-+			<name>Радіо 5 - Ретро FM</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316785C490D8F8B28F9162A65D003FFEF4671633A4A077142D6B289FB47C3FE3EC79CA</stationID>
-+			<name>Радіо &quot;Europa Plus Україна&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119331681445D8A1D12737761FAC73F3EBEDE3D113C96F8D7A3072F6BA50107BEC2E20C561</stationID>
-+			<name>Радіо &quot;Континент&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193316826104C89BB1C8D151978F203860D8365D823887E838A590C5647A7888B4EA98EC9</stationID>
-+			<name>Love Radio</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.2</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933168995119FD101E5D954F34B599ABB081A108B810AF992A1373662764B3D225A1BCB6</stationID>
-+			<name>Радіо &quot;Джем FM&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11927339390C925CC6F4D2FFC1A39CB31E29BD522BCE8D9ABA40F583629678876816CE2A98</stationID>
-+			<name>Радіо &quot;ЕРА FM&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933169254CD9D9791B9F273C4813420DC8FC90514E836161B3CDC2F991AC54E6BC3A28A5</stationID>
-+			<name>ХIT FM Україна</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933169780A493D079BFF56533C5053CEA8FE02353BD90310F14495816E68CF86A74DF015</stationID>
-+			<name>Радіо &quot;Ренесанс&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119331699790CF2CEFAC144AC8DE31A870920A047FC7C6032AA36CE108C2F8650447949673</stationID>
-+			<name>Радіо Київ</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317011853A0311E4EC1F465CECA08BAB32174E31A836E55DF7CBA4888BC6F5F5A0C127</stationID>
-+			<name>Русское радио Україна</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>98.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317033B598FBEDC8EABE2B9D942948474DE8A883AA4C7F8A67D09A3E95A76EE9173005</stationID>
-+			<name>Радіо &quot;Nostalgie&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317086C9C8D6C58704A210A165F228AEC16247F8B762407EA5310529D31452E916770D</stationID>
-+			<name>Radio One</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317113A97FA7ECBFA63810E2A2057D466C163AFA77A84ED004D6B68D24C64D5B58F260</stationID>
-+			<name>GALA Радіо</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933171496457288D14D60DC35B0881F57DDF96C69A4A11E1DB04F13586FAF5E6D864C2DE</stationID>
-+			<name>Народне радіо</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.45</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317177C554C7CF311160E3FD986FC8CAA7BDA7710B3CB1558E3BF482BCBBABE7F5653C</stationID>
-+			<name>Радіо Мелодія</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>119331719696B32B0FC85E58AA2DBE73FABAE6E48F944E6DDF47149319834D58BF72709178</stationID>
-+			<name>MusicРадіо 101.5FM</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11934929310E6587D3850F1271122E6F0EDB876906C8322E0AC9D7420EBFE33412288DB24B</stationID>
-+			<name>Гарне радіо &quot;Шансон&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317221249DCB1C7B41AD3B55410BE79B37A6A0255EFE17FCD590BF2555F1EBBA79696B</stationID>
-+			<name>Просто Раді.О</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317243B36E1F3F4F27D1638AD01331ABB4A2CF35E3614E64E54BB245A8BF4646FD9098</stationID>
-+			<name>Люкс FM</name>
-+			<shortname>Люкс FM</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317469ABB39852E8DC69F360F2D9D920193307D7333BE3DC2B6A661F796B316709FEA1</stationID>
-+			<name>Радіо РОКС Україна</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317255835DCE993DBAD5D6179A124D84301373F933B474A95849C1B29CA26B416D6271</stationID>
-+			<name>Радіо Шарманка</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933172801EACE4A7FE3F78FCAE40F4C93C5C3C4E44F57967CD206D7567429A11898B05F7</stationID>
-+			<name>NRJ Hit Music Only</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933172951418D970E5224A322D5D3CDE884E17FF9A77AFEE45038A700C283BCDF4546971</stationID>
-+			<name>Промінь</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193493005253C16A430195E9F18969767B0A2C3F2ED37DF1A2C9307977481F7848345F23B</stationID>
-+			<name>Радіо &quot;Перець FM&quot;</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933173102BF63585CC18E76ECAE440C6EF690DDD1F564FC7F98B900A640DA0F9FAA97FEB</stationID>
-+			<name>Доросле радіо</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933173320EB03AC65D7E9302C66AC44B173E19A37F5075E812B5C13413B3E38E6AED2244</stationID>
-+			<name>Dance radio &quot;Kiss FM&quot;</name>
-+			<shortname>Kiss FM</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193317353991E196D4840CAA699A52C9560081AC37D77CC34073594673069F8B347017151</stationID>
-+			<name>Радіо &quot;Europa FM&quot;</name>
-+			<shortname>Europa FM</shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11933173660CA24F98EDC6DE77443FE71898A479B6BACAC5FE7B85C6A08CC96714689CE881</stationID>
-+			<name>Авторадіо-Україна</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1193462232F3BBCE734B7DE4DE9B2158DC76B0AB5A88910A99720CFEC43C02F16E87E22E23</stationID>
-+			<name>Наше Радіо</name>
-+			<shortname></shortname>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,143 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Igor Lobov &lt;ivl@front.ru&gt;</maintainer>
-+			<changed>2009-03-09T15:03:15</changed>
-+			<country>Ukraine</country>
-+			<city>Lugansk</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1064330466317A41A714F7A3C70B22A8F4F88EFF1AD5870570230FAC49A74C6528C435FC32</stationID>
-+			<name>Люкс FM</name>
-+			<shortname>Люкс FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236531204D675F1E3913FCD945685B736986EB65B4576DBEF430FA337D3355E6655114EC7</stationID>
-+			<name>Шансон</name>
-+			<shortname>Шансон</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236532766B6BB266A8C8AF15F1FA2F7A1F4461D5DE0E36260BD220F78729380ACA3406C9B</stationID>
-+			<name>Ретро FM</name>
-+			<shortname>Ретро FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123652999119E06577B29B9481F49463944679117D38DE47AB2BEE399E28B27C513527092D</stationID>
-+			<name>Шарманка</name>
-+			<shortname>Шарманка</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653079854CDC1FA489FD9BC0C9018688138439EF1748E7BAE978D1CF37CEE1DC221B809</stationID>
-+			<name>Мелодия</name>
-+			<shortname>Мелодия</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236530818BA5A7BD0D0F5C8054A78EE43566C46EAABF99A316503E0B994C39788CCE173DC</stationID>
-+			<name>Авторадио</name>
-+			<shortname>Авторадио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236532798123231CCB6DC001884D40CE507985DC23093DE1B72397A6D81CD9D2DC6BA286E</stationID>
-+			<name>М-FM</name>
-+			<shortname>М-FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236532812AB511522487A6B437E83DB867BD18E756C18FE228864BCE14210651F5FAC9F80</stationID>
-+			<name>Русское радио</name>
-+			<shortname>Русское радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236530838F517539CE7C5DFC59F97A7B561EA5F01A545D5142C6F3D85CBA980B86B55AE19</stationID>
-+			<name>Пульс</name>
-+			<shortname>Пульс</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653086143C3C71D4F8FCF61645F0655E43058A049124EB95D09189797463C0A6DA402F1</stationID>
-+			<name>Хит FM</name>
-+			<shortname>Хит FM</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236530899DE7E038C4D62B940D7BEF4D05B90384E131BE490EEA2AEEF870D8160EDCB96B1</stationID>
-+			<name>Европа +</name>
-+			<shortname>Европа +</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653093974B772F5351BF4CE172C68E24EF386EB62BEDE1A1180BB09765AB49F261B2A1C</stationID>
-+			<name>Эхо</name>
-+			<shortname>Эхо</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653099504B71EFC17B5F7F3EBDE2EA0617249C65BB59B7741BF1F3D849E26650E9F2C3C</stationID>
-+			<name>Наше радио</name>
-+			<shortname>Наше радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1236531097D21AAB0774E01FCA1CFF26D1EF66074A64E316210A998AD806A60DBB741F0E18</stationID>
-+			<name>Гала радио</name>
-+			<shortname>Гала радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653114112A4E959FB3005DF5381500039A1F9FC4AC640902606A73982B3F0532CDBEFB8</stationID>
-+			<name>Скайвэй (KISS FM)</name>
-+			<shortname>Скайвэй (KISS FM)</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>123653282541358FF62E3196D45E6B221CB959E72B914B0D929AA066ADC7D49F90F6B1F7F6</stationID>
-+			<name>Радио ЭРА</name>
-+			<shortname>Радио ЭРА</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,160 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Volodymyr Petlovy</maintainer>
-+			<changed>2008-11-30T16:59:00</changed>
-+			<country>Ukraine</country>
-+			<city>Lviv</city>
-+			<media>Radio</media>
-+			<comments>All stations in my city</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122799021780C192F2D1A07BFE06D065A65E515F0C739CDFCD1AA6BCDF826A4F302ED9C252</stationID>
-+			<name>Національне Радіо</name>
-+			<shortname>Національне Радіо</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>67</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122799022189C2C08CBAB32132F909F1D32133FAA5D8B64531FB163C2274EC9D739AC3F934</stationID>
-+			<name>Радіо Промінь</name>
-+			<shortname>Радіо Промінь</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>68.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12279902652D4188864C39EFFC4FF5477D13D243F6B8F3C8EAAF74C37941251E9D7739B29F</stationID>
-+			<name>Ера ФМ</name>
-+			<shortname>Ера ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990268237C351DE729E01F7FE8A905B3C6D2C9AB20955F906700DA9DB36C079BCC623D</stationID>
-+			<name>Еко ФМ</name>
-+			<shortname>Еко ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.6515</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990272C61931B94C013586810D19FA1F67FC13C5BD6CCB00B09353D41AE2C9FC113D30</stationID>
-+			<name>Радіо Ман</name>
-+			<shortname>Радіо Ман</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122799027388059A3A027955641E923A4867BC6C48355F7D08781AF8BE81AD0F9C220A1815</stationID>
-+			<name>Love Радіо</name>
-+			<shortname>Love Радіо</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12279902969752ED3FD1DEC7E32F6B113D4E98DFD955287B2AE274B75B0E87235E66367D43</stationID>
-+			<name>Львівська Хвиля</name>
-+			<shortname>Львівська Хвиля</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990297623905720B162E2F976651CAB458673C653A82D4A4C6DA8909E9B38A9B3B867B</stationID>
-+			<name>Гала Радіо</name>
-+			<shortname>Гала</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990300A33527E201DA266374163FB150CF5CA19161D3980488E92D3BDD8086BA9F7970</stationID>
-+			<name>Ретро ФМ</name>
-+			<shortname>Ретро ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12279903043A16C0F1AABD2687E1E3BE3FD9E65EC3F3194117FAB45A4F9B4C3374658E6720</stationID>
-+			<name>Радіо One</name>
-+			<shortname>Радіо One</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.902</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990305979E314884161454A31F33EC95684D57F542C0C3E78721F4995C4BE15AE0FFE4</stationID>
-+			<name>М ФМ</name>
-+			<shortname>М ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122799030605312B35769EDF40268CFB4824B5C1B88C9A9DC0A5AFCB729A3A8E0E78693D04</stationID>
-+			<name>Радіо Люкс</name>
-+			<shortname>Люкс</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1227990308187904A3FD5401A07636FA3D523DF6D59A2C25B950519986D576180F9AA897CB</stationID>
-+			<name>Авторадіо</name>
-+			<shortname>Авторадіо</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12279903109883D98CC3DF88D59F8574CCD0E71A9B9A23180889A31A979703D600022E47A9</stationID>
-+			<name>Наше Радіо</name>
-+			<shortname>Наше</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12279903121852B0BB31EFCC3B65D74FBC51A71F89C8D83D65FE6C7BEFD78DBD8B0215A47E</stationID>
-+			<name>Радіо Незалежність</name>
-+			<shortname>Незалежність</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>122799031353196770DF4ED04D9D1C1CE3BB21C661B7E58D45F0A9675601C99746619519F6</stationID>
-+			<name>Радіо Мелодія</name>
-+			<shortname>Мелодія</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.103</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,17 @@
-+SUBDIRS =
-+EXTRA_DIST = "kyiv-antenna.krp" "kyiv.krp" "lugansk.krp" "lviv.krp" "nikolayev.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/"
-+	$(INSTALL_DATA) "$(srcdir)/kyiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/kyiv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lugansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp"
-+	$(INSTALL_DATA) "$(srcdir)/lviv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp"
-+	$(INSTALL_DATA) "$(srcdir)/nikolayev.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp
---- kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,150 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>Vadim Bu &lt;panoptus@gmail.com&gt;</maintainer>
-+			<changed>2000-01-01T00:00:00</changed>
-+			<country>Ukraine</country>
-+			<city>Nikolayev</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>1281291324881640300A9656B36F2C8FB7C0CBF62F9876BF91EF206ADCD406E3854756</stationID>
-+			<name>ТВ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>65.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>128129138506DF5A35A7530F941618DD6AFE504718D2EC8394947C3E26F33BCAD769D4</stationID>
-+			<name>Первый канал укр. радио</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>69.85</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812013750E66C763E47D9FD3AA8F5A5C0833B02B80757ABC86852CFB2538D8EE1769</stationID>
-+			<name>ХитФМ</name>
-+			<shortname>ХитФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1281201553DF8B2D6C7D312C77A4B85AC6D831ACA3FD386E2ACE23ECD292C52CAD4BF8</stationID>
-+			<name>Радио Алла</name>
-+			<shortname>Радио Алла</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1281201897F0FEDF0D65FA7843847268C92807EC96BDFE3A601F49B2C40CC3D8256369</stationID>
-+			<name>ОкФМ</name>
-+			<shortname>ОкФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100.8</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812014665AC9DD7F71ABF382654AA324D618DD173C0CD43166B35167FFA6D5977CEE</stationID>
-+			<name>Русское радио</name>
-+			<shortname>Русское радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>101.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812015256E6C171F895496A945901A91FF91C92E2F37800C256AB29AB1C5AAE8D9BF</stationID>
-+			<name>Кисс ФМ</name>
-+			<shortname>Кисс ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812015381A12F5CEB14337821BD569BFB00F016CF21617F60B718F9C8E70E9563AAC</stationID>
-+			<name>Наше радио</name>
-+			<shortname>Наше радио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>102.75</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812909149BEFA3A4DD95C41B19CE8110C3BE638D33F712C45D21272C119512A1D552</stationID>
-+			<name>Авторадио</name>
-+			<shortname>Авторадио</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>103.35</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12812898487D26BFE955AF336F67A743540DBB78557C3DC79C18FB7281BE35CB6ED8A2</stationID>
-+			<name>Взрослое</name>
-+			<shortname>Взрослое</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>128120125873F1C0A0B9F8F7844149BB02E340FB8B117B27EB34E755BF77D67BAD5A08</stationID>
-+			<name>Просто</name>
-+			<shortname>Просто</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>104.6</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>128120159508376D674AB7C609B1B38CFE0592A3F53AA7C2F2E5D369514888DF9BC255</stationID>
-+			<name>Мелодия</name>
-+			<shortname>Мелодия</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>128120161385DDA12FD03D03056C8707135DDC5D04AF9D8E0B91E5E1AE68BC8F8A0163</stationID>
-+			<name>Ретро</name>
-+			<shortname>Ретро</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>106.4</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1281201626F402B08396B731E230EA16EFE90C3889ACF99F4E2E4DC4AB445D980141FD</stationID>
-+			<name>Люкс ФМ</name>
-+			<shortname>Люкс ФМ</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1281201639D78071860C8AB2ED93CB078E4EEDDD2B02620617AE124B5F9AB0F0D66A7E</stationID>
-+			<name>Эра</name>
-+			<shortname>Эра</shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>107.7</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp
---- kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,193 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-1.0beta3b</creator>
-+			<maintainer>Lester Hinton</maintainer>
-+			<changed>2007-08-19T22:25:00</changed>
-+			<country>USA</country>
-+			<city>Newburgh, IN</city>
-+			<media>FM Radio</media>
-+			<comments>Evansville,IN area Stations</comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>11875741170887A5CACEB53D24EC0C7E6446F3A2C6BEBFD9D2EC483839162385C9C7C4EB96</stationID>
-+			<name>WABX Classic Rock</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>118757413136CB812379364A402F733E1BEDC25E60D77645F00831F07BE96FF30888324EBD</stationID>
-+			<name>Jack Fm</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.15</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187574832B2142319AC87045E95B530F52CA9F24B6E980A33BD87DFD04A6360A7B9768BC9</stationID>
-+			<name>Kiss FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875754000F53E03278CB5C0450067CFDBE79C3BD498890A966610D9A621D2E872821D056</stationID>
-+			<name>CJ Classic Hits</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187575470E6F0B059EEB24BCA55192507774F5AD1F0ECB78742AA260B767B22064D067140</stationID>
-+			<name>WJLT Super Hits</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875757671EBA54F567804703E6B930BF68D50673086F33AFCEB24287086044932E622792</stationID>
-+			<name></name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875758930AB9977E06DC0FA833EF912E98B3B9E37B31D6DA9CC5A69E229955C315BF70A6</stationID>
-+			<name>WIKY Evansville,IN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>118757661829503869856F302C684C9C601EB4CD0CE53178A44C81955A7C7807C43E92A7A9</stationID>
-+			<name>WGBF River City Rocker </name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187576723EC47FF2944185BF9C69026961B2CB67841231B5BA5E097BEA9A066318DDD386C</stationID>
-+			<name>WLME Lewisport, Kentucky</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187576885BAF94B352929D819FFDA48B3E2CC49FA4810DB9479760A951E1877585E64B8C9</stationID>
-+			<name>WQXQ 101.9 FM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187577250796D54BAB65FF0838225F239224D8F4C101895811597D16E8B5779F88F0AE4D4</stationID>
-+			<name>WBGW Religious Fort Branch</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>101.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875778905CB94237C96056BEF23AC744D8C26E97ADC80A26800757CC4AE54965AF744463</stationID>
-+			<name>97X Classic Rock Owensboro, Kentucky</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187578481AF82158EBA23A77E7F9BC8FB829E837A56979F8466923C39C8D6A35819F8B94F</stationID>
-+			<name>Hot 96 WSTO Owensboro, Kentucky</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875787904D7AE91F09E8FE5B81045E192A2899C1650FDE2FE93ED0FC3FAE6F1249075FFA</stationID>
-+			<name>Classic Rock</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>94.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187578936195A8EE8BC81E698E18BA81AC866D658B940BC852EFB48F6AE04067439D24866</stationID>
-+			<name>WKTG Power Rock Owensboro, Kentucky </name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187579126CAB93F22412297E9BECBD5D4B65207F2223EDE413AE49F6B210CCFF9DB58BA58</stationID>
-+			<name>WUEV College Evansville, IN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187579275AFEB205731B134D9C4ABB89CAAFE5EEBD97C251C883F31DDB87A5558BACA39D4</stationID>
-+			<name>WVUB Vincennes</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187579552DAB2CFE1FF6469FF4E9862013915EBF64AC189171BD06C156F12474A0C7C248B</stationID>
-+			<name>WPSR Evansville, IN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187579681CFB4798BD9824971407C55F42514477C425A8D365844185D328C1A31F79CB744</stationID>
-+			<name></name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>118757983754300B648DF30B8BCCE734305204B4F33FC53CA4C30AE14FF6A750C22896CD00</stationID>
-+			<name>Western, Kentucky Public Radio</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1187579929C4932368D87672C2DDE6B8E396BC108893903533E0567703B2F4F8E88D3DD9FC</stationID>
-+			<name>The Bash Wabash Valley College</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11875800416C2FDE228F9D079430B49B1B156D28B464F36A0281D09DD1DEB2A1A62F4D8021</stationID>
-+			<name>WNIN Public Radio Evansville,IN</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.3</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-+
-+
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am kradio-3.5.13.1/kradio3/presets/usa/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am	2012-06-26 02:49:50.000000000 +0200
-+++ kradio-3.5.13.1/kradio3/presets/usa/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -1,390 +1,395 @@
- SUBDIRS =
--EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp"
-+EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Indiana-newburgh.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "missouri-joplin-antenna.krp"  "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "texas-odessa.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp"
- 
- install-data-local:
- 	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/"
--	$(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp"
--	$(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp"
--	$(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp"
--	$(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp"
--	$(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp"
--	$(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp"
--	$(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp"
--	$(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp"
--	$(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp"
--	$(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp"
--	$(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp"
--	$(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Alaska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp"
--	$(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/California_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp"
--	$(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp"
- 	$(INSTALL_DATA) "$(srcdir)/college-park,GA.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp"
--	$(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp"
--	$(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp"
--	$(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp"
--	$(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp"
--	$(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp"
--	$(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Colorado.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp"
--	$(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp"
--	$(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp"
--	$(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Delaware_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp"
--	$(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp"
- 	$(INSTALL_DATA) "$(srcdir)/District of Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp"
--	$(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp"
-+	$(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Florida_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Guam.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp"
-+	$(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Indiana-newburgh.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Kentucky_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp"
--	$(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp"
-+	$(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Maine_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp"
--	$(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp"
--	$(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/missouri-joplin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/New Jersey_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp"
--	$(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp"
- 	$(INSTALL_DATA) "$(srcdir)/New York.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp"
-+	$(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp"
-+	$(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Pennsylvania_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp"
--	$(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp"
--	$(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp"
-+	$(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Tennessee_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp"
-+	$(INSTALL_DATA) "$(srcdir)/texas-odessa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Vermont_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Vermont_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp"
-+	$(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp"
- 	$(INSTALL_DATA) "$(srcdir)/West Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp"
--	$(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp"
--	$(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp"
--	$(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp"
--	$(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Wisconsin_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp"
--	$(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp"
--	$(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp"
-+	$(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp"
- 	$(INSTALL_DATA) "$(srcdir)/Wyoming_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp"
--	$(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp"
--	$(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp"
--	$(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp"
--	$(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp"
--	$(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp"
--
-+	$(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp"
- 
- uninstall-local:
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp"	
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp"
- 	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp"
--	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp"
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp"
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp
---- kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,96 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer>Vanessa Ezekowitz</maintainer>
-+			<changed>2008-03-06T03:27:22</changed>
-+			<country>USA</country>
-+			<city>Joplin, Missouri</city>
-+			<media>Antenna</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795416D327B29628F9A516E5FB37E10FE87051EC4814A5DB9310CE50567FB8CDAD8C0E</stationID>
-+			<name>KXMS (Fine Arts Radio Int&apos;l)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>88.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795416E12EDA0A2654A5BE583984CAAFC558B39A76BB7A1CD8CE2FB94A27F204F1934C</stationID>
-+			<name>KSYN (Kissin&apos;)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>120479541625C6582240A6ACB64070E43AEDF4652A7FD0B3D8F48BDD8ABAA3DA2794C6D4D8</stationID>
-+			<name>KJMK (Lite Rock)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795417914AAC2F66691FA07212B02F77AA7F5A3FCACC1F6217E9907D15444CC75D91CB</stationID>
-+			<name>KXDG (Big Dog)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>97.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12047954174FB5470F53D45D70CA84226BC5F64B0566C0EAE6DDF701E0D6F7BC7791EE1471</stationID>
-+			<name>KBIN (Classic Country)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>12047954170ABC15063AD62CEEECF710F339727F3F073C66C12713BBCBB2FA44C46254D61E</stationID>
-+			<name>KIXQ (Kix)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795417E9D264C67939C2CA96378EE4BE54256EAF1C9DB6C5C75BA91D38AC4BFC966237</stationID>
-+			<name>KCAR (Cool 104)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>104.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795417E494F0F8E67F42AE4CFB364E20AC2E3B832C1724C5912E85C8DE2B06C467A4E1</stationID>
-+			<name>KMOQ (Q105)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>105.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			
-+<stationID>1204795417E91429BBC4986C1F9B9BDCA2CF6FC0FFD829A66480FE077C75B70650B9FF5B36</stationID>
-+			<name>KJML (Rock 107)</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.1</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp
---- kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,151 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-snapshot-2006-11-12-r497</creator>
-+			<maintainer></maintainer>
-+			<changed></changed>
-+			<country>USA</country>
-+			<city>Odessa,Texas</city>
-+			<media></media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>116846129002F1F8194388299FC3139319A930591722CECB86569BAC9725A06B36B2FD8CC4</stationID>
-+			<name>KLVW</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11684613150AE00B186451ABD6D71B8367D23F52446D5F025EE36FED385E460193E70491A3</stationID>
-+			<name>KAWZ</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>89.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461334AF8D607D7EF147FF8B65CDD5C023A41ED5B062E5BC222D146F60020275063078</stationID>
-+			<name>KBMM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11684613599F7116FBE9A5114CA9B4A2CE8D56B90F4E8C910A185DBDE551323127B9B3A568</stationID>
-+			<name>KFLB</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>90.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168460870B8292553C2CF19E2E5FD3CA914DFC0C547A173C7B35562C20761A9BB0AE8E4D9</stationID>
-+			<name>KOCV</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>91.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168460975331463C5B45FAB68AAFDA87E7459F3988B480B10A375BD6C1ECF8A23DE73A288</stationID>
-+			<name>KNFM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>92.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461002342CFC649119A91BF7D0F4D53702C5EE4E74996C5995805A4C889B2714926578</stationID>
-+			<name>KZVT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>93.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461019B99600290F3A77F620C3F956088E3543B5DB1490495E36E5BAA7240A80A95132</stationID>
-+			<name>KQRX</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>95.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461042CF2067ED36AAB605B6DD61F3DB4ABA0A2B62BBC7ECA3723193B29FFB6CA3CA68</stationID>
-+			<name>KMRK</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461068C54AB8B0F3EB77D0B55914ACC9C2C3C91A17EA3AB0BB7B62479B06962539B095</stationID>
-+			<name>KMCM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>116846108171A02F30F18036E75C6BFAC283F7F68B87AEEAB39D03C07A3D0590A4B4578F79</stationID>
-+			<name>KODM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>96.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11684610993661B95209C8CC24B3A153BD2AB1D538BB28BF41AAC4E940E24130725F8B82AF</stationID>
-+			<name>KHKX</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461120A076395C093FB1BA6315362B58A11EFADE461C5ACAD61AA51F7E66FB0FBEAA69</stationID>
-+			<name>KBAT</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>99.9</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>11684611436094D7F632AB1EB4FAD57028DB098DB6E0D2055F0A96FD55525137EBD5C47A5B</stationID>
-+			<name>KFZX</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>102.1</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461195282D1688F40C7FC5AA003DDC700EC5DD797FC632097B5E56176E024E04B4AF84</stationID>
-+			<name>KCRS</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>103.3</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461220137A9E713D061D38E11FB474360C007F1866EBA09325F489B29B345A15AF28F5</stationID>
-+			<name>KCHX</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>106.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1168461240BCBE9B8FD990C788128803DF787B796306066505548D89F71F3505D3BC837A6E</stationID>
-+			<name>KQLM</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<frequency>107.9</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp
---- kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,60 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<kradiorc>
-+	<stationlist>
-+		<format>kradio-1.0</format>
-+		<info>
-+			<creator>kradio-4.0.0</creator>
-+			<maintainer>Pham Thanh Nam &lt;phamthanhnam.ptn@gmail.com&gt;</maintainer>
-+			<changed>2009-11-08T13:14:16</changed>
-+			<country>Vietnam</country>
-+			<city>Hanoi</city>
-+			<media>FM</media>
-+			<comments></comments>
-+		</info>
-+		<FrequencyRadioStation>
-+			<stationID>12576571600E343C50AE64ABBB128131D2438689F9BEA2D9C2BACE297416E68B309EA2</stationID>
-+			<name>Hanoi</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>90</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12576573057937209E795F1B379958B917FFDDD421456F10C75CC5AE901FFC55BC47DC</stationID>
-+			<name>VOV2</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>96.5</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1257657101D508873DA1965BB87A96601283B0F78920CAD7DA951DD6DF74F1C98553F5</stationID>
-+			<name>VOV1</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>100</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>12571038920FB7D70277EEDB473F783FF9C4BE09036A58A570581103530069FD2F7B7B</stationID>
-+			<name>VOV3</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>stereo</stereomode>
-+			<frequency>102.7</frequency>
-+		</FrequencyRadioStation>
-+		<FrequencyRadioStation>
-+			<stationID>1257657210A2BBEDF17CAE4283E948AAFFE9A8CF59ED4705780CB6C91189A1488DA04D</stationID>
-+			<name>VOV5</name>
-+			<shortname></shortname>
-+			<icon></icon>
-+			<volumepreset>-1</volumepreset>
-+			<stereomode>dontcare</stereomode>
-+			<frequency>105.5</frequency>
-+		</FrequencyRadioStation>
-+	</stationlist>
-+</kradiorc>
-diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am
---- kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am	2012-11-25 00:48:02.000000000 +0100
-@@ -0,0 +1,9 @@
-+SUBDIRS =
-+EXTRA_DIST = "hanoi.krp"
-+
-+install-data-local:
-+	$(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/"
-+	$(INSTALL_DATA) "$(srcdir)/hanoi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp"
-+
-+uninstall-local:
-+	-rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp"
diff --git a/redhat/applications/tderadio/kradio-3.5.13.1.spec b/redhat/applications/tderadio/kradio-3.5.13.1.spec
deleted file mode 100644
index 88ed49959..000000000
--- a/redhat/applications/tderadio/kradio-3.5.13.1.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-# Default version for this component
-%define kdecomp kradio
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Comfortable Radio Application for KDE [Trinity]
-Version:	0.1.1.1
-Release:	5%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-Patch1:		kradio-3.5.13.1-updated_preset.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	libsndfile-devel
-BuildRequires:	lirc-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}twolame-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libtwolame-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	lame-devel
-%endif
-
-%description
-KRadio is a comfortable radio application for Trinity with support for 
-V4L and V4L2 radio cards drivers.
-
-KRadio currently provides
-
- * V4L/V4L2 radio support
- * Remote control support (LIRC)
- * Alarms, sleep Countdown
- * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
- * Recording capabilities, including MP3 and Ogg/Vorbis encoding
- * Timeshifter functionality
- * Extendable plugin architecture
-
-This package also includes a growing collection of station preset
-files for many cities around the world contributed by KRadio users.
-
-As KRadio is based on an extendable plugin architecture, contributions
-of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-lirc \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/convert-presets
-%{tde_bindir}/kradio
-%{tde_libdir}/kradio/plugins/*.la
-%{tde_libdir}/kradio/plugins/*.so
-%{tde_tdeappdir}/kradio.desktop
-%{tde_datadir}/apps/kradio/
-%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
-
-%changelog
-* Sat Dec 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-5
-- Updates presets
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
-- Rebuild for RHEL 5
-- Fix postinstall
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/kradio-3.5.13.spec b/redhat/applications/tderadio/kradio-3.5.13.spec
deleted file mode 100644
index 2282c7994..000000000
--- a/redhat/applications/tderadio/kradio-3.5.13.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp kradio
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Comfortable Radio Application for KDE [Trinity]
-Version:	0.1.1.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	libsndfile-devel
-BuildRequires:	lirc-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}twolame-devel
-%else
-BuildRequires:	lame-devel
-%endif
-
-%description
-KRadio is a comfortable radio application for Trinity with support for 
-V4L and V4L2 radio cards drivers.
-
-KRadio currently provides
-
- * V4L/V4L2 radio support
- * Remote control support (LIRC)
- * Alarms, sleep Countdown
- * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
- * Recording capabilities, including MP3 and Ogg/Vorbis encoding
- * Timeshifter functionality
- * Extendable plugin architecture
-
-This package also includes a growing collection of station preset
-files for many cities around the world contributed by KRadio users.
-
-As KRadio is based on an extendable plugin architecture, contributions
-of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-lirc \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/convert-presets
-%{tde_bindir}/kradio
-%{tde_libdir}/kradio/plugins/*.la
-%{tde_libdir}/kradio/plugins/*.so
-%{tde_tdeappdir}/kradio.desktop
-%{tde_datadir}/apps/kradio/
-%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
-
-%Changelog
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
-- Rebuild for RHEL 5
-- Fix postinstall
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
deleted file mode 100644
index 04b82fc4e..000000000
--- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-# Default version for this component
-%define tde_pkg tderadio
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_lirc 1
-%endif
-
-Name:			trinity-%{tde_pkg}
-Summary:		Comfortable Radio Application for TDE [Trinity]
-Version:		0.1.1.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	libsndfile-devel
-%{?with_lirc:BuildRequires:	lirc-devel}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}twolame-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libtwolame-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	lame-devel
-%endif
-
-Obsoletes:		trinity-kradio < %{version}-%{release}
-Provides:		trinity-kradio = %{version}-%{release}
-
-%description
-KRadio is a comfortable radio application for Trinity with support for 
-V4L and V4L2 radio cards drivers.
-
-KRadio currently provides
-
- * V4L/V4L2 radio support
-%if 0%{?with_lirc}
- * Remote control support (LIRC)
-%endif
- * Alarms, sleep Countdown
- * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
- * Recording capabilities, including MP3 and Ogg/Vorbis encoding
- * Timeshifter functionality
- * Extendable plugin architecture
-
-This package also includes a growing collection of station preset
-files for many cities around the world contributed by KRadio users.
-
-As KRadio is based on an extendable plugin architecture, contributions
-of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kradio
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-
-%files -f kradio.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/convert-presets
-%{tde_bindir}/kradio
-%{tde_libdir}/kradio/plugins/*.la
-%{tde_libdir}/kradio/plugins/*.so
-%{tde_tdeappdir}/kradio.desktop
-%{tde_datadir}/apps/kradio/
-%{tde_datadir}/icons/hicolor/*/*/kradio*.png
-%{tde_datadir}/icons/locolor/*/*/kradio*.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-%changelog
diff --git a/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec b/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec
deleted file mode 100644
index d703c162c..000000000
--- a/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define kdecomp kdesudo
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	sudo frontend for Trinity
-
-Version:	2.5.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-arts-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-
-%description
-KdeSudo is a graphical frontend for the sudo utility.
-It allows you to run programs as another user by entering your password.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdesudo
-%{tde_tdedocdir}/HTML/en/kdesudo/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/tdesudo/kdesudo-3.5.13.spec b/redhat/applications/tdesudo/kdesudo-3.5.13.spec
deleted file mode 100644
index da04bb7ef..000000000
--- a/redhat/applications/tdesudo/kdesudo-3.5.13.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define kdecomp kdesudo
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	sudo frontend for Trinity
-
-Version:	2.5.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-
-%description
-KdeSudo is a graphical frontend for the sudo utility.
-It allows you to run programs as another user by entering your password.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-
-## File lists
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdesudo
-%{tde_tdedocdir}/HTML/en/kdesudo/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-- Removes post and postun
-
-* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec
deleted file mode 100644
index e7dd22faf..000000000
--- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define tde_pkg tdesudo
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		sudo frontend for Trinity
-
-Version:		2.5.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Obsoletes:	trinity-kdesudo < %{version}-%{release}
-Provides:	trinity-kdesudo = %{version}-%{release}
-
-Requires:		sudo
-
-%description
-TdeSudo is a graphical frontend for the sudo utility.
-It allows you to run programs as another user by entering your password.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kdesudo
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f kdesudo.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdesudo
-%{tde_tdedocdir}/HTML/en/kdesudo/
-
-
-%changelog
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
deleted file mode 100644
index 06473162e..000000000
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ /dev/null
@@ -1,255 +0,0 @@
-# Default version for this component
-%define tde_pkg tdesvn
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		subversion client with tight TDE integration [Trinity]
-Version:		1.0.4
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.elliptique.net/~ken/kima/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	subversion-devel
-Requires:		%{name}-tdeio-plugins = %{version}-%{release}
-
-Obsoletes:	trinity-kdesvn < %{version}-%{release}
-Provides:	trinity-kdesvn = %{version}-%{release}
-
-%description
-TDESvn is a graphical client for the subversion revision control
-system (svn).
-
-Besides offering common and advanced svn operations, it features
-a tight integration into TDE and can be embedded into other TDE 
-applications like konqueror via the TDE component technology KParts.
-
-
-%package -n trinity-libsvnqt
-Group:			Development/Libraries
-Summary:		Qt wrapper library for subversion [Trinity]
-
-%description -n trinity-libsvnqt
-This package provides svnqt, a Qt wrapper library around the 
-subversion library.
-
-It is based on the RapidSvn SvnCpp library, a subversion client API 
-written in C++.
-
-%package -n trinity-libsvnqt-devel
-Group:			Development/Libraries
-Requires:		trinity-libsvnqt = %{version}-%{release}
-Requires:		qt-devel
-Requires:		subversion-devel
-Summary:		Qt wrapper library for subversion (development files) [Trinity]
-
-%description -n trinity-libsvnqt-devel
-This package contains the header files and symbolic links that developers
-using svnqt will need.
-
-
-%package tdeio-plugins
-Group:			Development/Libraries
-Conflicts:	trinity-kdesdk-tdeio-plugins
-Summary:		subversion I/O slaves for Trinity
-
-Obsoletes:	trinity-kdesvn-kio-plugins < %{version}-%{release}
-Provides:	trinity-kdesvn-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdesvn-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdesvn-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This packages includes KIO slaves for svn, svn+file, svn+http, 
-svn+https, svn+ssh. This allows you to access subversion repositories 
-inside any KIO enabled TDE application.
-
-This package is part of tdesvn-trinity.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Moves HTML files to the correect location
-find . -name "*.cmake" -exec %__sed -i {} \
-  -e "s,/doc/HTML,/doc/tde/HTML,g" \
-  \;
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Installs SVN protocols as alternatives
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
-
-# Locales
-%find_lang kdesvn
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%post -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-%post tdeio-plugins
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesvn \
-    20
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesvn
-  done
-fi
-
-
-
-%postun -n trinity-libsvnqt
-/sbin/ldconfig || :
-
-
-%files -f kdesvn.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kdesvn
-%{tde_bindir}/kdesvnaskpass
-%{tde_tdelibdir}/libkdesvnpart.la
-%{tde_tdelibdir}/libkdesvnpart.so
-%{tde_datadir}/applications/kde/kdesvn.desktop
-%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh
-%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd
-%{tde_datadir}/apps/kdesvn/kdesvnui.rc
-%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc
-%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop
-%{tde_datadir}/config.kcfg/kdesvn_part.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_mandir}/man1/kdesvn.1
-%{tde_mandir}/man1/kdesvnaskpass.1
-%{tde_tdedocdir}/HTML/*/
-
-%files -n trinity-libsvnqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libsvnqt.so.4
-%{tde_libdir}/libsvnqt.so.4.2.2
-
-%files -n trinity-libsvnqt-devel
-%defattr(-,root,root,-)
-%{tde_includedir}/svnqt
-%{tde_libdir}/libsvnqt.so
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_datadir}/services/kded/kdesvnd.desktop
-%{tde_datadir}/services/ksvn+file.protocol
-%{tde_datadir}/services/ksvn+http.protocol
-%{tde_datadir}/services/ksvn+https.protocol
-%{tde_datadir}/services/ksvn+ssh.protocol
-%{tde_datadir}/services/ksvn.protocol
-%{tde_datadir}/services/svn+file.protocol_tdesvn
-%{tde_datadir}/services/svn+http.protocol_tdesvn
-%{tde_datadir}/services/svn+https.protocol_tdesvn
-%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%{tde_datadir}/services/svn.protocol_tdesvn
-%{tde_tdelibdir}/kio_ksvn.la
-%{tde_tdelibdir}/kio_ksvn.so
-%{tde_tdelibdir}/kded_kdesvnd.la
-%{tde_tdelibdir}/kded_kdesvnd.so
-
-
-%changelog
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
deleted file mode 100644
index ff99cfcee..000000000
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-# Default version for this component
-%define kdecomp kdmtheme
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	theme manager for KDM [Trinity]
-Version:	1.2.2
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kdmtheme.la
-%{tde_tdelibdir}/kcm_kdmtheme.so
-%{tde_tdeappdir}/kdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/kdmtheme/
-
-
-%post
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Removes the 'lintian' stuff from Debian
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
deleted file mode 100644
index 22f3cd396..000000000
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define kdecomp kdmtheme
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	theme manager for KDM [Trinity]
-Version:	1.2.2
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://beta.smileaf.org/projects
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
-
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kdmtheme.la
-%{tde_tdelibdir}/kcm_kdmtheme.so
-%{tde_tdeappdir}/kdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/kdmtheme/
-
-
-%post
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-- Removes the 'lintian' stuff from Debian
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch
deleted file mode 100644
index 64272fe6a..000000000
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp.ORI	2013-06-13 08:36:49.449599069 +0200
-+++ trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp	2013-06-13 08:44:01.014366366 +0200
-@@ -268,16 +268,22 @@
- 
- void KDMThemeWidget::updateInfoView( ThemeData *theme )
- {
--	info->setText(
--		((theme->copyright.length() > 0) ?
--			i18n("<qt><strong>Copyright:</strong> %1<br/></qt>",
--				theme->copyright) : "") +
--		((theme->description.length() > 0) ?
--			i18n("<qt><strong>Description:</strong> %1</qt>",
--				theme->description) : "") );
--	preview->setPixmap( theme->path + '/' + theme->screenShot );
--	preview->setText( theme->screenShot.isEmpty() ?
--		"Screenshot not available" : TQString() );
-+	if(theme) {
-+		info->setText(
-+			((theme->copyright.length() > 0) ?
-+				i18n("<qt><strong>Copyright:</strong> %1<br/></qt>",
-+					theme->copyright) : "") +
-+			((theme->description.length() > 0) ?
-+				i18n("<qt><strong>Description:</strong> %1</qt>",
-+					theme->description) : "") );
-+		preview->setPixmap( theme->path + '/' + theme->screenShot );
-+		preview->setText( theme->screenShot.isEmpty() ?
-+			i18n("Screenshot not available") : TQString() );
-+	} else {
-+		info->setText(i18n("No theme selected."));
-+		preview->setPixmap(NULL);
-+		preview->setText(i18n("Screenshot not available"));
-+	}
- }
- 
- void KDMThemeWidget::installNewTheme()
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
deleted file mode 100644
index 8691353fc..000000000
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
+++ /dev/null
@@ -1,119 +0,0 @@
-# Default version for this component
-%define tde_pkg tdmtheme
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		theme manager for TDM [Trinity]
-Version:		1.2.2
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://beta.smileaf.org/projects
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Obsoletes:		trinity-kdmtheme < %{version}-%{release}
-Provides:		trinity-kdmtheme = %{version}-%{release}
-
-
-%description
-kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
-that allows you to easily install, remove and change your KDM themes.
-
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kdmtheme.la
-%{tde_tdelibdir}/kcm_kdmtheme.so
-%{tde_tdeappdir}/kdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/kdmtheme/
-
-
-%post
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%changelog
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 2e8d3f9a3..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tellico/src/mainwindow.cpp.ORI	2012-05-06 12:54:09.395765577 +0200
-+++ tellico/src/mainwindow.cpp	2012-05-06 12:54:30.626306963 +0200
-@@ -53,6 +53,7 @@
- #include "core/drophandler.h"
- #include "latin1literal.h"
- 
-+#include <unistd.h>
- #include <kapplication.h>
- #include <kcombobox.h>
- #include <kiconloader.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index 5e93fd7d8..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tellico/src/translators/btparse/bibtex_ast.c.ORI	2012-08-06 15:44:03.978791275 +0200
-+++ tellico/src/translators/btparse/bibtex_ast.c	2012-08-06 15:44:23.449376138 +0200
-@@ -57,7 +57,7 @@
- void dump_ast (char *msg, AST *root)
- {
-    if (msg != NULL)
--      printf (msg);
-+      printf ("%s", msg);
-    dump (root, 0);
-    printf ("\n");
- }
---- tellico/src/translators/btparse/error.c.ORI	2012-08-06 15:44:38.954046066 +0200
-+++ tellico/src/translators/btparse/error.c	2012-08-06 15:45:08.152425553 +0200
-@@ -88,7 +88,7 @@
- 
-    if (err->filename)
-    {
--      fprintf (stderr, err->filename);
-+      fprintf (stderr, "%s", err->filename);
-       something_printed = TRUE;
-    }
-    if (err->line > 0)                   /* going to print a line number? */
-@@ -111,7 +111,7 @@
-    {
-       if (something_printed)
-          fprintf (stderr, ", ");
--      fprintf (stderr, name);
-+      fprintf (stderr, "%s", name);
-       something_printed = TRUE;
-    }
- 
diff --git a/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
deleted file mode 100644
index 36b394666..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tellico-3.5.13.1/src/Makefile.am.ORI	2012-10-04 23:24:30.130403046 +0200
-+++ tellico-3.5.13.1/src/Makefile.am	2012-10-04 23:25:46.806848842 +0200
-@@ -33,7 +33,7 @@
- 	./commands/libcommands.a -lexslt $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
- 	$(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \
- 	$(LIB_KABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
--	$(POPPLER_LIBS) $(LDADD_LIBBARCODE)
-+	$(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS)
- 
- EXTRA_DIST = tellicoui.rc tellicorc \
- borrowerdialog.cpp          entryiconview.h\
diff --git a/redhat/applications/tellico/tellico-3.5.13.1.spec b/redhat/applications/tellico/tellico-3.5.13.1.spec
deleted file mode 100644
index 4827ec653..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1.spec
+++ /dev/null
@@ -1,239 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-# [tellico] Fix "not a string literal" error
-Patch2:		tellico-3.5.13-fix_not_a_string_literal_error.patch
-# [tellico] Fix FTBFS
-Patch3:		tellico-3.5.13.1-fix_ftbfs.patch
-
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	yaz
-BuildRequires:	%{_lib}yaz-devel
-%endif
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch2 -p1
-%patch3 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-
-# Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/kconf_update/tellico-rename.upd
-%{tde_datadir}/apps/kconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 5695d8fff..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode.cpp.ORI	2013-07-29 17:21:06.358915613 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode.cpp	2013-07-29 17:22:29.505126885 +0200
-@@ -172,14 +172,14 @@
-   for (int i = 0; i < 10; i++) {
-     TQCString temp;
-     temp.setNum( i );
--    fprintf( stderr, temp + " :   " );
-+    fprintf( stderr, "%s :   ", *(temp) );
-     for (int j = 0; j < 13; j++) {
-       if (array[i][j][level] == -1)
-         fprintf( stderr, "x  " );
-       else {
-         TQCString temp;
-         temp.setNum( array[i][j][level] );
--        fprintf( stderr, temp + "  " );
-+        fprintf( stderr, "%s  ", *(temp) );
-       }
-     }
-     fprintf( stderr, "\n" );
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
deleted file mode 100644
index 261b24363..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h.ORI	2013-07-28 22:22:41.390223800 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h	2013-07-28 22:23:10.085637439 +0200
-@@ -31,7 +31,7 @@
- #endif
- 
- //#include <linux/videodev2.h>
--#include <linux/videodev.h>
-+#include <libv4l1.h>
- 
- #include <tqstring.h>
- #include <tqimage.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec
deleted file mode 100644
index ce72709c0..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2.spec
+++ /dev/null
@@ -1,232 +0,0 @@
-# Default version for this component
-%define tde_pkg tellico
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Icollection manager for books, videos, music [Trinity]
-Version:		1.3.2.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://periapsis.org/tellico/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:			tellico-3.5.13.2-videodev.patch
-Patch2:			tellico-3.5.13.2-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	yaz
-BuildRequires:	%{_lib}yaz-devel
-%endif
-
-# V4L support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires:	libv4l-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}v4l-devel
-%endif
-
-Requires:		%{name}-data = %{version}-%{release}
-Requires:		%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:			Applications/Utilities
-Summary:		collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:			Applications/Utilities
-Summary:		collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-if [ -r /usr/include/libv4l1-videodev.h ]; then
-%patch1 -p1 -b .videodev
-fi
-%patch2 -p1 -b .ftbfs
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Warning, --enable-final causes FTBFS §
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --enable-webcam
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/kconf_update/tellico-rename.upd
-%{tde_datadir}/apps/kconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%changelog
diff --git a/redhat/applications/tellico/tellico-3.5.13.spec b/redhat/applications/tellico/tellico-3.5.13.spec
deleted file mode 100644
index 64b7fed47..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-
-# [tellico] Fix compilation with GCC 4.7 [Bug #958]
-Patch1:		tellico-3.5.13-fix_gcc47_compilation.patch
-# [tellico] Fix "not a string literal" error
-Patch2:		tellico-3.5.13-fix_not_a_string_literal_error.patch
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-%patch2 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-
-# Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons
-%{tde_datadir}/apps/mime
-%{tde_datadir}/mimelnk
-%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/kconf_update/tellico-rename.upd
-%{tde_datadir}/apps/kconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
deleted file mode 100644
index 2729aa1bf..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
+++ /dev/null
@@ -1,109 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-%define version 1.0.5
-%define release 1
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
deleted file mode 100644
index 0c98d0697..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
+++ /dev/null
@@ -1,124 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial release for TDE 3.5.13.1
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
deleted file mode 100644
index 82a1ccf7e..000000000
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# Default version for this component
-%define kdecomp kwin-style-crystal
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Semi transparant window decoration for Trinity.
-Version:	1.0.5
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%Changelog
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec
deleted file mode 100644
index 328988582..000000000
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-# Default version for this component
-%define tde_pkg twin-style-crystal
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Semi transparant window decoration for Trinity.
-Version:		1.0.5
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-Obsoletes:	trinity-kwin-style-crystal < %{version}-%{release}
-Provides:	trinity-kwin-style-crystal = %{version}-%{release}
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/kwin3_crystal.la
-%{tde_tdelibdir}/kwin3_crystal.so
-%{tde_tdelibdir}/kwin_crystal_config.la
-%{tde_tdelibdir}/kwin_crystal_config.so
-%{tde_datadir}/apps/kwin/crystal.desktop
-
-
-%changelog
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
deleted file mode 100644
index 642d35393..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp wlassistant
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	User friendly KDE frontend for wireless network connection [Trinity]
-Version:	0.5.7
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://wlassistant.sourceforge.net/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python
-BuildRequires:	cmake >= 2.8
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_tdeappdir}/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2
-- Initial release for TDE 3.5.13.1
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
deleted file mode 100644
index 264a650c2..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define tde_pkg wlassistant
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		User friendly TDE frontend for wireless network connection [Trinity]
-Version:		0.5.7
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://wlassistant.sourceforge.net/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	python
-BuildRequires:	cmake >= 2.8
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_tdeappdir}/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%changelog
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.spec
deleted file mode 100644
index 97e4344e7..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-# Default version for this component
-%define kdecomp wlassistant
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	User friendly KDE frontend for wireless network connection [Trinity]
-Version:	0.5.7
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://wlassistant.sourceforge.net/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python
-BuildRequires:	scons
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside SCONS files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i bksys/kde.py \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-scons configure \
-  prefix=%{tde_prefix} \
-  execprefix=%{tde_bindir} \
-  libdir=%{tde_libdir} \
-  qtdir=${QTDIR} \
-  kdedir=%{tde_prefix} \
-  kdeincludes=%{tde_tdeincludedir} \
-  qtincludes=${QTINC} \
-  kdelibs=%{tde_libdir} \
-  qtlibs=${QTLIB} \
-  extraincludes=%{tde_includedir}:%{tde_includedir}/tqt:${QTINC}
-
-scons -j4
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-scons install DESTDIR=%{buildroot}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_datadir}/applnk/Utilities/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%Changelog
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/yakuake/yakuake-3.5.12.spec b/redhat/applications/yakuake/yakuake-3.5.12.spec
deleted file mode 100644
index 351a99acb..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.12.spec
+++ /dev/null
@@ -1,97 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-%define version 2.8.1
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/config.kcfg/*.kcfg
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.1.spec b/redhat/applications/yakuake/yakuake-3.5.13.1.spec
deleted file mode 100644
index 3eae2c506..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.13.1.spec
+++ /dev/null
@@ -1,134 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	2.8.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec
deleted file mode 100644
index 2cca734ce..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec
+++ /dev/null
@@ -1,114 +0,0 @@
-# Default version for this component
-%define tde_pkg yakuake
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
-Version:		2.8.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-
-%changelog
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.spec b/redhat/applications/yakuake/yakuake-3.5.13.spec
deleted file mode 100644
index b21e4e76d..000000000
--- a/redhat/applications/yakuake/yakuake-3.5.13.spec
+++ /dev/null
@@ -1,126 +0,0 @@
-# Default version for this component
-%define kdecomp yakuake
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-Version:	2.8.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-
-%description
-Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-
-%Changelog
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec
deleted file mode 100644
index 3a3ef35df..000000000
--- a/redhat/dependencies/akode/akode-3.5.13.2.spec
+++ /dev/null
@@ -1,350 +0,0 @@
-#
-# spec file for package akode (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%if "%{?tde_version}" == ""
-%define tde_version 3.5.13.2
-%endif
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-Name:		trinity-akode 
-Summary: 	Audio-decoding framework 
-Group: 		System Environment/Libraries
-Epoch:		%{tde_epoch}
-Version:	2.0.2
-Release:	1%{?dist}
-URL:		http://www.kde-apps.org/content/show.php?content=30375
-#URL:		http://carewolf.com/akode/  
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-Source0:	akode-%{tde_version}.tar.gz
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:  gcc-c++
-BuildRequires:	libtool
-
-# TQT support
-BuildRequires:	libtqt4-devel
-BuildRequires:	trinity-filesystem >= %{tde_version}
-
-# FLAC support
-%define _with_flac --with-flac
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libflac-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: flac-devel
-%endif
-
-# JACK support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_jack --with-jack
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libjack-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: jack-audio-connection-kit-devel
-%endif
-%endif
-
-# SAMPLERATE support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_libsamplerate --with-libsamplerate
-BuildRequires: libsamplerate-devel
-%endif
-
-# PULSEAUDIO support
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define _with_pulseaudio --with-pulseaudio
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libpulseaudio-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: pulseaudio-libs-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: pulseaudio-devel
-%endif
-%endif
-
-# MAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define _with_libmad --with-libmad
-BuildRequires:		libmad-devel
-%endif
-
-BuildRequires: alsa-lib-devel
-BuildRequires: libvorbis-devel
-BuildRequires: speex-devel
-
-
-%description
-aKode is a simple audio-decoding frame-work that provides a uniform
-interface to decode the most common audio-formats. It also has a direct
-playback option for a number of audio-outputs.
-
-aKode currently has the following decoder plugins:
-* mpc: Decodes musepack aka mpc audio.
-* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 
-
-aKode also has the following audio outputs:
-* alsa: Outputs to ALSA (dmix is recommended).
-* jack
-* pulseaudio
-
-%files
-%defattr(-,root,root,-)
-%doc rpmdocs/* 
-%{tde_bindir}/akodeplay
-%{tde_libdir}/libakode.so.*
-%{tde_libdir}/libakode_alsa_sink.la
-%{tde_libdir}/libakode_alsa_sink.so
-%{tde_libdir}/libakode_mpc_decoder.la
-%{tde_libdir}/libakode_mpc_decoder.so
-%{tde_libdir}/libakode_oss_sink.la
-%{tde_libdir}/libakode_oss_sink.so
-%{tde_libdir}/libakode_xiph_decoder.la
-%{tde_libdir}/libakode_xiph_decoder.so
-
-%post
-/sbin/ldconfig
-
-%postun 
-/sbin/ldconfig
-
-##########
-
-%package devel
-Summary: Headers for developing programs that will use %{name} 
-Group:   Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: pkgconfig
-
-%description devel
-This package contains the development files for Akode.
-It is needed if you intend to build an application linked against Akode.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/akode-config
-%{tde_includedir}/*
-%{tde_libdir}/libakode.la
-%{tde_libdir}/libakode.so
-%{tde_libdir}/pkgconfig/*.pc
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if "%{?_with_jack}" != ""
-
-%package jack 
-Summary: Jack audio output backend for %{name}
-Group:   Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description jack 
-This package contains the Jack audio output backend for Akode.
-
-%files jack 
-%defattr(-,root,root,-)
-%{tde_libdir}/libakode_jack_sink.la
-%{tde_libdir}/libakode_jack_sink.so
-
-%post jack
-/sbin/ldconfig
-
-%postun jack
-/sbin/ldconfig
-
-%endif
-
-##########
-
-%if "%{?_with_pulseaudio}" != ""
-
-%package pulseaudio
-Summary: Pulseaudio output backend for %{name}
-Group:   Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description pulseaudio
-This package contains the pulseaudio backend for Akode.
-Recommended for network transparent audio.
-
-%files pulseaudio
-%defattr(-,root,root,-)
-%{tde_libdir}/libakode_polyp_sink.la
-%{tde_libdir}/libakode_polyp_sink.so
-
-%post pulseaudio
-/sbin/ldconfig
-
-%postun pulseaudio
-/sbin/ldconfig
-
-%endif
-
-##########
-
-# Packaged separately to keep main/core %{akode} package LGPL-clean.
-%if "%{?_with_libsamplerate:1}" == "1"
-
-%package libsamplerate 
-Summary: Resampler based on libsamplerate for %{name}
-Group:   Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libsamplerate 
-This package contains the samplerate decoder for Akode.
-
-%files libsamplerate
-%defattr(-,root,root,-)
-%{tde_libdir}/libakode_src_resampler.la
-%{tde_libdir}/libakode_src_resampler.so
-
-%post libsamplerate
-/sbin/ldconfig
-
-%postun libsamplerate 
-/sbin/ldconfig
-
-%endif
-
-##########
-
-%if "%{?_with_libmad}" != ""
-
-%package libmad
-Summary: Decoder based on libmad for %{name}
-Group:   Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libmad 
-This package contains the mad decoder for Akode.
-
-%files libmad
-%defattr(-,root,root,-)
-%{tde_libdir}/libakode_mpeg_decoder.la
-%{tde_libdir}/libakode_mpeg_decoder.so
-
-%post libmad
-/sbin/ldconfig
-
-%postun libmad 
-/sbin/ldconfig
-
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n akode-2.0.2
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
-
-
-%build
-unset QTDIR QTINC QTLIB
-export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
-
-%configure \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_includedir} \
-  --datadir=%{tde_datadir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --without-libltdl \
-  --with-alsa \
-  --with-oss \
-  %{?_with_flac} %{!?_with_flac:--without-flac} \
-  %{?_with_jack} %{!?_with_jack:--without-jack} \
-  %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
-  %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
-  --with-speex \
-  --with-vorbis \
-  --without-ffmpeg \
-  %{?_with_libmad} %{!?_with_libmad:--without-libmad}
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot} 
-%__make install DESTDIR=%{?buildroot}
-
-# unpackaged files
-%__rm -f %{buildroot}%{tde_libdir}/*.a
-
-# rpmdocs
-for file in AUTHORS COPYING NEWS README TODO ; do
-  test -s  "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
-done
-
-
-%clean
-%__rm -rf %{buildroot} 
-
-
-%changelog
diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
deleted file mode 100644
index 02e031f9e..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ /dev/null
@@ -1,312 +0,0 @@
-#
-# spec file for package arts (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg arts
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.5.10
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
-Group:		System Environment/Daemons 
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	trinity-filesystem >= %{tde_version}
-Requires:		trinity-filesystem >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
-
-# ESOUND support
-%define with_esound 1
-BuildRequires:	esound-devel
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
-%define with_jack 1
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-%define jack_devel jack-audio-connection-kit-devel
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel libjack-devel
-%endif
-BuildRequires:	%{jack_devel}
-%endif
-
-# LIBTOOL
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if  0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libltdl-devel
-%endif
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1220
-BuildRequires:	libltdl-devel
-%else
-BuildRequires:	libtool
-%endif
-%endif
-
-# UUID support
-BuildRequires: libuuid-devel
-
-# MAD support
-%ifarch %{ix86} x86_64
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
-%define with_libmad 1
-%define mad_devel libmad-devel
-BuildRequires:		%{mad_devel}
-%endif
-%endif
-
-# Pulseaudio config file
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
-%define with_pulseaudio 1
-%endif
-
-Requires:		libtqt4 >= %{tde_epoch}:4.2.0
-Requires:		audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of TDE.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%dir %{tde_libdir}/mcop/Arts/Environment
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are needed for runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group:		Development/Libraries
-Summary:	ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-Requires:	alsa-lib-devel
-Requires:	audiofile-devel
-Requires:	libvorbis-devel
-Requires:	esound-devel
-%{?with_libmad:Requires: %{mad_devel}}
-%{?with_jack:Requires: %{jack_devel}}
-
-%description devel
-arts (analog real-time synthesizer) is the sound system of TDE.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-# Arts includes are under 'tde' - this is on purpose !
-%{tde_tdeincludedir}/arts/
-# Artsc includes are not under 'tde'.
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?with_pulseaudio}
-
-%package config-pulseaudio
-Group:		System Environment/Daemons
-Summary:	ARTS - Default configuration file for Pulseaudio
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description config-pulseaudio
-This package contains a default ARTS configuration file, that is 
-intended for systems running the Pulseaudio server.
-
-%files config-pulseaudio
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kcmartsrc
-
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  \
-  -DWITH_ALSA=ON \
-  -DWITH_AUDIOFILE=ON \
-  -DWITH_VORBIS=ON \
-  %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
-  %{?with_esound:-DWITH_ESOUND=ON} \
-  %{?with_jack:-DWITH_JACK=ON} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc
-
-# Installs the Pulseaudio configuration file
-%if 0%{?with_pulseaudio}
-cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc"
-[Arts]
-Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f
-NetworkTransparent=true
-SuspendTime=1
-EOF
-chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
-%endif
-
-# Add supplementary folders
-%__install -d -m 755 "%{?buildroot}%{tde_libdir}/mcop/Arts/Environment"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
deleted file mode 100644
index c9e7121e6..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# spec file for package avahi-tqt (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libavahi %{_lib}avahi
-%else
-%define libavahi libavahi
-%endif
-
-
-Name:		trinity-avahi-tqt
-Epoch:		%{tde_epoch}
-Version:	0.6.30
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Avahi TQt integration library
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	LGPL-2.0+
-%else
-License:	LGPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
-
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# GETTEXT support
-BuildRequires:	gettext-devel
-
-# Xi support
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxi-devel
-%endif
-%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	dbus-devel
-%endif
-
-# PCAP support
-BuildRequires:	libcap-devel
-
-# AVAHI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel libavahi-client-devel
-%endif
-%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
-%define avahi_devel avahi-devel
-%endif
-%{?avahi_devel:BuildRequires: %{avahi_devel}}
-
-# EXPAT support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	expat-devel
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libexpat-devel
-%endif
-
-# NAS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_nas 1
-BuildRequires: nas-devel
-%endif
-
-# XT support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXt-devel
-%endif
-
-%description
-Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
-It allows programs to publish and discover services and hosts
-running on a local network with no specific configuration. For
-example you can plug into a network and instantly find printers to
-print to, files to look at and people to talk to.
- .
-This library contains the interface to integrate the Avahi libraries
-into a TQt main loop application.
-
-##########
-
-%package -n %{libavahi}-tqt1
-Summary:	Avahi TQt integration library
-Group:		System/Libraries
-Provides:	libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libavahi}-tqt1
-Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
-It allows programs to publish and discover services and hosts
-running on a local network with no specific configuration. For
-example you can plug into a network and instantly find printers to
-print to, files to look at and people to talk to.
- .
-This library contains the interface to integrate the Avahi libraries
-into a TQt main loop application.
-
-%post -n %{libavahi}-tqt1
-/sbin/ldconfig || :
-
-%postun -n %{libavahi}-tqt1
-/sbin/ldconfig || :
-
-%files -n %{libavahi}-tqt1
-%defattr(-,root,root,-)
-%{_libdir}/libavahi-tqt.so.1
-%{_libdir}/libavahi-tqt.so.1.0.0
-
-##########
-
-%package -n %{libavahi}-tqt-devel
-Summary:	Avahi TQt integration library (Development Files)
-Group:		Development/Libraries/C and C++
-Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libtqt4-devel >= %{tde_epoch}:4.2.0
-%{?avahi_devel:Requires: %{avahi_devel}}
-
-Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libavahi}-tqt-devel
-Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
-It allows programs to publish and discover services and hosts
-running on a local network with no specific configuration. For
-example you can plug into a network and instantly find printers to
-print to, files to look at and people to talk to.
- .
-This library contains the interface to integrate the Avahi libraries
-into a TQt main loop application.
-
-%post -n %{libavahi}-tqt-devel
-/sbin/ldconfig || :
-
-%postun -n %{libavahi}-tqt-devel
-/sbin/ldconfig || :
-
-%files -n %{libavahi}-tqt-devel
-%defattr(-,root,root,-)
-%{_includedir}/avahi-tqt/
-%{_libdir}/libavahi-tqt.so
-%{_libdir}/libavahi-tqt.la
-%{_libdir}/pkgconfig/avahi-tqt.pc
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-export NOCONFIGURE=1
-./autogen.sh
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --exec-prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-  \
-  --disable-static \
-  --disable-dependency-tracking \
-  \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system \
-%if 0%{?suse_version}
-  --with-distro=suse \
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-  --with-distro=fedora \
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-  --with-distro=mandriva \
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
deleted file mode 100644
index 8e4771767..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# spec file for package dbus-1-tqt (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libdbus %{_lib}dbus
-%else
-%define libdbus libdbus
-%endif
-
-
-Name:		trinity-dbus-1-tqt
-Epoch:		%{tde_epoch}
-Version:	0.9
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Dbus bindings for the Trinity Qt [TQt] interface
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	qt3-devel >= 3.3.8d
-BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%description
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides bindings for the Trinity Qt TQt interface.
-
-See the dbus description for more information about D-BUS in general.
-
-###########
-
-%package -n %{libdbus}-1-tqt0
-Summary:		Dbus bindings for the Trinity Qt [TQt] interface
-Group:			System/Libraries
-Provides:		libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libdbus}-1-tqt0
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides bindings for the Trinity Qt TQt interface.
-
-See the dbus description for more information about D-BUS in general.
-
-%post -n %{libdbus}-1-tqt0
-/sbin/ldconfig || :
-
-%postun -n %{libdbus}-1-tqt0
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-1-tqt0
-%defattr(-,root,root,-)
-%{_libdir}/libdbus-1-tqt.so.0
-%{_libdir}/libdbus-1-tqt.so.0.0.0
-
-##########
-
-%package -n %{libdbus}-1-tqt-devel
-Summary:		Dbus bindings for the Trinity Qt [TQt] interface (Development Files)
-Group:			Development/Libraries/C and C++
-Provides:		libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libdbus}-1-tqt-devel
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides bindings for the Trinity Qt TQt interface.
-
-See the dbus description for more information about D-BUS in general.
-
-%post -n %{libdbus}-1-tqt-devel
-/sbin/ldconfig || :
-
-%postun -n %{libdbus}-1-tqt-devel
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-1-tqt-devel
-%defattr(-,root,root,-)
-%{_bindir}/dbusxml2qt3
-%{_includedir}/*.h
-%{_libdir}/libdbus-1-tqt.so
-%{_libdir}/libdbus-1-tqt.la
-%{_libdir}/pkgconfig/*.pc
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch
deleted file mode 100644
index e9e873d63..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- dbus-tqt/message.cpp.dbustypes	2011-08-24 20:23:14.000000000 +0200
-+++ dbus-tqt/message.cpp	2012-09-06 19:54:47.037175413 +0200
-@@ -187,28 +210,28 @@
-   case DBUS_TYPE_INT32:
-     {
-       dbus_int32_t v;
--      dbus_message_iter_get_basic (i, &v);
-+      dbus_message_iter_get_int32 (i);
-       ret = TQVariant( v );
-     }
-     break;
-   case DBUS_TYPE_UINT32:
-     {
-       dbus_uint32_t v;
--      dbus_message_iter_get_basic (i, &v);
-+      dbus_message_iter_get_uint32 (i);
-       ret = TQVariant( v );
-     }
-     break;
-   case DBUS_TYPE_DOUBLE:
-     {
-       double v;
--      dbus_message_iter_get_basic (i, &v);
-+      dbus_message_iter_get_double (i);
-       ret = TQVariant( v );
-     }
-     break;
-   case DBUS_TYPE_STRING:
-     {
-       const char *v;
--      dbus_message_iter_get_basic (i, &v);
-+      dbus_message_iter_get_string (i);
-       ret = TQVariant( v );
-     }
-     break;
-@@ -241,7 +264,7 @@
-       while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID)
-         {
-           const char *v;
--          dbus_message_iter_get_basic (&sub, &v);
-+          dbus_message_iter_get_string (&sub);
-           tempList.append( TQString( v ) );
-           dbus_message_iter_next (&sub);
-         }
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
deleted file mode 100644
index 81ec5d368..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# spec file for package dbus-tqt (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libdbus %{_lib}dbus
-%else
-%define libdbus libdbus
-%endif
-
-
-Name:		trinity-dbus-tqt
-Epoch:		%{tde_epoch}
-Version:	0.63
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Simple inter-process messaging system
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [dbus-tqt] Fix build on RHEL 4
-Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
-
-BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%description
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides the TQt-based shared library for applications using the
-Qt interface to D-BUS.
-
-See the dbus description for more information about D-BUS in general.
-
-##########
-
-%package -n %{libdbus}-tqt-1-0
-Summary:		Simple inter-process messaging system (TQt-based shared library)
-Group:			System/Libraries
-Provides:		libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libdbus}-tqt-1-0
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides the TQt-based shared library for applications using the
-Qt interface to D-BUS.
-
-See the dbus description for more information about D-BUS in general.
-
-%post -n %{libdbus}-tqt-1-0
-/sbin/ldconfig || :
-
-%postun -n %{libdbus}-tqt-1-0
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-tqt-1-0
-%defattr(-,root,root,-)
-%{_libdir}/libdbus-tqt-1.so.0
-%{_libdir}/libdbus-tqt-1.so.0.0.0
-
-##########
-
-%package -n %{libdbus}-tqt-1-devel
-Summary:		Simple inter-process messaging system (TQt interface)
-Group:			Development/Libraries/C and C++
-Provides:		libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libdbus}-tqt-1-devel
-D-BUS is a message bus, used for sending messages between applications.
-Conceptually, it fits somewhere in between raw sockets and CORBA in
-terms of complexity.
-
-This package provides the TQt-based shared library for applications using the
-Qt interface to D-BUS.
-
-See the dbus description for more information about D-BUS in general.
-
-%post -n %{libdbus}-tqt-1-devel
-/sbin/ldconfig || :
-
-%postun -n %{libdbus}-tqt-1-devel
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-tqt-1-devel
-%defattr(-,root,root,-)
-%{_includedir}/dbus-1.0/*
-%{_libdir}/libdbus-tqt-1.so
-%{_libdir}/libdbus-tqt-1.la
-%{_libdir}/pkgconfig/dbus-tqt.pc
-
-##########
-
-%if 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-%if 0%{?rhel} == 4
-export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
-%endif
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
deleted file mode 100644
index 419ff8ff9..000000000
--- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# spec file for package libcaldav (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg libcaldav
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libcaldav %{_lib}caldav
-%else
-%define libcaldav libcaldav
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.6.5
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-Summary:	A client library that adds support for the CalDAV protocol (rfc4791)
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	libcaldav_0.6.5-2debian2.tar.gz
-
-BuildRequires:	make
-BuildRequires:	libtool
-BuildRequires:	fdupes
-
-# GTK2 support
-%if 0%{?rhel} == 4
-BuildRequires:	evolution28-gtk2-devel
-%else
-BuildRequires:	glib2-devel
-BuildRequires:	gtk2-devel
-%endif
-
-# CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel libcurl-devel
-%else
-# Specific CURL version for TDE on RHEL 5 (and older)
-%define libcurl_devel trinity-libcurl-devel
-%endif
-%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
-
-%description
-libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
-The object is to have a library which fully implements the protocol so that it is
-easy to integrate CalDAV support into any PIM application.
-
-##########
-
-%package -n %{libcaldav}0
-Summary:	A client library that adds support for the CalDAV protocol (rfc4791)
-Group:		System/Libraries
-
-Obsoletes:	trinity-libcaldav < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libcaldav = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libcaldav = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libcaldav}0
-libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
-The object is to have a library which fully implements the protocol so that it is
-easy to integrate CalDAV support into any PIM application.
-
-%files -n %{libcaldav}0
-%defattr(-,root,root,-)
-%{_libdir}/libcaldav.so.0
-%{_libdir}/libcaldav.so.0.0.6
-%{_docdir}/libcaldav-%{version}/
-
-%post -n %{libcaldav}0
-/sbin/ldconfig
-
-%postun -n %{libcaldav}0
-/sbin/ldconfig
-
-##########
-
-%package -n %{libcaldav}-devel
-Summary:	A client library that adds support for the CalDAV protocol (Development Files)
-Group:		Development/Libraries/Other
-Requires:	%{libcaldav}0 = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?libcurl_devel:Requires: %{libcurl_devel}}
-Requires:	glib2-devel
-
-Obsoletes:	trinity-libcaldav-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libcaldav}-devel
-libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
-The object is to have a library which fully implements the protocol so that it is
-easy to integrate CalDAV support into any PIM application. 
-
-This package includes the development files.
-
-%files -n %{libcaldav}-devel
-%defattr(-,root,root,-)
-%{_includedir}/libcaldav/
-%{_libdir}/libcaldav.la
-%{_libdir}/libcaldav.so
-%{_libdir}/pkgconfig/libcaldav.pc
-
-%post -n %{libcaldav}-devel
-/sbin/ldconfig
-
-%postun -n %{libcaldav}-devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n libcaldav-%{version}
-autoreconf --force --install --symlink
-
-
-%build
-# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# RHEL4 stuff
-if [ -d /usr/evolution28 ]; then
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-
-%configure \
-  --docdir=%{_docdir}/libcaldav \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-  \
-  --disable-dependency-tracking
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{buildroot}%{_libdir}/*.a
-
-# Fix doc dir
-mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/
-
-# Fix include dir
-mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/libcaldav/
-
-# Fix duplicate files
-%fdupes %{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
deleted file mode 100644
index 152f1cf90..000000000
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# spec file for package libcarddav (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg libcarddav
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libcarddav %{_lib}carddav
-%else
-%define libcarddav libcarddav
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.6.2
-Release:	%{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A portable CardDAV client implementation
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Deskio
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	libcarddav_0.6.2-2debian2.tar.gz
-
-BuildRequires:	make
-BuildRequires:	libtool
-
-# CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel libcurl-devel
-%else
-# Specific CURL version for TDE on RHEL 5 (and older)
-%define libcurl_devel trinity-libcurl-devel
-%endif
-%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
-
-# GTK2 support
-%if 0%{?rhel} == 4
-BuildRequires:	evolution28-gtk2-devel
-%else
-BuildRequires:	glib2-devel
-BuildRequires:	gtk2-devel
-%endif
-
-%description
-Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
-It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
-Build dependencies are minimal, requiring only libcurl.
-
-##########
-
-%package -n %{libcarddav}0
-Summary:	A portable CardDAV client implementation
-Group:		System/Libraries
-
-Obsoletes:	trinity-libcarddav < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libcarddav = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libcarddav = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libcarddav}0
-Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
-It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
-Build dependencies are minimal, requiring only libcurl.
-
-%files -n %{libcarddav}0
-%defattr(-,root,root,-)
-%{_libdir}/libcarddav.so.0
-%{_libdir}/libcarddav.so.0.0.6
-
-%post -n %{libcarddav}0
-/sbin/ldconfig
-
-%postun -n %{libcarddav}0
-/sbin/ldconfig
-
-
-##########
-
-%package -n %{libcarddav}-devel
-Summary:	A portable CardDAV client implementation (Development Files)
-Group:		Development/Libraries/Other
-Requires:	%{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?libcurl_devel:Requires: %{libcurl_devel}}
-Requires:	glib2-devel
-
-Obsoletes:	trinity-libcarddav-devel < %{version}-%{release}
-Provides:	trinity-libcarddav-devel = %{version}-%{release}
-Provides:	libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libcarddav}-devel
-Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
-It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
-Build dependencies are minimal, requiring only libcurl.
-
-This package contains the development files.
-
-%files -n %{libcarddav}-devel
-%defattr(-,root,root,-)
-%{_includedir}/libcarddav/
-%{_libdir}/libcarddav.la
-%{_libdir}/libcarddav.so
-%{_libdir}/pkgconfig/libcarddav.pc
-
-%post -n %{libcarddav}-devel
-/sbin/ldconfig
-
-%postun -n %{libcarddav}-devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n libcarddav-%{version}
-%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/"
-autoreconf --force --install --symlink
-
-
-%build
-unset QTDIR QTINC QTLIB
-
-# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# RHEL4 stuff
-if [ -d /usr/evolution28 ]; then
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-
-%configure \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-  \
-  --disable-dependency-tracking
-
-# FIXME: bad libtool ??
-%if 0%{?rhel} == 4 || 0%{?rhel} == 5
-%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
-%else
-%__make %{?_smp_mflags}
-%endif
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool
-
-# Unwanted files
-%__rm -f %{buildroot}%{_libdir}/libcarddav.a
-
-# Fix include location
-%__mv -f "%{?buildroot}%{_includedir}/libcarddav-0.6.1" "%{?buildroot}%{_includedir}/libcarddav"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.1.spec b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
deleted file mode 100644
index 9fa6ee8ac..000000000
--- a/redhat/dependencies/qt3/qt3-3.5.13.1.spec
+++ /dev/null
@@ -1,699 +0,0 @@
-# Always install under standard prefix
-%define _prefix /usr
-
-# The following QT4 packages should NOT be installed to
-# allow QT3 compilation (please uninstall them prior to compile)
-#  qt
-#  qt-sqlite
-#  qt-mysql
-#  qt-x11
-#  qt-devel
-# ...maybe others !!!!
-
-Name:			qt3
-Epoch:			1
-Version:		3.3.8.d
-Release:		9%{?dist}
-Summary:		The shared library for the Qt 3 GUI toolkit
-
-License:		QPL or GPLv2 or GPLv3
-Group:			System Environment/Libraries
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes:		qt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		qt = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: qt3-3.5.13.1.tar.gz
-Source2: qt.sh
-Source3: qt.csh
-Source4: designer3.desktop
-Source5: assistant3.desktop
-Source6: linguist3.desktop
-Source7: qtconfig3.desktop
-
-Patch1: qt-3.3.4-print-CJK.patch
-Patch2: qt-3.0.5-nodebug.patch
-Patch3: qt-3.1.0-makefile.patch
-Patch4: qt-x11-free-3.3.7-umask.patch
-Patch5: qt-x11-free-3.3.6-strip.patch
-Patch7: qt-x11-free-3.3.2-quiet.patch
-Patch12: qt-uic-nostdlib.patch
-Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
-Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
-Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
-Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
-Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
-Patch32: qt-3.3.6-fontrendering-214371.patch
-Patch33: qt-3.3.8-fontrendering-#214570.patch
-Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
-Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
-Patch37: qt-3.3.6-fontrendering-gu-228452.patch
-Patch38: qt-x11-free-3.3.8-odbc.patch
-Patch39: qt-x11-free-3.3.7-arm.patch
-Patch40: qt-x11-free-3.3.8b-typo.patch
-
-# immodule patches
-Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
-
-# qt-copy patches
-Patch110: 0084-compositing-properties.patch
-
-# upstream patches
-Patch200: qt-x11-free-3.3.4-fullscreen.patch
-
-# TDE 3.5.13 patches
-Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
-
-%define qt_dirname qt-3.3
-%define qtdir %{_libdir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/qt-devel-%{version}
-
-%define smp 1
-%define immodule 1
-%define debug 0
-
-# MySQL plugins
-%define plugin_mysql -plugin-sql-mysql
-%define mysql_include_dir %{_includedir}/mysql
-%define mysql_lib_dir %{_libdir}/mysql
-
-# Postgres plugins
-%define plugin_psql -plugin-sql-psql
-
-# ODBC plugins
-%define plugin_odbc -plugin-sql-odbc
-
-# sqlite plugins
-%define plugin_sqlite -plugin-sql-sqlite
-
-%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: coreutils
-Requires: fontconfig >= 2.0
-Requires: /etc/ld.so.conf.d
-
-BuildRequires: desktop-file-utils
-BuildRequires: libmng-devel
-BuildRequires: glibc-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: perl
-BuildRequires: sed
-BuildRequires: findutils
-BuildRequires: cups-devel
-BuildRequires: tar
-BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel
-BuildRequires: desktop-file-utils
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: unixODBC-devel
-BuildRequires: sqlite-devel
-BuildRequires: gcc-c++
-BuildRequires: make
-
-%if 0%{?rhel} == 4
-BuildRequires: libungif-devel
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires: giflib-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXft-devel
-BuildRequires: libXext-devel
-BuildRequires: libX11-devel
-BuildRequires: libSM-devel
-BuildRequires: libICE-devel
-BuildRequires: libXt-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXi-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-
-
-%package config
-Summary: Graphical configuration tool for programs using Qt 3
-Group: User Interface/Desktops
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-
-%package devel
-Summary: Development files for the Qt 3 GUI toolkit
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: freetype-devel
-Requires: fontconfig-devel
-Requires: libpng-devel
-Requires: libjpeg-devel
-Requires: libmng-devel
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%else
-Requires: libXrender-devel
-Requires: libXrandr-devel
-Requires: libXcursor-devel
-Requires: libXinerama-devel
-Requires: libXft-devel
-Requires: libXext-devel
-Requires: libX11-devel
-Requires: libSM-devel
-Requires: libICE-devel
-Requires: libXt-devel
-Requires: xorg-x11-proto-devel
-Requires: mesa-libGL-devel
-Requires: mesa-libGLU-devel
-%endif
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package devel-docs
-Summary: Documentation for the Qt 3 GUI toolkit
-Group: Development/Libraries
-Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package ODBC
-Summary: ODBC drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package MySQL
-Summary: MySQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package PostgreSQL
-Summary: PostgreSQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%package sqlite
-Summary: sqlite drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-
-%package designer
-Summary: Interface designer (IDE) for the Qt 3 toolkit
-Group: Development/Tools
-Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-
-%description
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains the shared library needed to run Qt 3
-applications, as well as the README files for Qt 3.
-
-
-%description config
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains a graphical configuration tool for programs using Qt 3.
-
-
-%description devel
-The %{name}-devel package contains the files necessary to develop
-applications using the Qt GUI toolkit: the header files, the Qt meta
-object compiler.
-
-Install %{name}-devel if you want to develop GUI applications using the Qt 3
-toolkit.
-
-
-%description devel-docs
-The %{name}-devel-docs package contains the man pages, the HTML documentation and
-example programs for Qt 3.
-
-
-%description ODBC
-ODBC driver for Qt 3's SQL classes (QSQL)
-
-
-%description MySQL
-MySQL driver for Qt 3's SQL classes (QSQL)
-
-
-%description PostgreSQL
-PostgreSQL driver for Qt 3's SQL classes (QSQL)
-
-
-%description sqlite
-sqlite driver for Qt 3's SQL classes (QSQL)
-
-
-%description designer
-The %{name}-designer package contains an User Interface designer tool
-for the Qt 3 toolkit.
-
-
-%prep
-%setup -q -n qt3-3.5.13.1
-
-%patch1 -p1 -b .cjk
-%patch2 -p1 -b .ndebug
-%patch3 -p1 -b .makefile
-%patch4 -p1 -b .umask
-%patch5 -p1
-%patch7 -p1 -b .quiet
-%patch12 -p1 -b .nostdlib
-%patch13 -p1 -b .fonts
-%patch25 -p1 -b .uic-multilib
-%patch27 -p1 -b .fontrendering-ml_IN-bz#209097
-%patch29 -p1 -b .fontrendering-as_IN-bz#209972
-%patch31 -p1 -b .fontrendering-te_IN-bz#211259
-%patch32 -p1 -b .fontrendering-bz#214371
-%patch33 -p1 -b .fontrendering-#214570
-%patch34 -p1 -b .fontrendering-#209974
-%patch35 -p1 -b .fontrendering-ml_IN-217657
-%patch37 -p1 -b .fontrendering-gu-228452
-%patch38 -p1 -b .odbc
-# it's not 100% clear to me if this is safe for all archs -- Rex
-%ifarch armv5tel
-%patch39 -p1 -b .arm
-%endif
-%patch40 -p1
-
-# immodule patches
-%if %{immodule}
-%patch53 -p1 -b .resetinputcontext
-%endif
-
-# qt-copy patches
-%patch110 -p0 -b .0084-compositing-properties
-
-# upstream patches
-%patch200 -p1 -b .fullscreen
-
-# TDE 3.5.13 patches
-%patch300 -p1
-
-# convert to UTF-8
-iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
-mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
-
-%build
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
-export QTDEST=%{qtdir}
-
-# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
-%if 0%{?rhel} == 4
-%__sed -i plugins/src/inputmethods/xim/xim.pro \
-  -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
-%endif
-
-%if %{smp}
-   export SMP_MFLAGS="%{?_smp_mflags}"
-%endif
-
-%if %{immodule}
-   sh ./make-symlinks.sh
-%endif
-
-# set correct X11 prefix
-if [ -d /usr/X11R6 ]; then
-  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
-  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
-else
-  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
-  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
-fi
-perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
-perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
-
-# don't use rpath
-perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
-
-perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf
-
-# set correct lib path
-if [ "%{_lib}" == "lib64" ] ; then
-  perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
-  perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
-fi
-
-# build shared, threaded (default) libraries
-echo yes | ./configure \
-  -prefix $QTDEST \
-  -docdir %{qt_docdir} \
-%if %{_lib} == lib64
-  -platform linux-g++-64 \
-%else
-  -platform linux-g++ \
-%endif
-%if %{debug}
-  -debug \
-%else
-  -release \
-%endif
-  -shared \
-  -largefile \
-  -qt-gif \
-  -system-zlib \
-  -system-libpng \
-  -system-libmng \
-  -system-libjpeg \
-  -no-exceptions \
-  -enable-styles \
-  -enable-tools \
-  -enable-kernel \
-  -enable-widgets \
-  -enable-dialogs \
-  -enable-iconview \
-  -enable-workspace \
-  -enable-network \
-  -enable-canvas \
-  -enable-table \
-  -enable-xml \
-  -enable-opengl \
-  -enable-sql \
-  -qt-style-motif \
-  %{plugins} \
-  -stl \
-  -thread \
-  -cups \
-  -sm \
-%if 0%{?rhel} == 4
-  -no-xinerama \
-  -no-xrandr \
-%else
-  -xinerama \
-  -xrandr \
-%endif
-  -xrender \
-  -xkb \
-  -ipv6 \
-  -dlopen-opengl \
-  -xft \
-  -tablet -v
-
-make $SMP_MFLAGS src-qmake
-
-# build sqlite plugin
-pushd plugins/src/sqldrivers/sqlite
-qmake -o Makefile sqlite.pro
-popd
-
-# build psql plugin
-pushd plugins/src/sqldrivers/psql
-qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
-popd
-
-# build mysql plugin
-pushd plugins/src/sqldrivers/mysql
-qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
-popd
-
-# build odbc plugin
-pushd plugins/src/sqldrivers/odbc
-qmake -o Makefile "LIBS+=-lodbc" odbc.pro
-popd
-
-make $SMP_MFLAGS src-moc
-make $SMP_MFLAGS sub-src
-make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
-
-%install
-rm -rf %{buildroot}
-
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
-export QTDEST=%{qtdir}
-
-make install INSTALL_ROOT=%{buildroot}
-
-for i in findtr qt20fix qtrename140 lrelease lupdate ; do
-   install bin/$i %{buildroot}%{qtdir}/bin/
-done
-
-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
-
-# install man pages
-mkdir -p %{buildroot}%{_mandir}
-cp -fR doc/man/* %{buildroot}%{_mandir}/
-
-# clean up
-make -C tutorial clean
-make -C examples clean
-
-# Make sure the examples can be built outside the source tree.
-# Our binaries fulfill all requirements, so...
-perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
-
-# don't include Makefiles of qt examples/tutorials
-find examples -name "Makefile" | xargs rm -f
-find examples -name "*.obj" | xargs rm -rf
-find examples -name "*.moc" | xargs rm -rf
-find tutorial -name "Makefile" | xargs rm -f
-
-for a in */*/Makefile ; do
-  sed 's|^SYSCONF_MOC.*|SYSCONF_MOC		= %{qtdir}/bin/moc|' < $a > ${a}.2
-  mv -v ${a}.2 $a
-done
-
-install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh
-install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh
-
-# Add desktop files
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  --vendor="qt" \
-  %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
-
-# Patch qmake to use qt-mt unconditionally
-perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
-
-# remove broken links
-rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
-rm -f %{buildroot}%{qtdir}/lib/*.la
-
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
-
-# install icons
-mkdir %{buildroot}%{_datadir}/pixmaps
-install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
-install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
-install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
-install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
-
-# own style directory
-mkdir -p %{buildroot}%{qtdir}/plugins/styles
-
-%clean
-rm -rf %{buildroot}
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc FAQ LICENSE* README* changes*
-%dir %{qtdir}
-%dir %{qtdir}/bin
-%dir %{qtdir}/lib
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
-%dir %{qtdir}/plugins/styles
-%{qtdir}/translations
-%{qtdir}/plugins/designer/
-%if %{immodule}
-%{qtdir}/plugins/inputmethods
-%endif
-%config /etc/profile.d/*
-/etc/ld.so.conf.d/*
-%{qtdir}/lib/libqui.so.*
-%{qtdir}/lib/libqt*.so.*
-
-%files config
-%defattr(-,root,root,-)
-%{qtdir}/bin/qtconfig
-%{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/pixmaps/qtconfig3.png
-
-%files devel
-%defattr(-,root,root,-)
-%{qt_docdir}/
-%{qtdir}/bin/moc
-%{qtdir}/bin/uic
-%{qtdir}/bin/findtr
-%{qtdir}/bin/qt20fix
-%{qtdir}/bin/qtrename140
-%{qtdir}/bin/assistant
-%{qtdir}/bin/qm2ts
-%{qtdir}/bin/qmake
-%{qtdir}/bin/qembed
-%{qtdir}/bin/linguist
-%{qtdir}/bin/lupdate
-%{qtdir}/bin/lrelease
-%{qtdir}/include
-%{qtdir}/mkspecs
-%{qtdir}/lib/libqt*.so
-%{qtdir}/lib/libqui.so
-%{qtdir}/lib/libeditor.a
-%{qtdir}/lib/libdesigner*.a
-%{qtdir}/lib/libqassistantclient.a
-%{qtdir}/lib/*.prl
-%{qtdir}/phrasebooks
-%{_libdir}/pkgconfig/*
-%{_datadir}/applications/*linguist*.desktop
-%{_datadir}/applications/*assistant*.desktop
-%{_datadir}/pixmaps/linguist3.png
-%{_datadir}/pixmaps/assistant3.png
-
-# QT 3.3.8.D (TDE): 4 binaries have appeared
-%{qtdir}/bin/createcw
-%{qtdir}/bin/makeqpf
-%{qtdir}/bin/mergetr
-%{qtdir}/bin/msg2qm
-
-# QT 3.3.8.D (TDE): removes lots of unnecessary include files
-# (where do they come from ??? They were not in 3.3.8b !)
-%exclude %{qtdir}/include/btree.h
-%exclude %{qtdir}/include/crc32.h
-%exclude %{qtdir}/include/debian_qsql_odbc.h
-%exclude %{qtdir}/include/deflate.h
-%exclude %{qtdir}/include/ftglue.h
-%exclude %{qtdir}/include/ftxgdef.h
-%exclude %{qtdir}/include/ftxgpos.h
-%exclude %{qtdir}/include/ftxgsub.h
-%exclude %{qtdir}/include/ftxopen.h
-%exclude %{qtdir}/include/ftxopenf.h
-%exclude %{qtdir}/include/hash.h
-%exclude %{qtdir}/include/inffast.h
-%exclude %{qtdir}/include/inffixed.h
-%exclude %{qtdir}/include/inflate.h
-%exclude %{qtdir}/include/inftrees.h
-%exclude %{qtdir}/include/moc_yacc.h
-%exclude %{qtdir}/include/opcodes.h
-%exclude %{qtdir}/include/os.h
-%exclude %{qtdir}/include/otlbuffer.h
-%exclude %{qtdir}/include/pager.h
-%exclude %{qtdir}/include/parse.h
-%exclude %{qtdir}/include/pngasmrd.h
-%exclude %{qtdir}/include/pngconf.h
-%exclude %{qtdir}/include/sqlite.h
-%exclude %{qtdir}/include/sqliteInt.h
-%exclude %{qtdir}/include/trees.h
-%exclude %{qtdir}/include/vdbe.h
-%exclude %{qtdir}/include/vdbeInt.h
-%exclude %{qtdir}/mkspecs/linux-g++-sparc
-
-
-
-%files devel-docs
-%defattr(-,root,root,-)
-%doc examples
-%doc tutorial
-%{_mandir}/*/*
-
-%files sqlite
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlite.so
-
-%files ODBC
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
-
-%files PostgreSQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
-
-%files MySQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
-
-%files designer
-%defattr(-,root,root,-)
-%{qtdir}/templates
-%{qtdir}/bin/designer
-%{_datadir}/applications/*designer*.desktop
-%{_datadir}/pixmaps/designer3.png
-
-
-%changelog
-* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
-- Initial release for TDE 3.5.13.1
-
-* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
-- Fix Provides and Obsoletes, again and again ...
-
-* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7
-- Fix Provides and Obsoletes. Now only for RHEL 5.
-
-* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6
-- Fix Qt3 builds with libpng15. [Bug #683]
-
-* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5
-- Fix 'Provides' AGAIN !! [Bug #823]
-
-* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4
-- Fix 'Provides' [Bug #823]
-
-* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
-- Updates zh_TW translations, thanks to Wei-Lun Chao .
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
-- Add missing BuildRequires
-
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
-- Switch to Trinity Version
-- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
deleted file mode 100644
index b997dd9ec..000000000
--- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec
+++ /dev/null
@@ -1,561 +0,0 @@
-# Always install under standard prefix
-%define _prefix /usr
-
-# The following QT4 packages should NOT be installed to
-# allow QT3 compilation (please uninstall them prior to compile)
-#  qt
-#  qt-sqlite
-#  qt-mysql
-#  qt-x11
-#  qt-devel
-# ...maybe others !!!!
-
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Name:			qt
-%else
-Name:			qt3
-%endif
-
-Epoch:			1
-Version:		3.3.8.d%{?preversion:_%{preversion}}
-Release:		10%{?dist}
-Summary:		The shared library for the Qt 3 GUI toolkit
-
-License:		QPL or GPLv2 or GPLv3
-Group:			System Environment/Libraries
-URL:			http://www.trinitydesktop.org/
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Provides:		qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz
-Source2: qt.sh
-Source3: qt.csh
-Source4: designer3.desktop
-Source5: assistant3.desktop
-Source6: linguist3.desktop
-Source7: qtconfig3.desktop
-
-# Monolithic patch for QT3 for TDE 3.5.13.2
-Patch1: qt3-3.5.13.2.patch
-
-%define qt_dirname qt-3.3
-%define qtdir %{_libdir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/qt-devel-%{version}
-
-%define smp 1
-%define immodule 1
-%define debug 0
-
-# MySQL plugins
-%define plugin_mysql -plugin-sql-mysql
-%define mysql_include_dir %{_includedir}/mysql
-%define mysql_lib_dir %{_libdir}/mysql
-
-# Postgres plugins
-%define plugin_psql -plugin-sql-psql
-
-# ODBC plugins
-%define plugin_odbc -plugin-sql-odbc
-
-# sqlite plugins
-%define plugin_sqlite -plugin-sql-sqlite
-
-%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: coreutils
-Requires: fontconfig >= 2.0
-Requires: /etc/ld.so.conf.d
-
-BuildRequires: desktop-file-utils
-BuildRequires: libmng-devel
-BuildRequires: glibc-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: perl
-BuildRequires: sed
-BuildRequires: findutils
-BuildRequires: cups-devel
-BuildRequires: tar
-BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel
-BuildRequires: desktop-file-utils
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: unixODBC-devel
-BuildRequires: sqlite-devel
-BuildRequires: gcc-c++
-BuildRequires: make
-
-%if 0%{?rhel} == 4
-BuildRequires: libungif-devel
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires: giflib-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXft-devel
-BuildRequires: libXext-devel
-BuildRequires: libX11-devel
-BuildRequires: libSM-devel
-BuildRequires: libICE-devel
-BuildRequires: libXt-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXi-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-
-%description
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains the shared library needed to run Qt 3
-applications, as well as the README files for Qt 3.
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc FAQ LICENSE* README* changes*
-%dir %{qtdir}
-%dir %{qtdir}/bin
-%dir %{qtdir}/lib
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
-%dir %{qtdir}/plugins/styles
-%{qtdir}/translations
-%{qtdir}/plugins/designer/
-%if %{immodule}
-%{qtdir}/plugins/inputmethods
-%endif
-%config /etc/profile.d/*
-/etc/ld.so.conf.d/*
-%{qtdir}/lib/libqui.so.*
-%{qtdir}/lib/libqt*.so.*
-
-##########
-
-%package config
-Summary: Graphical configuration tool for programs using Qt 3
-Group: User Interface/Desktops
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-config = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description config
-Qt is a GUI software toolkit which simplifies the task of writing and
-maintaining GUI (Graphical User Interface) applications
-for the X Window System.
-
-Qt is written in C++ and is fully object-oriented.
-
-This package contains a graphical configuration tool for programs using Qt 3.
-
-%files config
-%defattr(-,root,root,-)
-%{qtdir}/bin/qtconfig
-%{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/pixmaps/qtconfig3.png
-
-##########
-
-%package devel
-Summary: Development files for the Qt 3 GUI toolkit
-Group: Development/Libraries
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: freetype-devel
-Requires: fontconfig-devel
-Requires: libpng-devel
-Requires: libjpeg-devel
-Requires: libmng-devel
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%else
-Requires: libXrender-devel
-Requires: libXrandr-devel
-Requires: libXcursor-devel
-Requires: libXinerama-devel
-Requires: libXft-devel
-Requires: libXext-devel
-Requires: libX11-devel
-Requires: libSM-devel
-Requires: libICE-devel
-Requires: libXt-devel
-Requires: xorg-x11-proto-devel
-Requires: mesa-libGL-devel
-Requires: mesa-libGLU-devel
-%endif
-
-%description devel
-The %{name}-devel package contains the files necessary to develop
-applications using the Qt GUI toolkit: the header files, the Qt meta
-object compiler.
-
-Install %{name}-devel if you want to develop GUI applications using the Qt 3
-toolkit.
-
-%files devel
-%defattr(-,root,root,-)
-%{qt_docdir}/
-%{qtdir}/bin/moc
-%{qtdir}/bin/uic
-%{qtdir}/bin/findtr
-%{qtdir}/bin/qt20fix
-%{qtdir}/bin/qtrename140
-%{qtdir}/bin/assistant
-%{qtdir}/bin/qm2ts
-%{qtdir}/bin/qmake
-%{qtdir}/bin/qembed
-%{qtdir}/bin/linguist
-%{qtdir}/bin/lupdate
-%{qtdir}/bin/lrelease
-%{qtdir}/include
-%{qtdir}/mkspecs
-%{qtdir}/lib/libqt*.so
-%{qtdir}/lib/libqui.so
-%{qtdir}/lib/libeditor.a
-%{qtdir}/lib/libdesigner*.a
-%{qtdir}/lib/libqassistantclient.a
-%{qtdir}/lib/*.prl
-%{qtdir}/phrasebooks
-%{_libdir}/pkgconfig/*
-%{_datadir}/applications/*linguist*.desktop
-%{_datadir}/applications/*assistant*.desktop
-%{_datadir}/pixmaps/linguist3.png
-%{_datadir}/pixmaps/assistant3.png
-
-# QT 3.3.8.D (TDE): 4 binaries have appeared
-%{qtdir}/bin/createcw
-%{qtdir}/bin/makeqpf
-%{qtdir}/bin/mergetr
-%{qtdir}/bin/msg2qm
-
-##########
-
-%package devel-docs
-Summary: Documentation for the Qt 3 GUI toolkit
-Group: Development/Libraries
-Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
-Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description devel-docs
-The %{name}-devel-docs package contains the man pages, the HTML documentation and
-example programs for Qt 3.
-
-%files devel-docs
-%defattr(-,root,root,-)
-%doc examples
-%doc tutorial
-%{_mandir}/*/*
-
-##########
-
-%package ODBC
-Summary: ODBC drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description ODBC
-ODBC driver for Qt 3's SQL classes (QSQL)
-
-%files ODBC
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
-
-##########
-
-%package MySQL
-Summary: MySQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description MySQL
-MySQL driver for Qt 3's SQL classes (QSQL)
-
-%files MySQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
-
-##########
-
-%package PostgreSQL
-Summary: PostgreSQL drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description PostgreSQL
-PostgreSQL driver for Qt 3's SQL classes (QSQL)
-
-%files PostgreSQL
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
-
-##########
-
-%package sqlite
-Summary: sqlite drivers for Qt 3's SQL classes
-Group: System Environment/Libraries
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description sqlite
-sqlite driver for Qt 3's SQL classes (QSQL)
-
-%files sqlite
-%defattr(-,root,root,-)
-%{qtdir}/plugins/sqldrivers/libqsqlite.so
-
-##########
-
-%package designer
-Summary: Interface designer (IDE) for the Qt 3 toolkit
-Group: Development/Tools
-Requires:	qt3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	qt3-designer = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description designer
-The %{name}-designer package contains an User Interface designer tool
-for the Qt 3 toolkit.
-
-%files designer
-%defattr(-,root,root,-)
-%{qtdir}/templates
-%{qtdir}/bin/designer
-%{_datadir}/applications/*designer*.desktop
-%{_datadir}/pixmaps/designer3.png
-
-##########
-
-%prep
-%setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}
-
-%patch1 -p1
-
-
-# convert to UTF-8
-iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
-mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
-
-%build
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
-export QTDEST=%{qtdir}
-
-# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
-%if 0%{?rhel} == 4
-%__sed -i plugins/src/inputmethods/xim/xim.pro \
-  -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
-%endif
-
-%if %{smp}
-   export SMP_MFLAGS="%{?_smp_mflags}"
-%endif
-
-%if %{immodule}
-   sh ./make-symlinks.sh
-%endif
-
-# set correct X11 prefix
-if [ -d /usr/X11R6 ]; then
-  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
-  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
-else
-  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
-  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
-fi
-perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
-perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
-
-# don't use rpath
-perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
-
-perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf
-
-# set correct lib path
-if [ "%{_lib}" == "lib64" ] ; then
-  perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
-  perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
-fi
-
-# Fix QTLIB is under 'lib' instead of 'lib64' under RHEL/Fedora
-sed -i "mkspecs/linux-g++-64/qmake.conf" -e "s|\$(QTDIR)/lib64|\$(QTDIR)/lib|"
-
-# build shared, threaded (default) libraries
-echo yes | ./configure \
-  -prefix $QTDEST \
-  -docdir %{qt_docdir} \
-%if %{_lib} == lib64
-  -platform linux-g++-64 \
-%else
-  -platform linux-g++ \
-%endif
-%if %{debug}
-  -debug \
-%else
-  -release \
-%endif
-  -shared \
-  -largefile \
-  -qt-gif \
-  -system-zlib \
-  -system-libpng \
-  -system-libmng \
-  -system-libjpeg \
-  -no-exceptions \
-  -enable-styles \
-  -enable-tools \
-  -enable-kernel \
-  -enable-widgets \
-  -enable-dialogs \
-  -enable-iconview \
-  -enable-workspace \
-  -enable-network \
-  -enable-canvas \
-  -enable-table \
-  -enable-xml \
-  -enable-opengl \
-  -enable-sql \
-  -qt-style-motif \
-  %{plugins} \
-  -stl \
-  -thread \
-  -cups \
-  -sm \
-%if 0%{?rhel} == 4
-  -no-xinerama \
-  -no-xrandr \
-%else
-  -xinerama \
-  -xrandr \
-%endif
-  -xrender \
-  -xkb \
-  -ipv6 \
-  -dlopen-opengl \
-  -xft \
-  -tablet -v
-
-make $SMP_MFLAGS src-qmake
-
-# build sqlite plugin
-pushd plugins/src/sqldrivers/sqlite
-qmake -o Makefile sqlite.pro
-popd
-
-# build psql plugin
-pushd plugins/src/sqldrivers/psql
-qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
-popd
-
-# build mysql plugin
-pushd plugins/src/sqldrivers/mysql
-qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
-popd
-
-# build odbc plugin
-pushd plugins/src/sqldrivers/odbc
-qmake -o Makefile "LIBS+=-lodbc" odbc.pro
-popd
-
-make $SMP_MFLAGS src-moc
-make $SMP_MFLAGS sub-src
-make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
-
-%install
-rm -rf %{buildroot}
-
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
-export QTDEST=%{qtdir}
-
-make install INSTALL_ROOT=%{buildroot}
-
-for i in findtr qt20fix qtrename140 lrelease lupdate ; do
-   install bin/$i %{buildroot}%{qtdir}/bin/
-done
-
-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
-
-# install man pages
-mkdir -p %{buildroot}%{_mandir}
-cp -fR doc/man/* %{buildroot}%{_mandir}/
-
-# clean up
-make -C tutorial clean
-make -C examples clean
-
-# Make sure the examples can be built outside the source tree.
-# Our binaries fulfill all requirements, so...
-perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
-
-# don't include Makefiles of qt examples/tutorials
-find examples -name "Makefile" | xargs rm -f
-find examples -name "*.obj" | xargs rm -rf
-find examples -name "*.moc" | xargs rm -rf
-find tutorial -name "Makefile" | xargs rm -f
-
-for a in */*/Makefile ; do
-  sed 's|^SYSCONF_MOC.*|SYSCONF_MOC		= %{qtdir}/bin/moc|' < $a > ${a}.2
-  mv -v ${a}.2 $a
-done
-
-install -D -m 644 "%{SOURCE2}" %{buildroot}/etc/profile.d/qt3.sh
-install -D -m 644 "%{SOURCE3}" %{buildroot}/etc/profile.d/qt3.csh
-
-# Add desktop files
-mkdir -p "%{buildroot}%{_datadir}/applications"
-desktop-file-install \
-  --dir "%{buildroot}%{_datadir}/applications" \
-  --vendor="qt" \
-  %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
-
-# Patch qmake to use qt-mt unconditionally
-perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
-
-# remove broken links
-rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
-rm -f %{buildroot}%{qtdir}/lib/*.la
-
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
-
-# install icons
-install -D -m 644 "tools/assistant/images/qt.png"         "%{buildroot}%{_datadir}/pixmaps/qtconfig3.png"
-install -D -m 644 "tools/assistant/images/designer.png"   "%{buildroot}%{_datadir}/pixmaps/designer3.png"
-install -D -m 644 "tools/assistant/images/assistant.png"  "%{buildroot}%{_datadir}/pixmaps/assistant3.png"
-install -D -m 644 "tools/assistant/images/linguist.png"   "%{buildroot}%{_datadir}/pixmaps/linguist3.png"
-
-# own style directory
-mkdir -p "%{buildroot}%{qtdir}/plugins/styles"
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
deleted file mode 100644
index 8892b1ec2..000000000
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# spec file for package tqca-tls (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tqca-tls
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqt3 %{_lib}qt3
-%else
-%define libtqt3 libqt3
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0
-Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-Group:		Applications/Internet
-URL:		http://delta.affinix.com/qca/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		tqca-tls-3.5.13.2.tar.gz
-
-BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
-
-BuildRequires:	gcc-c++
-BuildRequires:	openssl-devel >= 0.9.8
-
-
-%description
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-##########
-
-%package -n %{libtqt3}-mt-tqca-tls
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-Group:		Applications/Internet
-
-%description -n %{libtqt3}-mt-tqca-tls
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-%files -n %{libtqt3}-mt-tqca-tls
-%defattr(0644,root,root,0755)
-%doc README COPYING
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_libdir}/qt3/plugins/crypto/libqca-tls.so
-%endif
-%if 0%{?suse_version}
-%{_usr}/lib/qt3/plugins/crypto/libqca-tls.so
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%{_libdir}/qt-3.3/plugins/crypto/libqca-tls.so
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n tqca-tls-3.5.13.2
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-./configure
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
deleted file mode 100644
index 629131436..000000000
--- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# spec file for package tqca (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tqca
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqca %{_lib}tqca
-%else
-%define libtqca libtqca
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0
-Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TQt Cryptographic Architecture
-Group:		Development/Libraries/C and C++
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        tqca-3.5.13.2.tar.gz
-Source1:		trinity-tqca-rpmlintrc
-
-BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	gcc-c++
-
-%description
-Taking a hint from the similarly-named Java Cryptography Architecture,
-TQCA aims to provide a straightforward and cross-platform crypto API,
-using TQt datatypes and conventions. TQCA separates the API from the
-implementation, using plugins known as Providers. The advantage of this
-model is to allow applications to avoid linking to or explicitly depending
-on any particular cryptographic library. This allows one to easily change
-or upgrade crypto implementations without even needing to recompile the
-application!
-
-##########
-
-%package -n %{libtqca}1
-Summary:	TQt Cryptographic Architecture
-Group:		Development/Libraries/C and C++
-
-Obsoletes:	trinity-libtqca < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libtqca = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libtqca = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libtqca1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libtqca}1
-Taking a hint from the similarly-named Java Cryptography Architecture,
-TQCA aims to provide a straightforward and cross-platform crypto API,
-using TQt datatypes and conventions. TQCA separates the API from the
-implementation, using plugins known as Providers. The advantage of this
-model is to allow applications to avoid linking to or explicitly depending
-on any particular cryptographic library. This allows one to easily change
-or upgrade crypto implementations without even needing to recompile the
-application!
-
-%post -n %{libtqca}1
-/sbin/ldconfig
-
-%postun -n %{libtqca}1
-/sbin/ldconfig
-
-%files -n %{libtqca}1
-%defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_libdir}/libqca.so.1
-%{_libdir}/libqca.so.1.0
-%{_libdir}/libqca.so.1.0.0
-
-##########
-
-%package -n %{libtqca}-devel
-Summary:	TQt Cryptographic Architecture development files
-Group:		Development/Libraries/C and C++
-Requires:	%{libtqca}1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-libtqca-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libtqca}-devel
-This packages contains the development files for TQCA
-
-%post -n %{libtqca}-devel
-/sbin/ldconfig
-
-%postun -n %{libtqca}-devel
-/sbin/ldconfig
-
-%files -n %{libtqca}-devel
-%defattr(-,root,root,-)
-%{_includedir}/qca.h
-%{_libdir}/libqca.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n tqca-3.5.13.2
-
-# Fix 'lib64' library directory
-perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-./configure \
-  --prefix=%{_prefix} \
-  --qtdir=${QTDIR} \
-  --debug
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install INSTALL_ROOT=$RPM_BUILD_ROOT
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
deleted file mode 100644
index 127e0b908..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ /dev/null
@@ -1,270 +0,0 @@
-#
-# spec file for package tqtinterface (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tqtinterface
-%define cmake_modules_dir %{_datadir}/cmake/Modules
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqt4 %{_lib}tqt4
-%else
-%define libtqt4 libtqt4
-%endif
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	4.2.0
-Release:	%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	The Trinity Qt Interface Libraries
-Group:		System/GUI/Other
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	qt3 >= 3.3.8d
-BuildRequires:	qt3-devel >= 3.3.8d
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-BuildRequires:	trinity-cmake-macros
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# UUID support
-BuildRequires: libuuid-devel
-
-# PTHREAD support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	pth-devel
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-# X11 libraries
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxi-devel
-%endif
-%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-
-%description
-The Trinity Qt Interface is a library that abstracts Qt from Trinity.
-This allows the Trinity code to rapidly port from one version of Qt to another.
-This is primarily accomplished by defining old functions in terms of new functions,
-although some code has been added for useful functions that are no longer part of Qt.
-
-
-##########
-
-%package -n %{libtqt4}
-Group:		System/GUI/Other
-Summary:	The Trinity Qt Interface Libraries
-Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	qt3 >= 3.3.8d
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
-
-Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libtqt4}
-The Trinity Qt Interface is a library that abstracts Qt from Trinity.
-This allows the Trinity code to rapidly port from one version of Qt to another.
-This is primarily accomplished by defining old functions in terms of new functions,
-although some code has been added for useful functions that are no longer part of Qt.
-
-%files -n %{libtqt4}
-%defattr(-,root,root,-)
-%{_libdir}/libtqassistantclient.so.4
-%{_libdir}/libtqassistantclient.so.4.2.0
-%{_libdir}/libtqt.so.4
-%{_libdir}/libtqt.so.4.2.0
-
-%post -n %{libtqt4}
-/sbin/ldconfig || :
-
-%postun -n %{libtqt4}
-/sbin/ldconfig || :
-
-##########
-
-%package -n %{libtqt4}-devel
-Group:		Development/Libraries/X11
-Summary:	The Trinity Qt Interface Libraries (Development Files)
-Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	qt3-devel >= 3.3.8d
-Requires:	libuuid-devel
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
-
-Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n %{libtqt4}-devel
-The Trinity Qt Interface is a library that abstracts Qt from Trinity.
-This allows the Trinity code to rapidly port from one version of Qt to another.
-This is primarily accomplished by defining old functions in terms of new functions,
-although some code has been added for useful functions that are no longer part of Qt.
-
-%post -n %{libtqt4}-devel
-/sbin/ldconfig || :
-
-%postun -n %{libtqt4}-devel
-/sbin/ldconfig || :
-
-%files -n %{libtqt4}-devel
-%defattr(-,root,root,-)
-%{_bindir}/convert_qt_tqt1
-%{_bindir}/convert_qt_tqt2
-%{_bindir}/convert_qt_tqt3
-%{_bindir}/dcopidl-tqt
-%{_bindir}/dcopidl2cpp-tqt
-%{_bindir}/dcopidlng-tqt
-%{_bindir}/mcopidl-tqt
-%{_bindir}/moc-tqt
-%{_bindir}/tmoc
-%{_bindir}/tqt-replace
-%{_bindir}/tqt-replace-stream
-%{_bindir}/uic-tqt
-%{_includedir}/tqt/
-%{_libdir}/libtqassistantclient.la
-%{_libdir}/libtqassistantclient.so
-%{_libdir}/libtqt.la
-%{_libdir}/libtqt.so
-%{_libdir}/pkgconfig/tqt.pc
-%{cmake_modules_dir}/*.cmake
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
-#  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
-#  Otherwise, it defaults to ${QTDIR}/lib !
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DQT_PREFIX_DIR=${QTDIR} \
-  -DQT_VERSION=3 \
-  -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-  -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \
-  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{_libdir} \
-  -DBIN_INSTALL_DIR=%{_bindir} \
-  \
-  -DCMAKE_LIBRARY_PATH="%{_libdir}" \
-  -DCMAKE_INCLUDE_PATH="%{_includedir}" \
-  \
-  -DWITH_QT3="ON" \
-  -DBUILD_ALL="ON" \
-  -DUSE_QT3="ON" \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf "%{?buildroot}"
-%__make install DESTDIR="%{?buildroot}" -C build
-
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{_includedir}/tqt/*.h; do
-  echo "" >>${i}
-done
-%endif
-
-# Install 'cmake' modules for development use
-%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
-done
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-
-%changelog
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
deleted file mode 100644
index 204996c77..000000000
--- a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# spec file for package brp-check-trinity (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_version 3.5.13.2
-%define tde_prefix /opt/trinity
-
-Name:		brp-check-trinity
-Version:	1.0
-Release:	1%{?dist}
-Summary:	Build root policy check scripts for Trinity
-Group:		System Environment/Daemons 
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-BuildRequires:	update-desktop-files
-BuildRequires:	brp-check-suse
-BuildRequires:	brp-extract-appdata
-Requires:	update-desktop-files
-Requires:	brp-check-suse
-Requires:	brp-extract-appdata
-Requires:	sed
-
-
-
-%description
-This package dynamically patches the openSUSE brp script to allow
-building of Trinity Desktop Environment (TDE) instead of KDE3.
-It should not be installed on runtime computer.
-
-
-%files
-
-%post
-for i in \
-	brp-desktop.data/applications.menu \
-	brp-desktop.data/kde-settings.menu \
-	brp-desktop.data/xdg_menu \
-	brp-suse.d/brp-25-symlink \
-	brp-suse.d/brp-72-extract-appdata \
-	suse_update_desktop_file.sh \
-; do
-	echo "Patching file '/usr/lib/rpm/${i}' ..."
-	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
-	sed -i "/usr/lib/rpm/${i}" \
-		-e "s|opt/kde3|opt/trinity|g" \
-		-e "s|kde-settings-|tde-settings-|g" \
-		-e "s|doc/kde|doc/tde|g" \
-		-e "s|kde_xdgdata|tde_xdgdata|g" \
-done
-
-
-%postun
-for i in \
-	brp-desktop.data/applications.menu \
-	brp-desktop.data/kde-settings.menu \
-	brp-desktop.data/xdg_menu \
-	brp-suse.d/brp-25-symlink \
-	brp-suse.d/brp-72-extract-appdata \
-	suse_update_desktop_file.sh \
-; do
-	echo "Restoring file '/usr/lib/rpm/${i}' ..."
-	install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}"
-done
-rm -rf "/usr/lib/rpm.orig"
-
-##########
-
-%prep
-
-%build
-
-%install
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
deleted file mode 100644
index 80eef7416..000000000
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ /dev/null
@@ -1,330 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _docdir %{_datadir}/doc
-%define tde_datadir %{tde_prefix}/share
-%endif
-
-Name:		trinity-desktop
-Version:	3.5.13.2
-Release:	2%{?dist}
-License:	GPL
-Summary:	Meta-package to install TDE
-Group:		User Interface/Desktops
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-Source0:	trinity-3.5.13-fedora.repo
-Source1:	trinity-3.5.13-rhel.repo
-Source2:	RPM-GPG-KEY-trinity
-
-Requires:	trinity-tdeaccessibility >= %{version}
-Requires:	trinity-tdeaddons >= %{version}
-Requires:	trinity-tdeadmin >= %{version}
-Requires:	trinity-tdeartwork >= %{version}
-Requires:	trinity-tdebase >= %{version}
-Requires:	trinity-tdebindings >= %{version}
-Requires:	trinity-tdeedu >= %{version}
-Requires:	trinity-tdegames >= %{version}
-Requires:	trinity-tdegraphics >= %{version}
-Requires:	trinity-tdemultimedia >= %{version}
-Requires:	trinity-tdenetwork >= %{version}
-Requires:	trinity-tdepim >= %{version}
-Requires:	trinity-tdeutils >= %{version}
-Requires:	trinity-tdetoys >= %{version}
-Requires:	hal
-
-%if 0%{?rhel} || 0%{?fedora}
-# YUM configuration file
-Requires:	trinity-repo >= %{version}
-%endif
-
-%description
-The TDE project aims to keep the KDE3.5 computing style alive, as well as 
-polish off any rough edges that were present as of KDE 3.5.10. Along 
-the way, new useful features will be added to keep the environment 
-up-to-date.
-Toward that end, significant new enhancements have already been made in 
-areas such as display control, network connectivity, user 
-authentication, and much more!
-
-%files
-
-##########
-
-%package devel
-Group:		User Interface/Desktops
-Summary:	Meta-package to install TDE development tools
-
-Obsoletes:	trinity-desktop-dev < %{version}-%{release}
-Provides:	trinity-desktop-dev = %{version}-%{release}
-
-Requires:	trinity-tdesdk >= %{version}
-Requires:	trinity-tdevelop >= %{version}
-Requires:	trinity-tdewebdev >= %{version}
-
-%description devel
-%{summary}
-
-%files devel
-
-##########
-
-%package applications
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all TDE applications
-
-# Warning, k9copy requires ffmpeg
-# Warning, tderadio requires libmp3lame
-
-Requires: trinity-abakus
-Requires: trinity-amarok
-Requires: trinity-basket
-Requires: trinity-bibletime
-Requires: trinity-digikam
-Requires: trinity-dolphin
-Requires: trinity-filelight
-Requires: trinity-gwenview
-Requires: trinity-k3b
-Requires: trinity-k9copy
-Requires: trinity-kaffeine
-Requires: trinity-kaffeine-mozilla
-Requires: trinity-katapult
-Requires: trinity-kbarcode
-Requires: trinity-kbfx
-Requires: trinity-kbookreader
-Requires: trinity-kchmviewer
-Requires: trinity-kcpuload
-Requires: trinity-kdiff3
-Requires: trinity-kdirstat
-Requires: trinity-keep
-Requires: trinity-kile
-Requires: trinity-kiosktool
-Requires: trinity-kmyfirewall
-Requires: trinity-kmymoney
-Requires: trinity-knemo
-Requires: trinity-knetload
-Requires: trinity-knetstats
-Requires: trinity-knights
-Requires: trinity-knowit
-Requires: trinity-knutclient
-Requires: trinity-koffice-suite
-Requires: trinity-konversation
-Requires: trinity-kpicosim
-Requires: trinity-krename
-Requires: trinity-krusader
-Requires: trinity-ksplash-engine-moodin
-Requires: trinity-ksquirrel
-Requires: trinity-kstreamripper
-Requires: trinity-ksystemlog
-Requires: trinity-ktechlab
-Requires: trinity-ktorrent
-Requires: trinity-kuickshow
-Requires: trinity-kvirc
-Requires: trinity-kvkbd
-Requires: trinity-piklab
-Requires: trinity-potracegui
-Requires: trinity-smb4k
-Requires: trinity-smartcardauth
-Requires: trinity-soundkonverter
-Requires: trinity-tde-guidance
-Requires: trinity-tde-style-lipstik
-Requires: trinity-tde-style-qtcurve
-Requires: trinity-tde-systemsettings
-Requires: trinity-tdeio-apt
-Requires: trinity-tdeio-locate
-Requires: trinity-tdeio-umountwrapper
-Requires: trinity-tderadio
-Requires: trinity-tdmtheme
-Requires: trinity-tellico
-Requires: trinity-twin-style-crystal
-Requires: trinity-wlassistant
-Requires: trinity-yakuake
-
-# PCLinuxOS does not have sudo ...
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
-
-# RHEL5: pilot library is too old
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires: trinity-kpilot
-%endif
-
-# Network management
-# RHEL 6 and openSUSE 11.x: knetworkmanager8
-%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
-Requires: trinity-knetworkmanager
-%endif
-
-# Power management
-Requires: trinity-tde-guidance-powermanager
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-# On RHEL 5, HAL version is too old for kpowersave .
-Requires: trinity-kpowersave
-%endif
-
-# Decoration-related stuff (not installed by default)
-#Requires: trinity-kgtk-qt3
-#Requires: trinity-gtk-qt-engine
-#Requires: trinity-gtk3-tqt-engine
-#Requires: trinity-qt4-tqt-theme-engine
-
-# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} == 5 || 0%{?rhel} == 7
-%else
-Requires: trinity-rosegarden
-%endif
-
-# Compiz-related stuff does not work (obsolete)
-#Requires: trinity-compizconfig-backend-kconfig
-#Requires: trinity-desktop-effects-kde
-#Requires: trinity-fusion-icon
-
-# Useless l10n package
-#Requires: trinity-filelight-l10n
-
-# RHEL 4
-%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-# HAL is mandatory for these apps, but too old
-Requires: trinity-kima
-Requires: trinity-kmplayer
-# No OTR support
-Requires: trinity-kopete-otr
-# No DBUS support
-Requires: trinity-kdbusfnotification
-# Subversion 1.1 is too old
-Requires: trinity-tdesvn
-%endif
-
-%description applications
-%{summary}
-
-%files  applications
-
-##########
-
-%if 0
-
-%package extras
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all extras (unofficial) TDE packages
-
-Requires:	trinity-akode
-Requires:	trinity-kasablanca
-#Requires:	trinity-kdebluetooth
-#Requires:	trinity-kcheckgmail
-Requires:	trinity-icons-crystalsvg-updated
-Requires:	trinity-icons-kfaenza
-Requires:	trinity-icons-oxygen
-Requires:	trinity-kbibtex
-Requires:	trinity-kbiff
-Requires:	trinity-kcmautostart
-Requires:	trinity-kftpgrabber
-Requires:	trinity-kickoff-i18n
-Requires:	trinity-knmap
-#Requires:	trinity-knoda
-Requires:	trinity-ksensors
-Requires:	trinity-kshowmail
-Requires:	trinity-mplayerthumbs
-Requires:	trinity-style-ia-ora
-Requires:	trinity-tdeio-ftps-plugin
-#Requires:	trinity-tdeio-sysinfo-plugin
-Requires:	trinity-theme-baghira
-Requires:	trinity-tork
-
-
-# GLIBC too old on RHEL <= 5
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-Requires:	trinity-twinkle
-%endif
-
-%description extras
-%{summary}
-
-%files extras
-
-%endif
-
-##########
-
-%package all
-Group:		User Interface/Desktops
-Summary:	Meta-package to install all TDE packages
-
-Requires:	%{name} = %{version}
-Requires:	%{name}-applications = %{version}
-Requires:	%{name}-devel = %{version}
-#Requires:	%{name}-extras = %{version}
-
-%description all
-%{summary}
-
-%files all
-
-##########
-
-%if 0%{?rhel} || 0%{?fedora}
-%package -n trinity-repo
-Group:		User Interface/Desktops
-Summary:	Yum configuration files for Trinity
-Requires(pre):	coreutils
-
-%description -n trinity-repo
-%{summary}
-
-%pre -n trinity-repo
-# Make sure every Trinity related repository is deleted before installing new one.
-%__rm -f %{_sysconfdir}/yum.repos.d/trinity-*.repo
-
-%files -n trinity-repo
-%defattr(-,root,root,-)
-%{_sysconfdir}/yum.repos.d/*.repo
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity
-%endif
-
-##########
-
-%prep
-
-%build
-
-%install
-%__rm -rf %{?buildroot}
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
-
-# FEDORA configuration for YUM
-%if 0%{?fedora}
-%__sed %{SOURCE0} \
-  -e 's/\$releasever/%{fedora}/g' \
-  -e 's/-fedora/-f%{fedora}/g' \
-  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
-%endif
-
-# RHEL configuration for YUM
-# $releasever is replaced with its value
-%if 0%{?rhel}
-%__sed %{SOURCE1} \
-  -e 's/\$releasever/%{rhel}/g' \
-  >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-%endif
-
-# RPM signing key
-%if 0%{?rhel} || 0%{?fedora}
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
-%endif
-
-
-%changelog
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
deleted file mode 100644
index 5a8e7f9b0..000000000
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
+++ /dev/null
@@ -1,484 +0,0 @@
-#
-# spec file for package trinity-filesystem (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_version 3.5.13.2
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define _docdir %{tde_docdir}
-%define tde_docdir %{tde_datadir}/doc
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_includedir %{tde_prefix}/include
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-
-Name:		trinity-filesystem
-Version:	%{tde_version}
-Release:	1%{?dist}
-Summary:	Trinity Directory Layout
-Group:		System/Fhs
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		/usr
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-
-%description
-This package installs the Trinity directory structure.
-
-
-%files
-%defattr(-,root,root,-)
-%dir %{tde_prefix}
-
-%dir %{tde_bindir}
-
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/config/magic
-
-%dir %{tde_docdir}
-%dir %{tde_tdedocdir}
-%dir %{tde_tdedocdir}/HTML
-%dir %{tde_tdedocdir}/HTML/en
-%dir %{tde_tdedocdir}/HTML/en/common
-
-%dir %{tde_includedir}
-%dir %{tde_tdeincludedir}
-
-%dir %{tde_libdir}
-%dir %{tde_libdir}/java
-%dir %{tde_libdir}/jni
-%dir %{tde_libdir}/pkgconfig
-%dir %{tde_tdelibdir}
-
-%dir %{tde_datadir}/applications
-%dir %{tde_datadir}/applications/kde
-%dir %{tde_datadir}/applnk
-%dir %{tde_datadir}/applnk/.hidden
-%dir %{tde_datadir}/applnk/*
-%dir %{tde_datadir}/applnk/*/*
-%dir %{tde_datadir}/apps
-%dir %{tde_datadir}/apps/*
-%dir %{tde_datadir}/cmake
-%dir %{tde_datadir}/config.kcfg
-%dir %{tde_datadir}/autostart
-%dir %{tde_datadir}/emoticons
-%dir %{tde_datadir}/icons
-%dir %{tde_datadir}/icons/crystalsvg
-%dir %{tde_datadir}/icons/crystalsvg/*
-%dir %{tde_datadir}/icons/crystalsvg/*/*
-%dir %{tde_datadir}/icons/hicolor
-%dir %{tde_datadir}/icons/hicolor/*
-%dir %{tde_datadir}/icons/hicolor/*/*
-%dir %{tde_datadir}/icons/locolor
-%dir %{tde_datadir}/icons/locolor/*
-%dir %{tde_datadir}/icons/locolor/*/*
-%dir %{tde_datadir}/locale
-%dir %{tde_datadir}/locale/en_US
-%dir %{tde_datadir}/locale/l10n
-%dir %{tde_datadir}/locale/l10n/*
-%dir %{tde_datadir}/man
-%dir %{tde_datadir}/man/*
-%dir %{tde_datadir}/mimelnk
-%dir %{tde_datadir}/mimelnk/*
-%dir %{tde_datadir}/services
-%dir %{tde_datadir}/services/*
-%dir %{tde_datadir}/servicetypes
-%dir %{tde_datadir}/wallpapers
-
-
-%dir %{_sysconfdir}/trinity
-%dir %{_sysconfdir}/xdg/menus
-
-##########
-
-%prep
-
-%build
-
-%install
-%__install -d -m 755 %{?buildroot}%{tde_prefix}
-
-%__install -d -m 755 %{?buildroot}%{tde_bindir}
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applications/kde
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/.hidden
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Applications
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Development
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Languages
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Mathematics
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Miscellaneous
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Science
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Edutainment/Tools
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Games/Board
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Graphics
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Internet
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Multimedia
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Office
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/LookNFeel
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Settings/WebBrowsing
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Toys
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man1
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man2
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man3
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man4
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man5
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man6
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man7
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man8
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man9
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/interface
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/model
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/multipart
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/print
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/text
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/uri
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/video
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/services
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/services/kconfiguredialog
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers
-
-# Create icons directories
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
-for t in crystalsvg hicolor locolor ; do
-  %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}"
-  %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable"
-  for i in {16,22,32,48,64,128} ; do
-    %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}"
-  done
-  
-  # Create subdirectories
-  for r in actions apps categories devices mimetypes places ; do
-    %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}"
-    for i in {16,22,32,48,64,128} ; do
-      %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}/${r}"
-    done
-  done
-done
-
-%__install -d -m 755 %{?buildroot}%{tde_docdir}
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en
-%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common
-
-%__install -d -m 755 %{?buildroot}%{tde_includedir}
-%__install -d -m 755 %{?buildroot}%{tde_tdeincludedir}
-
-%__install -d -m 755 %{?buildroot}%{tde_libdir}
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/java
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/jni
-%__install -d -m 755 %{?buildroot}%{tde_libdir}/pkgconfig
-%__install -d -m 755 %{?buildroot}%{tde_tdelibdir}
-
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
-
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ad
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ae
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/af
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ag
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ai
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/al
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/am
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/an
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ao
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ar
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/as
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/at
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/au
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/aw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ax
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/az
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ba
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/be
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/br
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bs
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/by
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/bz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ca
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ch
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ci
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ck
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/co
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cx
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/cz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/de
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/do
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/dz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ec
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ee
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/eh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/er
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/es
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/et
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/fr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ga
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ge
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/gy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ht
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/hu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/id
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ie
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/il
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/in
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/iq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ir
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/is
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/it
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/jp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ke
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ki
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/km
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ky
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/kz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/la
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/li
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ls
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/lv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ly
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ma
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/md
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/me
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ml
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mo
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mq
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ms
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mx
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/my
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/mz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/na
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ne
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ng
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ni
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/no
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/np
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/nz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/om
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pe
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ph
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pl
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ps
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/pw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/py
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/qa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ro
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rs
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ru
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/rw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sa
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sb
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sd
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/se
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sh
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/si
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/so
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/st
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/sz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/td
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/th
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tj
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tk
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/to
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tp
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tr
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tt
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tv
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tw
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/tz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ua
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ug
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/us
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uy
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/uz
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/va
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vc
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ve
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vg
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vi
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vn
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/vu
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/wf
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ws
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/ye
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/za
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zm
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/zw
-
-%post
-%if 0%{?suse_version}
-# Add setuid files in '/etc/permissions.local'
-for b in kcheckpass kgrantpty kpac_dhcp_helper start_kdeinit kdmtsak ; do
-  if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
-    echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
-  fi
-done
-%endif
-
-
-%changelog
diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
deleted file mode 100644
index 93e82bd9b..000000000
--- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define tde_pkg libkdcraw
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Raw picture decoding C++ library (runtime) [Trinity]
-
-Epoch:		1
-Version:	0.1.9
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-%description
-C++ interface around dcraw binary program used to decode RAW
-picture files.
-This library is used by kipi-plugins, digiKam and others kipi host programs.
-libkdcraw contains the library of libkdcraw.
-
-%package devel
-Group:		Development/Libraries
-Summary:	RAW picture decoding C++ library (development) [Trinity]
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Libkdcraw is a C++ interface around dcraw binary program used to
-decode Raw picture files.
-libkdcraw-devel contains development files and documentation. The
-library documentation is available on kdcraw.h header file.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdcraw.so.4
-%{tde_libdir}/libkdcraw.so.4.0.3
-%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdcraw.so
-%{tde_libdir}/libkdcraw.la
-%{tde_tdeincludedir}/libkdcraw/
-%{tde_libdir}/pkgconfig/libkdcraw.pc
-
-%changelog
diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
deleted file mode 100644
index 38f08646a..000000000
--- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# Default version for this component
-%define tde_pkg libkexiv2
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
-
-Epoch:		1
-Version:	0.1.7
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# EXIV2
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-
-%description
-libkexif2 contains the library of libkexiv2.
-Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
-
-%package devel
-Group:		Development/Libraries
-Summary:	Qt like interface for the libexiv2 library (development) [Trinity]
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-libkexif2-devel contains development files and documentation for libkexiv2
-library.  The library documentation is available on kexiv2.h header file.
-Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libkexiv2.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkexiv2.so
-%{tde_libdir}/libkexiv2.la
-%{tde_tdeincludedir}/libkexiv2/
-%{tde_libdir}/pkgconfig/libkexiv2.pc
-
-
-%changelog
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
deleted file mode 100644
index 740aea3b1..000000000
--- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-# Default version for this component
-%define tde_pkg libkipi
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
-
-Epoch:		1
-Version:	0.1.5
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-%description
-Libkipi is a library
-  o that contains common routines and widget used by kipi-plugins
-  o to ease implementation of the kipi-plugins interface in an application
-    that wants to use kipi-plugins
-    
-Homepage: http://www.kipi-plugins.org/
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	library for apps that want to use kipi-plugins (development version) [Trinity]
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Libkipi is a library
-  o that contains common routines and widget used by kipi-plugins
-  o to ease implementation of the kipi-plugins interface in an application
-    that wants to use kipi-plugins
-    
-This package contains development files and documentation for libkipi library.
-Homepage: http://www.kipi-plugins.org/
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so.0
-%{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
-%{tde_datadir}/icons/hicolor/*/apps/kipi.png
-%{tde_datadir}/servicetypes/kipiplugin.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so
-%{tde_libdir}/libkipi.la
-%{tde_tdeincludedir}/libkipi/
-%{tde_libdir}/pkgconfig/libkipi.pc
-
-%changelog
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
deleted file mode 100644
index 9945da33c..000000000
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ /dev/null
@@ -1,514 +0,0 @@
-# Default version for this component
-%define tde_pkg libksquirrel
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Trinity image viewer
-Epoch:		1
-Version:	0.8.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:		libksquirrel-3.5.13-detect_netpbm.patch
-Patch1:		libksquirrel-3.5.13.2-fix_giflib5_support.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	gettext-devel
-BuildRequires:	transfig
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libtiff-devel
-
-%if 0%{?suse_version}
-BuildRequires:	giflib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libungif-devel
-%endif
-
-# DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_djvu 1
-BuildRequires:	djvulibre
-%endif
-
-# XMEDCON support
-%if 0%{?fedora}
-%define with_xmedcon 1
-BuildRequires:	xmedcon
-BuildRequires:	xmedcon-devel
-%endif
-
-# RSVG support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_svg 1
-%if 0%{?fedora} || 0%{?rhel} 
-BuildRequires:	librsvg2
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires:	librsvg2-tools
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	librsvg
-%endif
-%if 0%{?suse_version}
-BuildRequires:	rsvg-view
-BuildRequires:	librsvg-devel
-%endif
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# FREETYPE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_freetype 1
-%if 0%{?suse_version} == 1140
-BuildRequires: freetype2-devel
-%else
-BuildRequires: freetype-devel
-%endif
-%endif
-
-# WMF support
-BuildRequires:	libwmf-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	netpbm
-%else
-BuildRequires:	netpbm-progs
-%endif
-
-
-%description
-Runtime libraries for KSquirrel.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	Trinity image viewer
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development libraries for KSquirrel.
-
-
-%package tools
-Summary:	Trinity image viewer
-Group:		Environment/Libraries
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tools
-Tools for KSquirrel.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .netpbm
-%patch1 -p1 -b .giflib5
-
-# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
-if [ -r /usr/include/freetype2/ftbitmap.h ]; then
-  %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
-  %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
-fi
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_includedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  %{?with_djvu:--enable-djvu}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE README
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0
-%if 0%{?with_xmedcon}
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0
-%endif
-%if 0%{?with_djvu}
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_png.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_png.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0.8.0
-%if 0%{?with_svg}
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0.8.0
-%if 0%{?with_freetype}
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
-%{tde_libdir}/libksquirrel-libs-png.so.0
-%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
-%{tde_libdir}/libksquirrel-libs.so.0
-%{tde_libdir}/libksquirrel-libs.so.0.8.0
-%{tde_datadir}/ksquirrel-libs/libkls_camera.so.ui
-%if 0%{?with_djvu}
-%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui
-%endif
-%if 0%{?with_svg}
-%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui
-%endif
-%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
-%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
-%{tde_datadir}/ksquirrel-libs/rgbmap
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/ksquirrel-libs/error.h
-%{tde_includedir}/ksquirrel-libs/fileio.h
-%{tde_includedir}/ksquirrel-libs/fmt_codec_base.h
-%{tde_includedir}/ksquirrel-libs/fmt_defs.h
-%{tde_includedir}/ksquirrel-libs/fmt_types.h
-%{tde_includedir}/ksquirrel-libs/fmt_utils.h
-%{tde_includedir}/ksquirrel-libs/settings.h
-%{tde_libdir}/ksquirrel-libs/libkls_avs.la
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.la
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so
-%{tde_libdir}/ksquirrel-libs/libkls_camera.la
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so
-%{tde_libdir}/ksquirrel-libs/libkls_cut.la
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so
-%{tde_libdir}/ksquirrel-libs/libkls_dds.la
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so
-%if 0%{?with_xmedcon}
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.la
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so
-%endif
-%if 0%{?with_djvu}
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_eps.la
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so
-%{tde_libdir}/ksquirrel-libs/libkls_fig.la
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so
-%{tde_libdir}/ksquirrel-libs/libkls_fli.la
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so
-%{tde_libdir}/ksquirrel-libs/libkls_gif.la
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.la
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so
-%{tde_libdir}/ksquirrel-libs/libkls_ico.la
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so
-%{tde_libdir}/ksquirrel-libs/libkls_iff.la
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.la
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.la
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.la
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so
-%{tde_libdir}/ksquirrel-libs/libkls_koala.la
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.la
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so
-%{tde_libdir}/ksquirrel-libs/libkls_lif.la
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.la
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so
-%{tde_libdir}/ksquirrel-libs/libkls_mac.la
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.la
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so
-%{tde_libdir}/ksquirrel-libs/libkls_mng.la
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.la
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so
-%{tde_libdir}/ksquirrel-libs/libkls_neo.la
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.la
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.la
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.la
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.la
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so
-%{tde_libdir}/ksquirrel-libs/libkls_pix.la
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so
-%{tde_libdir}/ksquirrel-libs/libkls_png.la
-%{tde_libdir}/ksquirrel-libs/libkls_png.so
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.la
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so
-%{tde_libdir}/ksquirrel-libs/libkls_psd.la
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so
-%{tde_libdir}/ksquirrel-libs/libkls_psp.la
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.la
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so
-%{tde_libdir}/ksquirrel-libs/libkls_ras.la
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.la
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so
-%{tde_libdir}/ksquirrel-libs/libkls_sct.la
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.la
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so
-%{tde_libdir}/ksquirrel-libs/libkls_sun.la
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so
-%if 0%{?with_svg}
-%{tde_libdir}/ksquirrel-libs/libkls_svg.la
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_tga.la
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.la
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so
-%if 0%{?with_freetype}
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.la
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_utah.la
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so
-%{tde_libdir}/ksquirrel-libs/libkls_wal.la
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.la
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.la
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.la
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.la
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.la
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so
-%{tde_libdir}/ksquirrel-libs/libkls_xim.la
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.la
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.la
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so
-%{tde_libdir}/libksquirrel-libs-png.la
-%{tde_libdir}/libksquirrel-libs-png.so
-%{tde_libdir}/libksquirrel-libs.la
-%{tde_libdir}/libksquirrel-libs.so
-%{tde_libdir}/pkgconfig/ksquirrellibs.pc
-%{tde_docdir}/ksquirrel-libs/
-
-%files tools
-%defattr(-,root,root,-)
-%{tde_bindir}/ksquirrel-libs-camera2ppm
-%{tde_bindir}/ksquirrel-libs-dcraw
-%if 0%{?with_xmedcon}
-%{tde_bindir}/ksquirrel-libs-dicom2png
-%endif
-%{tde_bindir}/ksquirrel-libs-fig2ppm
-%{tde_bindir}/ksquirrel-libs-iff2ppm
-%{tde_bindir}/ksquirrel-libs-leaf2ppm
-%{tde_bindir}/ksquirrel-libs-ljpeg2ppm
-%{tde_bindir}/ksquirrel-libs-ljpeg2ppm-s
-%{tde_bindir}/ksquirrel-libs-mac2ppm
-%{tde_bindir}/ksquirrel-libs-neo2ppm
-%{tde_bindir}/ksquirrel-libs-pi12ppm
-%{tde_bindir}/ksquirrel-libs-pi32ppm
-%if 0%{?with_svg}
-%{tde_bindir}/ksquirrel-libs-svg2png
-%endif
-%if 0%{?with_freetype}
-%{tde_bindir}/ksquirrel-libs-ttf2pnm
-%endif
-%{tde_bindir}/ksquirrel-libs-utah2ppm
-%{tde_bindir}/ksquirrel-libs-xcf2pnm
-%{tde_bindir}/ksquirrel-libs-xim2ppm
-
-
-%changelog
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
deleted file mode 100644
index 40177c2e2..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ori	2012-08-05 09:04:21.430039677 +0000
-+++ pykdeextensions/src/kdedistutils.py	2012-08-05 09:04:33.013847354 +0000
-@@ -820,7 +820,7 @@
-             linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
-             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
-             linklist.append("-lm")
--            linklist.append("-lstdc++")
-+#            linklist.append("-lstdc++")
-             linklist.append("-lc")
-             linklist.append(self.clib)
- 
-@@ -1734,7 +1734,7 @@
-             linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
-             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
-             linklist.append("-lm")
--            linklist.append("-lstdc++")
-+#            linklist.append("-lstdc++")
-             linklist.append("-lc")
-             linklist.append(self.clib)
- 
---- pykdeextensions/setup.py.ORI	2012-08-05 09:07:01.588332389 +0000
-+++ pykdeextensions/setup.py	2012-08-05 09:07:07.795225579 +0000
-@@ -223,7 +223,7 @@
-         linklist.extend(sysconfig.get_config_var("LIBS").split())
-         
-         linklist.append("-lm")
--        linklist.append("-lstdc++")
-+#        linklist.append("-lstdc++")
-         linklist.append("-lc")
-         linklist.append(self.clib)
- 
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
deleted file mode 100644
index 3b89e2422..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.libtool	2012-05-11 23:45:11.738618661 +0200
-+++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:46:11.469447204 +0200
-@@ -712,6 +712,7 @@
-             
-             # Build the 'stub' code.
-             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
-                                             "modulename": modulename,
-                                             "factoryfunction": factoryfunction,
-                                             "python_version": python_version}
-@@ -855,7 +856,7 @@
- #include <sip.h>
- 
- #define MODULE_DIR "%(moduledir)s"
--#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
- #define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
- #define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
- #define MODULE_NAME "%(modulename)s"
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
deleted file mode 100644
index 05ac80b79..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ORI	2012-08-27 22:10:18.873738368 +0200
-+++ pykdeextensions/src/kdedistutils.py	2012-08-27 22:10:50.234094262 +0200
-@@ -539,7 +539,7 @@
-                     canidatepaths.append(os.path.join(kdedir,"include"))
-                 canidatepaths.append(os.path.join(install.prefix,"include"))
-                 canidatepaths.append('/opt/trinity/include')
--                canidatepaths.append('/opt/kde/include')
-+                canidatepaths.append('/opt/trinity/include/kde')
-                 self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
-             if self.kde_inc_dir is None:
-                 raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
deleted file mode 100644
index b7db0c21c..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 32d597f993f2566f7bdfec8a29c916b4c9b1a803
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1339639807 -0500
-
-    Reverse an old Debian-specific patch that prevents building on
-    some 64-bit systems. Add text to help with basic debugging.
-
-diff --git a/setup.py b/setup.py
-index e51f0fa..e7ec147 100755
---- a/setup.py
-+++ b/setup.py
-@@ -135,7 +135,7 @@ class BuildLibpythonize(Command):
-                     if self.clib!=None:
-                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
-             if self.clib is None:
--                raise SystemExit, "Failed to find a suitable libgcc library"
-+                raise SystemExit, "setup.py: Failed to find a suitable libgcc library"
-             self.announce("Using %s for clib" % self.clib)
-     
-             # Make a list of places to look for python .so modules
-diff --git a/src/kdedistutils.py b/src/kdedistutils.py
-index b8b3743..b8e23f3 100644
---- a/src/kdedistutils.py
-+++ b/src/kdedistutils.py
-@@ -660,7 +660,7 @@ class BuildKControlModule(Command):
-                     if self.clib!=None:
-                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
-             if self.clib is None:
--                raise SystemExit, "Failed to find a suitable libgcc library"
-+                raise SystemExit, "kdedistutils.py (1): Failed to find a suitable libgcc library"
-             self.announce("Using %s for clib" % self.clib)
-     
-             # Make a list of places to look for python .so modules
-@@ -1591,7 +1591,7 @@ class BuildKioslave(Command):
-                     if self.clib!=None:
-                         self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
-             if self.clib is None:
--                raise SystemExit, "Failed to find a suitable libgcc library"
-+                raise SystemExit, "kdedistutils.py (2): Failed to find a suitable libgcc library"
-             self.announce("Using %s for clib" % self.clib)
-     
-             # Make a list of places to look for python .so modules
-@@ -2229,7 +2229,7 @@ def compile_qtdesigner(ui_files,
- 
- ###########################################################################
- def get_libdir_name():
--    #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
--    #    return 'lib64'
--    #else:
-+    if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
-+        return 'lib64'
-+    else:
-         return 'lib'
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
deleted file mode 100644
index 44c50bd06..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.libtool	2011-08-21 23:01:12.000000000 +0200
-+++ pykdeextensions/src/kdedistutils.py	2012-05-11 23:41:07.326232457 +0200
-@@ -790,6 +791,8 @@
-             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
-             # link_flags
-             cmdlist.append("-module")
-+            cmdlist.append("-avoid-version")
-+            cmdlist.append("-shared")
-             cmdlist.append("-export-dynamic")
-             # object
-             cmdlist.append(outputfile)
-@@ -1703,6 +1705,8 @@
-             cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
-             # link_flags
-             cmdlist.append("-module")
-+            cmdlist.append("-avoid-version")
-+            cmdlist.append("-shared")
-             cmdlist.append("-export-dynamic")
-             # object
-             cmdlist.append(outputfile)
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
deleted file mode 100644
index 2a1cfee6c..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule	2012-09-08 17:33:05.000000000 +0000
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-02 19:19:40.185384207 +0000
-@@ -712,6 +712,7 @@
-             
-             # Build the 'stub' code.
-             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
-                                             "modulename": modulename,
-                                             "factoryfunction": factoryfunction,
-                                             "python_version": python_version}
-@@ -854,6 +855,7 @@
- #include <sip.h>
- 
- #define MODULE_DIR "%(moduledir)s"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
- #define MODULE_NAME "%(modulename)s"
- #define FACTORY "%(factoryfunction)s"
- #define CPP_FACTORY %(factoryfunction)s
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
deleted file mode 100644
index 720b8bdc3..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- pykdeextensions-3.5.13.1/setup.py.libgcc	2012-09-08 11:59:03.000000000 +0200
-+++ pykdeextensions-3.5.13.1/setup.py	2012-10-06 12:52:03.768762713 +0200
-@@ -126,7 +126,7 @@
-                 
-             # Find the C library (libgcc, libgcc_s or some other variation).
-             if self.clib is None:
--                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ]
-+                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ]
-                 self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths)
-                 if self.clib!=None:
-                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.libgcc	2012-10-06 13:29:31.920413352 +0200
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-06 13:31:23.440538658 +0200
-@@ -564,6 +564,9 @@
-             # Qt inc dir
-             if self.qt_inc_dir is None:
-                 canidatepaths = []
-+                qtinc = os.getenv("QTINC")
-+                if qtinc != None:
-+                    canidatepaths.append(qtinc)
-                 qtdir = os.getenv("QTDIR")
-                 if qtdir != None:
-                     canidatepaths.append(os.path.join(qtdir,"include"))
-@@ -585,6 +588,9 @@
-             # Qt lib dir
-             if self.qt_lib_dir is None:
-                 canidatepaths = []
-+                qtlib = os.getenv("QTLIB")
-+                if qtlib != None:
-+                    canidatepaths.append(qtlib)
-                 qtdir = os.getenv("QTDIR")
-                 if qtdir != None:
-                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
-@@ -634,7 +640,7 @@
-                 
-             # Find the C library (libgcc, libgcc_s or some other variation).
-             if self.clib is None:
--                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
-+                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
-                 self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
-                 if self.clib!=None:
-                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
-@@ -1481,6 +1487,9 @@
-             # Qt inc dir
-             if self.qt_inc_dir is None:
-                 canidatepaths = []
-+                qtinc = os.getenv("QTINC")
-+                if qtinc != None:
-+                    canidatepaths.append(qtinc)
-                 qtdir = os.getenv("QTDIR")
-                 if qtdir != None:
-                     canidatepaths.append(os.path.join(qtdir,"include"))
-@@ -1501,6 +1510,9 @@
-             # Qt lib dir
-             if self.qt_lib_dir is None:
-                 canidatepaths = []
-+                qtlib = os.getenv("QTLIB")
-+                if qtlib != None:
-+                    canidatepaths.append(qtlib)
-                 qtdir = os.getenv("QTDIR")
-                 if qtdir != None:
-                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1.spec b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1.spec
deleted file mode 100644
index 377e55360..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1.spec
+++ /dev/null
@@ -1,212 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-
-Name:		trinity-pytdeextensions
-Summary:	Python packages to support TDE applications (scripts) [Trinity]
-Version:	0.4.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	pykdeextensions-3.5.13.1.tar.gz
-
-
-
-
-# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
-Patch2:		pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
-# [pykdeextensions] Fix include directory search location
-Patch5:		pykdeextensions-3.5.13-fix_include_dir.patch
-# [pykdeextensions] Fix 'libgcc' search location
-Patch6:		pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-arts-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python-trinity-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-%else
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires:	trinity-PyQt-devel
-%else
-BuildRequires:	PyQt-devel
-%endif
-%endif
-
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-Obsoletes:		trinity-pykdeextensions < %{version}-%{release}
-Provides:		trinity-pykdeextensions = %{version}-%{release}
-
-
-%description
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-
-%package -n trinity-libpythonize0
-Summary:		Python packages to support KDE applications (library) [Trinity]	
-Group:			Environment/Libraries
-
-%description -n trinity-libpythonize0
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize library files.
-
-
-%package -n trinity-libpythonize0-devel
-Summary:		Python packages to support KDE applications (development) [Trinity]
-Group:			Development/Libraries
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-%description -n trinity-libpythonize0-devel
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize development files.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n pykdeextensions-3.5.13.1
-%patch2 -p1 -b .extramodule
-%patch5 -p1 -b .incdir
-%patch6 -p1 -b .libgcc
-
-# Changes library directory to 'lib64'
-for f in src/*.py; do
-  %__sed -i "${f}" \
-    -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
-    -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \
-    -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
-    -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
-    -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-    -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \
-    -e 's|"/kde"|"/tde"|'
-done
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-export KDEDIR=%{tde_prefix}
-
-%__mkdir_p build
-./setup.py build_libpythonize
-
-%install
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-
-./setup.py install \
-	--root=%{buildroot} \
-	--prefix=%{tde_prefix} \
-	--install-clib=%{tde_libdir} \
-	--install-cheaders=%{tde_tdeincludedir}
-
-# Removes BUILDROOT directory reference in installed files
-for f in \
-	%{buildroot}%{tde_libdir}/libpythonize.la \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
-; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-:
-done
-
-# Moves PYTHON libraries to distribution directory
-%__mkdir_p %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
-
-# Removes useless files
-%__rm -rf %{?buildroot}%{tde_libdir}/*.a
-
-# Fix permissions on include files
-%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post -n trinity-libpythonize0
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0
-/sbin/ldconfig
-
-%post -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_datadir}/apps/pykdeextensions
-%{tde_tdedocdir}/HTML/en/pykdeextensions
-%{python_sitearch}/*
-
-%files -n trinity-libpythonize0
-%defattr(-,root,root,-)
-%{tde_libdir}/libpythonize.so.*
-
-%files -n trinity-libpythonize0-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libpythonize.la
-%{tde_libdir}/libpythonize.so
-
-
-%Changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
deleted file mode 100644
index e02d15f98..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule	2012-09-08 17:33:05.000000000 +0000
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-02 19:19:40.185384207 +0000
-@@ -712,6 +712,8 @@
-             
-             # Build the 'stub' code.
-             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
-+                                            "pyqt_dir": self.pyqt_dir,
-                                             "modulename": modulename,
-                                             "factoryfunction": factoryfunction,
-                                             "python_version": python_version}
-@@ -854,6 +856,8 @@
- #include <sip.h>
- 
- #define MODULE_DIR "%(moduledir)s"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
-+#define PYQT_DIR "%(pyqt_dir)s"
- #define MODULE_NAME "%(modulename)s"
- #define FACTORY "%(factoryfunction)s"
- #define CPP_FACTORY %(factoryfunction)s
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI	2013-04-07 17:54:28.531813437 +0200
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2013-04-07 17:56:15.510529614 +0200
-@@ -903,6 +906,18 @@
-     if(!pyize->appendToSysPath (path.latin1 ())) {
-         return report_error ("***Failed to set sys.path\n");
-     }
-+
-+    // Add the extra path to the python script to the interpreter search path.
-+    TQString extrapath = TQString(EXTRA_MODULE_DIR);
-+    if(!pyize->appendToSysPath (extrapath.latin1 ())) {
-+      return report_error ("***Failed to set extra sys.path\n");
-+    }
-+
-+    // Add the PYQT path to the python script to the interpreter search path.
-+    TQString pyqt_dir = TQString(PYQT_DIR);
-+    if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) {
-+      return report_error ("***Failed to set PYQT sys.path\n");
-+    }
-     
-     // Load the Python script.
-     PyObject *pyModule = pyize->importModule ((char *)script.latin1 ());
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch
deleted file mode 100644
index 2d6863f65..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ORI	2012-08-27 22:10:18.873738368 +0200
-+++ pykdeextensions/src/kdedistutils.py	2012-08-27 22:10:50.234094262 +0200
-@@ -539,7 +539,7 @@
-                     canidatepaths.append(os.path.join(kdedir,"include"))
-                 canidatepaths.append(os.path.join(install.prefix,"include"))
-                 canidatepaths.append('/opt/trinity/include')
--                canidatepaths.append('/opt/kde/include')
-+                canidatepaths.append('/opt/trinity/include/tde')
-                 self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
-             if self.kde_inc_dir is None:
-                 raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec
deleted file mode 100644
index d8c991ba1..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec
+++ /dev/null
@@ -1,215 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-
-Name:		trinity-pytdeextensions
-Summary:	Python packages to support TDE applications (scripts) [Trinity]
-Version:	0.4.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	pykdeextensions-3.5.13.tar.gz
-
-
-
-
-# [pykdeextensions] Fix KCM modules versioning [Bug #999]
-Patch1:		pykdeextensions-3.5.13-fix_libtool.patch
-# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
-Patch2:		pykdeextensions-3.5.13-fix_extra_module_dir.patch
-# [pykdeextensions] Reverse an old Debian-specific patch that prevents building on
-#    some 64-bit systems. Add text to help with basic debugging. [Commit #32d597f9]
-Patch3:		pykdeextensions-3.5.13-fix_libsuffix.patch
-# [pykdeextensions] Do not link with stdc++
-Patch4:		pykdeextensions-3.5.13-do_not_link_stdc++.patch
-# [pykdeextensions] Fix include directory search location
-Patch5:		pykdeextensions-3.5.13-fix_include_dir.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python-trinity-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-qt
-%else
-%if 0%{?rhel} == 5
-BuildRequires:	trinity-PyQt-devel
-%else
-BuildRequires:	PyQt-devel
-%endif
-%endif
-
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-Obsoletes:		trinity-pykdeextensions < %{version}-%{release}
-Provides:		trinity-pykdeextensions = %{version}-%{release}
-
-
-%description
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-
-%package -n trinity-libpythonize0
-Summary:		Python packages to support KDE applications (library) [Trinity]	
-Group:			Environment/Libraries
-
-%description -n trinity-libpythonize0
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize library files.
-
-
-%package -n trinity-libpythonize0-devel
-Summary:		Python packages to support KDE applications (development) [Trinity]
-Group:			Development/Libraries
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-%description -n trinity-libpythonize0-devel
-PyKDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize development files.
-
-
-%prep
-%setup -q -n libraries/pykdeextensions
-%patch1 -p1 -b .libtool
-%patch2 -p1 -b .extramodule
-%patch3 -p1 -b .libsuffix
-%patch4 -p1 -b .stdc++
-%patch5 -p1 -b .incdir
-
-# Changes library directory to 'lib64'
-for f in src/*.py; do
-  %__sed -i "${f}" \
-    -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
-    -e "s|/usr/lib/pyshared/python2.6|%{python_sitearch}|g" \
-    -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
-    -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
-    -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-done
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-./setup.py build_libpythonize
-
-%install
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-
-
-./setup.py install \
-	--root=%{buildroot} \
-	--prefix=%{tde_prefix} \
-	--install-clib=%{tde_libdir} \
-	--install-cheaders=%{tde_tdeincludedir}
-
-# Removes BUILDROOT directory reference in installed files
-for f in \
-	%{buildroot}%{tde_libdir}/libpythonize.la \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
-; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-:
-done
-
-# Moves PYTHON libraries to distribution directory
-%__mkdir_p %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
-
-# Removes useless files
-%__rm -rf %{?buildroot}%{tde_libdir}/*.a
-
-# Fix permissions on include files
-%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post -n trinity-libpythonize0
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0
-/sbin/ldconfig
-
-%post -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_datadir}/apps/pykdeextensions
-%{tde_tdedocdir}/HTML/en/pykdeextensions
-%{python_sitearch}/*
-
-%files -n trinity-libpythonize0
-%defattr(-,root,root,-)
-%{tde_libdir}/libpythonize.so.*
-
-%files -n trinity-libpythonize0-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libpythonize.la
-%{tde_libdir}/libpythonize.so
-
-
-%Changelog
-* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
-- Fix KCM modules versioning [Bug #999]
-- Fix hardcoded path to Guidance python libraries [Bug #999]
-
-* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
deleted file mode 100644
index 069af8cec..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
+++ /dev/null
@@ -1,225 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-pytdeextensions
-Summary:	Python packages to support TDE applications (scripts) [Trinity]
-Version:	0.4.0
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
-Patch2:		pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
-# [pykdeextensions] Fix include directory search location
-Patch5:		pykdeextensions-3.5.13.2-fix_include_dir.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# Python stuff
-BuildRequires:	python-qt3-devel
-BuildRequires:	trinity-python-trinity-devel
-
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-Obsoletes:		trinity-pykdeextensions < %{version}-%{release}
-Provides:		trinity-pykdeextensions = %{version}-%{release}
-
-
-%description
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of TDE applications.
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_datadir}/apps/pykdeextensions/
-%{tde_tdedocdir}/HTML/en/pykdeextensions/
-%{python_sitearch}/*
-
-##########
-
-%package -n trinity-libpythonize0
-Summary:		Python packages to support KDE applications (library) [Trinity]	
-Group:			Environment/Libraries
-
-%description -n trinity-libpythonize0
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize library files.
-
-%post -n trinity-libpythonize0
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0
-/sbin/ldconfig
-
-%files -n trinity-libpythonize0
-%defattr(-,root,root,-)
-%{tde_libdir}/libpythonize.so.*
-
-##########
-
-%package -n trinity-libpythonize0-devel
-Summary:		Python packages to support KDE applications (development) [Trinity]
-Group:			Development/Libraries
-Requires:		trinity-libpythonize0 = %{version}-%{release}
-
-%description -n trinity-libpythonize0-devel
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of TDE applications.
-
-This package contains the libpythonize development files.
-
-%post -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%files -n trinity-libpythonize0-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libpythonize.la
-%{tde_libdir}/libpythonize.so
-
-##########
-
-%package devel
-Summary:		Meta-package to install all pytdeextensions development files
-Group:			Development/Libraries
-Requires:		%{name}-devel = %{version}-%{release}
-Requires:		trinity-libpythonize0-devel = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch2 -p1 -b .extramodule
-%patch5 -p1 -b .incdir
-
-# Changes library directory to 'lib64'
-# Also other fixes for distributions ...
-for f in src/*.py; do
-  %__sed -i "${f}" \
-    -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
-    -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \
-    -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
-    -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
-    -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \
-    -e 's|"/kde"|"/tde"|'
-done
-
-# Do not look for 'libpython2.x.so' (from -devel) package.
-# Instead look for versioned runtime library.
-LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)"
-if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
-  %__sed -i "src/kdedistutils.py" \
-    -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
-fi
-
-# Set PyQt directory to actual directory
-%__sed -i "src/kdedistutils.py" \
-  -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/python-qt3'|g" \
-  -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/python-qt3\"|g"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-%__mkdir_p build
-./setup.py build_libpythonize
-
-%install
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-
-./setup.py install \
-	--root=%{buildroot} \
-	--prefix=%{tde_prefix} \
-	--install-clib=%{tde_libdir} \
-	--install-cheaders=%{tde_tdeincludedir} \
-   -v
-
-# Removes BUILDROOT directory reference in installed files
-for f in \
-	%{buildroot}%{tde_libdir}/libpythonize.la \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
-	%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
-; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-:
-done
-
-# Moves PYTHON libraries to distribution directory
-%__mkdir_p %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
-
-# Removes useless files
-%__rm -rf %{?buildroot}%{tde_libdir}/*.a
-
-# Fix permissions on include files
-%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 199c7e0ae..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- python-trinity/sip/kdecore/kaccel.sip.ORI	2012-05-01 23:10:27.686395190 +0200
-+++ python-trinity/sip/kdecore/kaccel.sip	2012-05-01 23:10:39.955113222 +0200
-@@ -35,7 +35,7 @@
-                          KAccel (QWidget* /TransferThis/, const char* = 0);
-                          KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
-     KAccelActions&       actions ();
--    bool                 isEnabled () const;
-+    bool                 isEnabled ();
-     void                 setEnabled (bool);
-     bool                 setAutoUpdate (bool);
- 
---- python-trinity/sip/kdecore/kaccelbase.sip.ORI	2012-05-01 23:13:58.455551130 +0200
-+++ python-trinity/sip/kdecore/kaccelbase.sip	2012-05-01 23:14:14.835174681 +0200
-@@ -48,7 +48,7 @@
-                          KAccelBase (int);
-     uint                 actionCount () const;
-     KAccelActions&       actions ();
--    bool                 isEnabled () const;
-+    bool                 isEnabled ();
-     KAccelAction*        actionPtr (const QString&);
-     KAccelAction*        actionPtr (const KKey&);
-     KAccelAction*        actionPtr (const KKeyServer::Key&);
---- python-trinity/sip/kdecore/kglobalaccel.sip.ORI	2012-05-01 23:19:11.934346517 +0200
-+++ python-trinity/sip/kdecore/kglobalaccel.sip	2012-05-01 23:19:18.755189755 +0200
-@@ -33,7 +33,7 @@
- 
- public:
-                          KGlobalAccel (QObject*, const char* = 0);
--    bool                 isEnabled () const;
-+    bool                 isEnabled ();
-     void                 setEnabled (bool);
-     KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
- 
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch
deleted file mode 100644
index 7769b4f27..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python-trinity/configure.py.ORI	2012-08-05 00:02:51.785715468 +0200
-+++ python-trinity/configure.py	2012-08-05 00:03:02.312464939 +0200
-@@ -513,7 +513,7 @@
-     
-     for file in dist:
-         if file.find ("andrake") > 0:
--            kde_sip_flags.remove ("ALL")
-+            kde_sip_flags.pop()
-             kde_sip_flags.append ("D_MANDRAKE")
- 
- def set_sip_flags():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
deleted file mode 100644
index 4ca22d637..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.py.ORI	2011-12-03 17:07:41.589390850 +0100
-+++ b/configure.py	2011-12-03 17:14:35.226888035 +0100
-@@ -786,7 +786,7 @@
-     sipconfig.ParentMakefile(
-         configuration = pyqtcfg,
-         subdirs = subdirs,
--        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
-+        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), opt_kdebasedir + "/bin")]
-     ).generate()
- 
- 
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch
deleted file mode 100644
index d48270692..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- python-trinity-3.5.13.1/configure.py.ORI	2012-10-02 19:01:51.164215802 +0000
-+++ python-trinity-3.5.13.1/configure.py	2012-10-02 19:02:06.842913909 +0000
-@@ -411,6 +411,7 @@
-     if not opt_kdeincdir:
-         incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
-         incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
-+        incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # TDE 3.5.13.1
-         opt_kdeincdir = search ("kapplication.h", incSearchPaths)
- 
- def check_kde_installation():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec
deleted file mode 100644
index 9e35b3833..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-
-Name:		python-trinity
-Summary:	Trinity bindings for Python [Trinity]
-Version:	3.16.3
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	python-trinity-3.5.13.1.tar.gz
-
-## RHEL/Fedora patches
-Patch1:		python-trinity-3.5.13-install_directories.patch
-# [python-trinity] Fix Mandrake detection function
-Patch3:		python-trinity-3.5.13-fix_mandrake_detection.patch
-# [python-trinity] Add 'include/tde' include directory
-Patch4:		python-trinity-3.5.13.1-add_include_directory.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-arts-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python
-
-%if 0%{?rhel} == 5
-# RHEL 5 comes with old version, so we brought ours ...
-BuildRequires:	trinity-sip-devel
-BuildRequires:	trinity-PyQt-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-BuildRequires:	python-qt
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	sip-devel
-BuildRequires:	PyQt-devel
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	python-sip-devel
-BuildRequires:	trinity-PyQt-devel
-%endif
-
-%description
-Python binding module that provides wide access to the Trinity API,
-also known as PyKDE. Using this, you'll get (for example) classes
-from kio, kjs, khtml and kprint.
-
-
-%package devel
-Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-Development .sip files with definitions of PyKDE classes. They
-are needed to build PyKDE, but also as building blocks of other
-packages based on them. 
-The package also contains kdepyuic, a wrapper script around PyQt's 
-user interface compiler.
-
-
-%package doc
-Summary:		Documentation and examples for PyKDE [Trinity]
-Group:			Development/Libraries
-
-%description doc
-General documentation and examples for PyKDE providing programming
-tips and working code you can use to learn from.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n python-trinity-3.5.13.1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-
-
-# Hack to get TQT include files under /opt
-%__sed -i "configure.py" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export LDFLAGS="${LDFLAGS} -lpython2.7"
-
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-%__python configure.py \
-	-k %{tde_prefix} \
-	-L %{_lib} \
-	-v %{_datadir}/sip/trinity
-
-# Shitty hack to add LDFLAGS
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i */Makefile \
-%if 0%{?pclinuxos}
-	-e "/^LIBS = / s|$| -lpython2.6 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%else
-	-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%endif
-%endif
-
-%__make %{_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Install documentation
-%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pykde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%Changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
deleted file mode 100644
index fb41680f1..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI	2014-03-22 23:47:29.217935267 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip	2014-03-22 23:47:53.355370778 +0100
-@@ -153,10 +153,8 @@
-     bool                 deleteGroup (const QString&, bool = 1, bool = 0);
-     void                 setDollarExpansion (bool = 1);
-     bool                 isDollarExpansion () const;
--    virtual void         rollback (bool = 1);
-     virtual void         sync ();
-     bool                 isDirty () const;
--    virtual void         setReadOnly (bool);
-     bool                 isReadOnly () const;
-     bool                 hasKey (const QString&) const;
-     virtual QMap<QString,QString> entryMap (const QString&) const = 0;
-@@ -182,6 +180,9 @@
-     bool                 hasDefault (const QString&) const;
- %End
- 
-+private:
-+    virtual void         rollback (bool = 1);
-+    virtual void         setReadOnly (bool);
- 
- protected:
-     void                 setLocale ();
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI	2014-03-22 23:56:28.448338190 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip	2014-03-22 23:58:44.540121011 +0100
-@@ -53,6 +53,8 @@
-     virtual void         keyPressEvent (QKeyEvent*);
- %End
- 
-+private:
-+    virtual void         setSource(const QString&);
- 
- };  // class KActiveLabel
- 
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI	2014-03-23 00:02:17.343077605 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip	2014-03-23 00:03:42.151069824 +0100
-@@ -54,6 +54,8 @@
- protected:
-     virtual KPopupMenu*  createPopupMenu ();
- 
-+private:
-+    virtual bool         eventFilter(QObject*, QEvent*);
- };  // class KPixmapRegionSelectorWidget
- 
- %End
---- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI	2014-03-23 00:13:21.583382771 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip	2014-03-23 00:17:02.715146838 +0100
-@@ -77,6 +77,8 @@
-     virtual void         addApplicationEvents (const QString&);
-     virtual void         clearApplicationEvents ();
- 
-+private slots:
-+    virtual void         slotDefault();
- };  // class KNotifyDialog
- 
- %End
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
deleted file mode 100644
index 5921695e8..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-python-trinity-3.5.13.2/configure.py.ORI	2013-01-20 14:28:38.844683333 +0100
-+++ trinity-python-trinity-3.5.13.2/configure.py	2013-01-20 14:29:05.179062079 +0100
-@@ -410,7 +410,7 @@
- 
-     if not opt_kdeincdir:
-         incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
--        incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
-+        incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # Red Hat
-         opt_kdeincdir = search ("kapplication.h", incSearchPaths)
- 
- def check_kde_installation():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
deleted file mode 100644
index 279346a1f..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-
-Name:		trinity-python-trinity
-Summary:	Trinity bindings for Python [Trinity]
-Version:	3.16.3
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-#URL:		http://www.simonzone.com/software/pykdeextensions
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# Fix include subdirectory 'tde' instead of 'kde'
-Patch1:		python-trinity-3.5.13.2-fix_tde_includedir.patch
-# Fix "is private" FTBFS using SIP >= 4.15
-Patch2:		python-trinity-3.5.13.2-fix_is_private.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# PYTHON support
-BuildRequires:	python
-BuildRequires:	python-qt3-devel
-
-# SIP support
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# RHEL 4/5 comes with old version, so we brought ours ...
-BuildRequires:	trinity-sip-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	sip-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	python-sip-devel
-%endif
-
-Obsoletes:	python-trinity < %{version}-%{release}
-Provides:	python-trinity = %{version}-%{release}
-
-%description
-Python binding module that provides wide access to the Trinity API,
-also known as PyTDE. Using this, you'll get (for example) classes
-from kio, kjs, khtml and kprint.
-
-
-%package devel
-Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-Obsoletes:	python-trinity-devel < %{version}-%{release}
-Provides:	python-trinity-devel = %{version}-%{release}
-
-%description devel
-Development .sip files with definitions of PyTDE classes. They
-are needed to build PyTDE, but also as building blocks of other
-packages based on them. 
-The package also contains kdepyuic, a wrapper script around python-qt3's 
-user interface compiler.
-
-
-%package doc
-Summary:		Documentation and examples for PyTDE [Trinity]
-Group:			Development/Libraries
-
-Obsoletes:	python-trinity-doc < %{version}-%{release}
-Provides:	python-trinity-doc = %{version}-%{release}
-
-%description doc
-General documentation and examples for PyTDE providing programming
-tips and working code you can use to learn from.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .private
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LD_RUN_PATH="%{tde_libdir}"
-export KDEDIR=%{tde_prefix}
-
-export DH_OPTIONS
-
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-%__python configure.py \
-	-k %{tde_prefix} \
-	-L %{_lib} \
-	-v %{_datadir}/sip/trinity
-
-# Shitty hack to add LDFLAGS
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i */Makefile \
-	-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%endif
-
-# Shitty hack to fix issue with SIP >= 4.15
-%__sed -i "kfile/sipkfilepart0.cpp" \
-  -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \
-  -e "s| KFileIconView::clear()| KFileView::clear()|g" \
-  -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \
-  -e "s| KFileDetailView::clear()| KFileView::clear()|g"
-  
-
-%__make %{_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Install documentation
-%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pykde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%changelog
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
deleted file mode 100644
index dfc5520f9..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-
-Name:		python-trinity
-Summary:	Trinity bindings for Python [Trinity]
-Version:	3.16.3
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	python-trinity-3.5.13.tar.gz
-
-## RHEL/Fedora patches
-Patch1:		python-trinity-3.5.13-install_directories.patch
-# [python-trinity] Fix compilation with GCC 4.7
-Patch2:		python-trinity-3.5.13-fix_gcc47_compilation.patch
-# [python-trinity] Fix Mandrake detection function
-Patch3:		python-trinity-3.5.13-fix_mandrake_detection.patch
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	python
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	python-sip
-BuildRequires:	python-qt
-%else
-%if 0%{?rhel} == 5
-# RHEL 5 comes with old version, so we brought ours ...
-BuildRequires:	trinity-sip-devel
-BuildRequires:	trinity-PyQt-devel
-%else
-BuildRequires:	sip-devel
-BuildRequires:	PyQt-devel
-%endif
-%endif
-
-%description
-Python binding module that provides wide access to the Trinity API,
-also known as PyKDE. Using this, you'll get (for example) classes
-from kio, kjs, khtml and kprint.
-
-
-%package devel
-Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-Development .sip files with definitions of PyKDE classes. They
-are needed to build PyKDE, but also as building blocks of other
-packages based on them. 
-The package also contains kdepyuic, a wrapper script around PyQt's 
-user interface compiler.
-
-
-%package doc
-Summary:		Documentation and examples for PyKDE [Trinity]
-Group:			Development/Libraries
-
-%description doc
-General documentation and examples for PyKDE providing programming
-tips and working code you can use to learn from.
-
-
-%prep
-%setup -q -n libraries/python-trinity
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-
-# Hack to get TQT include files under /opt
-%__sed -i "configure.py" \
-	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-export LDFLAGS="${LDFLAGS} -lpython2.7"
-
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-
-%__python configure.py \
-	-k %{tde_prefix} \
-	-L %{_lib} \
-	-v %{_datadir}/sip/trinity
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-# Shitty hack to add LDFLAGS
-%__sed -i */Makefile \
-	-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%endif
-
-%__make %{_smp_mflags}
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Install documentation
-%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pykde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
-- Rebuild for Fedora 17
-- Fix compilation with GCC 4.7
-- Fix compilation for RHEL 5
- 
-* Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec
deleted file mode 100644
index 2d7946091..000000000
--- a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec
+++ /dev/null
@@ -1,1492 +0,0 @@
-#
-# spec file for package tde-i18n (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 3.5.13.2
-%endif
-%define tde_pkg tde-i18n
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW
-%endif
-
-
-Name:			trinity-%{tde_pkg}
-Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-Summary:		Internationalization support for Trinity
-Group:			User Interface/Desktops
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:		noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	gcc-c++
-
-%description
-This package contains %{summary}.
-
-##########
-
-%package Afrikaans
-Summary:		Afrikaans(af) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-af = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Afrikaans < %{version}-%{release}
-Provides:		trinity-kde-i18n-Afrikaans = %{version}-%{release}
-
-%description Afrikaans
-This package contains %{summary}.
-
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/
-
-##########
-
-%package Arabic 
-Summary:		Arabic(ar) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ar = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{version}-%{release}
-
-%description Arabic
-This package contains %{summary}.
-
-%files Arabic 
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/
-
-##########
-
-%package Azerbaijani
-Summary:		Azerbaijani(az) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-az = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{version}-%{release}
-
-%description Azerbaijani
-This package contains %{summary}.
-
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/
-
-##########
-
-%package Belarusian
-Summary:		Belarusian(be) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-be = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Belarusian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Belarusian = %{version}-%{release}
-
-%description Belarusian
-This package contains %{summary}.
-
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/
-
-##########
-
-%package Bulgarian
-Summary:		Bulgarian(bg) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bg = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bulgarian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bulgarian = %{version}-%{release}
-
-%description Bulgarian
-This package contains %{summary}.
-
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/
-
-##########
-
-%package Bengali
-Summary:		Bengali(bn) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bengali < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bengali = %{version}-%{release}
-
-%description Bengali
-This package contains %{summary}.
-
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/
-
-##########
-
-%package Tibetan
-Summary:		Tibetan(bo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tibetan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tibetan = %{version}-%{release}
-
-%description Tibetan
-This package contains %{summary}.
-
-#%files Tibetan
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/bo/
-
-##########
-
-%package Breton
-Summary:		Breton(br) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-br = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Breton < %{version}-%{release}
-Provides:		trinity-kde-i18n-Breton = %{version}-%{release}
-
-%description Breton
-This package contains %{summary}.
-
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/
-
-##########
-
-%package Bosnian
-Summary:		Bosnian(bs) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bs = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bosnian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Bosnian = %{version}-%{release}
-
-%description Bosnian
-This package contains %{summary}.
-
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/
-
-##########
-
-%package Catalan
-Summary:		Catalan(ca) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ca = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Catalan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Catalan = %{version}-%{release}
-
-%description Catalan
-This package contains %{summary}.
-
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/
-%{tde_tdedocdir}/HTML/ca/
-
-##########
-
-%package Czech
-Summary:		Czech(cs) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-cs = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Czech < %{version}-%{release}
-Provides:		trinity-kde-i18n-Czech = %{version}-%{release}
-
-%description Czech
-This package contains %{summary}.
-
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/
-%{tde_tdedocdir}/HTML/cs/
-
-##########
-
-%package Kashubian
-Summary:		Kashubian(csb) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-csb = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kashubian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kashubian = %{version}-%{release}
-
-%description Kashubian
-This package contains %{summary}.
-
-%files Kashubian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/csb/
-
-##########
-
-%package Cymraeg
-Summary:		Cymraeg language support for TDE
-Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Cymraeg < %{version}-%{release}
-Provides:		trinity-kde-i18n-Cymraeg = %{version}-%{release}
-
-%description Cymraeg
-This package contains %{summary}.
-
-##########
-
-%package Welsh
-Summary:		Welsh(cy) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-cy = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Welsh < %{version}-%{release}
-Provides:		trinity-kde-i18n-Welsh = %{version}-%{release}
-
-%description Welsh
-This package contains %{summary}.
-
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/
-
-##########
-
-%package Danish
-Summary:		Danish(da) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-da = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Danish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Danish = %{version}-%{release}
-
-%description Danish
-This package contains %{summary}.
-
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/
-%{tde_tdedocdir}/HTML/da/
-
-##########
-
-%package German
-Summary:		German(de) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-de = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-German < %{version}-%{release}
-Provides:		trinity-kde-i18n-German = %{version}-%{release}
-
-%description German
-This package contains %{summary}.
-
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/
-%{tde_tdedocdir}/HTML/de/
-
-##########
-
-%package Greek
-Summary:		Greek(el) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-el = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Greek < %{version}-%{release}
-Provides:		trinity-kde-i18n-Greek = %{version}-%{release}
-
-%description Greek
-This package contains %{summary}.
-
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/
-
-##########
-
-%package British
-Summary:		British(en_GB) English support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-en_GB = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-British < %{version}-%{release}
-Provides:		trinity-kde-i18n-British = %{version}-%{release}
-
-%description British
-This package contains %{summary}.
-
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/
-%{tde_tdedocdir}/HTML/en_GB/
-
-##########
-
-%package Esperanto
-Summary:		Esperanto(eo) support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-eo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Esperanto < %{version}-%{release}
-Provides:		trinity-kde-i18n-Esperanto = %{version}-%{release}
-
-%description Esperanto
-This package contains %{summary}.
-
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/
-
-##########
-
-%package Spanish
-Summary:		Spanish(es) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-es = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Spanish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Spanish = %{version}-%{release}
-
-%description Spanish
-This package contains %{summary}.
-
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/
-%{tde_tdedocdir}/HTML/es/
-
-##########
-
-%package Estonian
-Summary:		Estonian(et) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-et = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Estonian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Estonian = %{version}-%{release}
-
-%description Estonian
-This package contains %{summary}.
-
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/
-%{tde_tdedocdir}/HTML/et/
-
-##########
-
-%package Basque
-Summary:		Basque(eu) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-eu = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Basque < %{version}-%{release}
-Provides:		trinity-kde-i18n-Basque = %{version}-%{release}
-
-%description Basque
-This package contains %{summary}.
-
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/
-%{tde_tdedocdir}/HTML/eu/
-
-##########
-
-%package Farsi
-Summary:		Farsi(fa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Farsi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Farsi = %{version}-%{release}
-
-%description Farsi
-This package contains %{summary}.
-
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/
-
-##########
-
-%package Finnish
-Summary:		Finnish(fi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Finnish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Finnish = %{version}-%{release}
-
-%description Finnish
-This package contains %{summary}.
-
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/
-%{tde_tdedocdir}/HTML/fi/
-
-##########
-
-%package Faroese
-Summary:		Faroese(fo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Faroese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Faroese = %{version}-%{release}
-
-%description Faroese
-This package contains %{summary}.
-
-#%files Faroese
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/fo/
-
-##########
-
-%package French
-Summary:		French(fr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-French < %{version}-%{release}
-Provides:		trinity-kde-i18n-French = %{version}-%{release}
-
-%description French
-This package contains %{summary}.
-
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/
-%{tde_tdedocdir}/HTML/fr/
-
-##########
-
-%package Frisian
-Summary:		Frisian(fy) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fy = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Frisian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Frisian = %{version}-%{release}
-
-%description Frisian
-This package contains %{summary}.
-
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/
-
-##########
-
-%package Irish
-Summary:		Irish(ga) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ga = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Irish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Irish = %{version}-%{release}
-
-%description Irish
-This package contains %{summary}.
-
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/
-
-##########
-
-%package Galician
-Summary:		Galician(gl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-gl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Galician < %{version}-%{release}
-Provides:		trinity-kde-i18n-Galician = %{version}-%{release}
-
-%description Galician
-This package contains %{summary}.
-
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/
-
-##########
-
-%package Hebrew
-Summary:		Hebrew(he) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-he = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hebrew < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hebrew = %{version}-%{release}
-
-%description Hebrew
-This package contains %{summary}.
-
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/
-%{tde_tdedocdir}/HTML/he/
-
-##########
-
-%package Hindi
-Summary:		Hindi(hi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hindi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hindi = %{version}-%{release}
-
-%description Hindi
-This package contains %{summary}.
-
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/
-
-##########
-
-%package Croatian
-Summary:		Croatian(hr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Croatian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Croatian = %{version}-%{release}
-
-%description Croatian
-This package contains %{summary}.
-
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/
-%{tde_tdedocdir}/HTML/hr/
-
-##########
-
-%package Hungarian
-Summary:		Hungarian(hu) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hu = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hungarian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Hungarian = %{version}-%{release}
-
-%description Hungarian
-This package contains %{summary}.
-
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/
-%{tde_tdedocdir}/HTML/hu/
-
-##########
-
-%package Indonesian
-Summary:		Indonesian(id) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-id = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Indonesian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Indonesian = %{version}-%{release}
-
-%description Indonesian
-This package contains %{summary}.
-
-#%files Indonesian
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/id/
-
-##########
-
-%package Icelandic
-Summary:		Icelandic(is) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-is = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Icelandic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Icelandic = %{version}-%{release}
-
-%description Icelandic
-This package contains %{summary}.
-
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/
-
-##########
-
-%package Italian
-Summary:		Italian(it) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-it = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Italian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Italian = %{version}-%{release}
-
-%description Italian
-This package contains %{summary}.
-
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/
-%{tde_tdedocdir}/HTML/it/
-
-##########
-
-%package Japanese
-Summary:		Japanese(ja) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ja = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Japanese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Japanese = %{version}-%{release}
-
-%description Japanese
-This package contains %{summary}.
-
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/
-%{tde_tdedocdir}/HTML/ja/
-
-##########
-
-%package Kazakh
-Summary:		Kazakh(kk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-kk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kazakh < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kazakh = %{version}-%{release}
-
-%description Kazakh
-This package contains %{summary}.
-
-%files Kazakh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/kk/
-
-##########
-
-%package Khmer
-Summary:		Khmer(km) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Khmer < %{version}-%{release}
-Provides:		trinity-kde-i18n-Khmer = %{version}-%{release}
-
-%description Khmer
-This package contains %{summary}.
-
-%files Khmer
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/km/
-
-##########
-
-%package Korean
-Summary:		Korean(ko) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Korean < %{version}-%{release}
-Provides:		trinity-kde-i18n-Korean = %{version}-%{release}
-
-%description Korean
-This package contains %{summary}.
-
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/
-%{tde_tdedocdir}/HTML/ko/
-
-##########
-
-%package Kurdish
-Summary:		Kurdish(ku) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ku = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kurdish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kurdish = %{version}-%{release}
-
-%description Kurdish
-This package contains %{summary}.
-
-#%files Kurdish
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/ku/
-
-##########
-
-%package Lao
-Summary:		Lao(lo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lo = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lao < %{version}-%{release}
-Provides:		trinity-kde-i18n-Lao = %{version}-%{release}
-
-%description Lao
-This package contains %{summary}.
-
-#%files Lao
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/lo/
-
-##########
-
-%package Lithuanian
-Summary:		Lithuanian(lt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lithuanian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Lithuanian = %{version}-%{release}
-
-%description Lithuanian
-This package contains %{summary}.
-
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/
-
-##########
-
-%package Latvian
-Summary:		Latvian(lv) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lv = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Latvian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Latvian = %{version}-%{release}
-
-%description Latvian
-This package contains %{summary}.
-
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv/
-
-##########
-
-%package Maori
-Summary:		Maori(mi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maori < %{version}-%{release}
-Provides:		trinity-kde-i18n-Maori = %{version}-%{release}
-
-%description Maori
-This package contains %{summary}.
-
-#%files Maori
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/mi/
-
-##########
-
-%package Macedonian
-Summary:		Macedonian(mk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Macedonian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Macedonian = %{version}-%{release}
-
-%description Macedonian
-This package contains %{summary}.
-
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/
-
-##########
-
-%package Mongolian
-Summary:		Mongolian(mn) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Mongolian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Mongolian = %{version}-%{release}
-
-%description Mongolian
-This package contains %{summary}.
-
-%files Mongolian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mn/
-
-##########
-
-%package Malay
-Summary:		Malay(ms) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ms = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Malay < %{version}-%{release}
-Provides:		trinity-kde-i18n-Malay = %{version}-%{release}
-
-%description Malay
-This package contains %{summary}.
-
-%files Malay
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ms/
-
-##########
-
-%package Maltese
-Summary:		Maltese(mt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maltese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Maltese = %{version}-%{release}
-
-%description Maltese
-This package contains %{summary}.
-
-#%files Maltese
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/mt/
-
-##########
-
-%package Low-Saxon
-Summary:		Low Saxon(nds) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nds = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Low-Saxon < %{version}-%{release}
-Provides:		trinity-kde-i18n-Low-Saxon = %{version}-%{release}
-
-%description Low-Saxon
-This package contains %{summary}.
-
-%files Low-Saxon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nds/
-
-##########
-
-%package Dutch
-Summary:		Dutch(nl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Dutch < %{version}-%{release}
-Provides:		trinity-kde-i18n-Dutch = %{version}-%{release}
-
-%description Dutch
-This package contains %{summary}.
-
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/
-%{tde_tdedocdir}/HTML/nl/
-
-##########
-
-%package Norwegian
-Summary:		Norwegian(no) (Bokmaal) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-no = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian = %{version}-%{release}
-
-%description Norwegian
-This package contains %{summary}.
-
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/
-
-##########
-
-%package Norwegian-Nynorsk
-Summary:		Norwegian(nn) (Nynorsk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nn = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
-
-%description Norwegian-Nynorsk
-This package contains %{summary}.
-
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/
-
-##########
-
-%package Occitan
-Summary:		Occitan(oc) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-oc = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Occitan < %{version}-%{release}
-Provides:		trinity-kde-i18n-Occitan = %{version}-%{release}
-
-%description Occitan
-This package contains %{summary}.
-
-#%files Occitan
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/oc/
-
-##########
-
-%package Polish
-Summary:		Polish(pl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Polish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Polish = %{version}-%{release}
-
-%description Polish
-This package contains %{summary}.
-
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/
-%{tde_tdedocdir}/HTML/pl/
-
-##########
-
-%package Portuguese
-Summary:		Portuguese(pt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pt = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Portuguese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Portuguese = %{version}-%{release}
-
-%description Portuguese
-This package contains %{summary}.
-
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/
-%{tde_tdedocdir}/HTML/pt/
-
-##########
-
-%package Punjabi
-Summary:		Punjabi(pa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Punjabi < %{version}-%{release}
-Provides:		trinity-kde-i18n-Punjabi = %{version}-%{release}
-
-%description Punjabi
-This package contains %{summary}.
-
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/
-
-##########
-
-%package Brazil
-Summary:		Brazil(pt_BR) Portuguese language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pt_BR = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Brazil < %{version}-%{release}
-Provides:		trinity-kde-i18n-Brazil = %{version}-%{release}
-
-%description Brazil
-This package contains %{summary}.
-
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/
-%{tde_tdedocdir}/HTML/pt_BR/
-
-##########
-
-%package Romanian
-Summary:		Romanian(ro) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ro = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Romanian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Romanian = %{version}-%{release}
-
-%description Romanian
-This package contains %{summary}.
-
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/
-%{tde_tdedocdir}/HTML/ro/
-
-##########
-
-%package Russian
-Summary:		Russian(ru) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ru = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Russian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Russian = %{version}-%{release}
-
-%description Russian
-This package contains %{summary}.
-
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/
-%{tde_tdedocdir}/HTML/ru/
-
-##########
-
-%package Kinyarwanda
-Summary:		Kinyarwanda(rw) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-rw = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kinyarwanda < %{version}-%{release}
-Provides:		trinity-kde-i18n-Kinyarwanda = %{version}-%{release}
-
-%description Kinyarwanda
-This package contains %{summary}.
-
-%files Kinyarwanda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/rw/
-
-##########
-
-%package Northern-Sami
-Summary:		Northern-Sami(se) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-se = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Northern-Sami < %{version}-%{release}
-Provides:		trinity-kde-i18n-Northern-Sami = %{version}-%{release}
-
-%description Northern-Sami
-This package contains %{summary}.
-
-%files Northern-Sami
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/se/
-
-##########
-
-%package Slovak
-Summary:		Slovak(sk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovak < %{version}-%{release}
-Provides:		trinity-kde-i18n-Slovak = %{version}-%{release}
-
-%description Slovak
-This package contains %{summary}.
-
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/
-%{tde_tdedocdir}/HTML/sk/
-
-##########
-
-%package Slovenian
-Summary:		Slovenian(sl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sl = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovenian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Slovenian = %{version}-%{release}
-
-%description Slovenian
-This package contains %{summary}.
-
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/
-%{tde_tdedocdir}/HTML/sl/
-
-##########
-
-%package Serbian
-Summary:		Serbian(sr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Serbian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian = %{version}-%{release}
-
-%description Serbian
-This package contains %{summary}.
-
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/
-%{tde_tdedocdir}/HTML/sr/
-
-##########
-
-%package Serbian-Latin
-Summary:		Serbian-Latin(sr@Latn) language support for TDE
-Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Serbian-Latin < %{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian-Latin = %{version}-%{release}
-
-%description Serbian-Latin
-This package contains %{summary}.
-
-%files Serbian-Latin
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr@Latn/
-
-##########
-
-%package South-Sudan
-Summary:		South-Sudan(ss) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ss = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-South-Sudan < %{version}-%{release}
-Provides:		trinity-kde-i18n-South-Sudan = %{version}-%{release}
-
-%description South-Sudan
-This package contains %{summary}.
-
-%files South-Sudan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ss/
-
-##########
-
-%package Swedish
-Summary:		Swedish(sv) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sv = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Swedish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Swedish = %{version}-%{release}
-
-%description Swedish
-This package contains %{summary}.
-
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/
-%{tde_tdedocdir}/HTML/sv/
-
-##########
-
-%package Tamil
-Summary:		Tamil(ta) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ta = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tamil < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tamil = %{version}-%{release}
-
-%description Tamil
-This package contains %{summary}.
-
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/
-
-##########
-
-%package Telugu
-Summary:		Telugu(te) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-te = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Telugu < %{version}-%{release}
-Provides:		trinity-kde-i18n-Telugu = %{version}-%{release}
-
-%description Telugu
-This package contains %{summary}.
-
-%files Telugu
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/te/
-
-##########
-
-%package Tajik
-Summary:		Tajik(tg) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tg = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tajik < %{version}-%{release}
-Provides:		trinity-kde-i18n-Tajik = %{version}-%{release}
-
-%description Tajik
-This package contains %{summary}.
-
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/
-
-##########
-
-%package Thai
-Summary:		Thai(th) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-th = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Thai < %{version}-%{release}
-Provides:		trinity-kde-i18n-Thai = %{version}-%{release}
-
-%description Thai
-This package contains %{summary}.
-
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/
-
-##########
-
-%package Turkish
-Summary:		Turkish(tr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tr = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Turkish < %{version}-%{release}
-Provides:		trinity-kde-i18n-Turkish = %{version}-%{release}
-
-%description Turkish
-This package contains %{summary}.
-
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/
-%{tde_tdedocdir}/HTML/tr/
-
-##########
-
-%package Ukrainian
-Summary:		Ukrainian(uk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uk = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Ukrainian < %{version}-%{release}
-Provides:		trinity-kde-i18n-Ukrainian = %{version}-%{release}
-
-%description Ukrainian
-This package contains %{summary}.
-
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/
-%{tde_datadir}/locale/uk/
-
-##########
-
-%package Uzbek
-Summary:		Uzbek(uz) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uz = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek < %{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek = %{version}-%{release}
-
-%description Uzbek
-This package contains %{summary}.
-
-%files Uzbek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uz/
-
-##########
-
-%package Uzbek-Cyrillic
-Summary:		Uzbek(uz@cyrillic) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uz@cyrillic = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release}
-
-%description Uzbek-Cyrillic
-This package contains %{summary}.
-
-%files Uzbek-Cyrillic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uz@cyrillic/
-
-##########
-
-%package Venda
-Summary:		Venda(ven) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ven = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Venda < %{version}-%{release}
-Provides:		trinity-kde-i18n-Venda = %{version}-%{release}
-
-%description Venda
-This package contains %{summary}.
-
-#%files Venda
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/ven/
-
-##########
-
-%package Vietnamese
-Summary:		Vietnamese(vi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-vi = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Vietnamese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Vietnamese = %{version}-%{release}
-
-%description Vietnamese
-This package contains %{summary}.
-
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/
-
-##########
-
-%package Walloon
-Summary:		Walloon(wa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-wa = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Walloon < %{version}-%{release}
-Provides:		trinity-kde-i18n-Walloon = %{version}-%{release}
-
-%description Walloon
-This package contains %{summary}.
-
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/
-
-##########
-
-%package Xhosa
-Summary:		Xhosa(xh) (a Bantu language) support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-xh = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Xhosa < %{version}-%{release}
-Provides:		trinity-kde-i18n-Xhosa = %{version}-%{release}
-
-%description Xhosa
-This package contains %{summary}.
-
-#%files Xhosa
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/xh/
-
-##########
-
-%package Chinese
-Summary:		Chinese(zh_CN) (Simplified Chinese) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-zh_CN = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese < %{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese = %{version}-%{release}
-
-%description Chinese
-This package contains %{summary}.
-
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/
-%{tde_tdedocdir}/HTML/zh_CN/
-
-##########
-
-%package Chinese-Big5
-Summary:		Chinese(zh_TW) (Big5) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tz_TW = %{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
-
-%description Chinese-Big5
-This package contains %{summary}.
-
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/
-%{tde_tdedocdir}/HTML/zh_TW/
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-. /etc/profile.d/qt3.sh
-export KDEDIR=%{tde_prefix}
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-(
-for l in %{TDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      (
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      ) &
-      sleep 3
-      popd
-    fi
-  done
-done
-) 2>&1 | tee /tmp/rpmbuild.$$
-
-if grep -q Error /tmp/rpmbuild.$$; then
-  echo Error while building. See '/tmp/rpmbuild.$$'
-  exit 1
-fi
-
-wait
-rm -f /tmp/rpmbuild.$$
-
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{TDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-# See http://fedoraproject.org/wiki/Languages (???)
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
-
-# Removes conflict with KDE4
-%if "%{?tde_prefix}" == "/usr"
-%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
-%endif
-
-# remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{tde_datadir}/apps"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
deleted file mode 100644
index 37aa24acf..000000000
--- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
+++ /dev/null
@@ -1,583 +0,0 @@
-#
-# spec file for package tdeaccessibility (version R14.0.0)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdeaccessibility
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-tdeaccessibility
-Summary:		Trinity Desktop Environment - Accessibility
-Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# AUDIOFILE support
-BuildRequires:	audiofile-devel
-
-# AKODE support
-%if 0%{?with_akode}
-BuildRequires: trinity-akode-devel
-%{?with_libmad:BuildRequires: trinity-akode-libmad}
-%endif
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# XCB support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
-BuildRequires:	libxcb-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}xcb-devel
-%endif
-%endif
-
-# XAU support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xau-devel
-%else
-BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXau-devel
-%endif
-
-Obsoletes:		trinity-kdeaccessibility < %{version}-%{release}
-Provides:		trinity-kdeaccessibility = %{version}-%{release}
-Obsoletes:		trinity-kdeaccessibility-libs < %{version}-%{release}
-Provides:		trinity-kdeaccessibility-libs = %{version}-%{release}
-
-Requires: trinity-tde-icons-mono = %{version}-%{release}
-Requires: trinity-kbstate = %{version}-%{release}
-Requires: trinity-kmag = %{version}-%{release}
-Requires: trinity-kmousetool = %{version}-%{release}
-Requires: trinity-kmouth = %{version}-%{release}
-Requires: trinity-ksayit = %{version}-%{release}
-Requires: trinity-kttsd = %{version}-%{release}
-Requires: trinity-kttsd-contrib-plugins = %{version}-%{release}
-
-%description
-Included with this package are:
-* kmag, a screen magnifier,
-* kmousetool, a program for people whom it hurts to click the mouse,
-* kmouth, program that allows people who have lost their voice
-  to let their computer speak for them.
-
-%files
-
-##########
-
-%package -n trinity-tde-icons-mono
-Summary:	A monochromatic icons theme for TDE
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kde-icons-mono < %{version}-%{release}
-Provides:	trinity-kde-icons-mono = %{version}-%{release}
-
-%description -n trinity-tde-icons-mono
-A monochromatic icon theme for TDE, designed for accessibility purposes.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-tde-icons-mono
-%defattr(-,root,root,-)
-%dir %{tde_datadir}/icons/mono
-%dir %{tde_datadir}/icons/mono/scalable
-%dir %{tde_datadir}/icons/mono/scalable/actions
-%dir %{tde_datadir}/icons/mono/scalable/apps
-%dir %{tde_datadir}/icons/mono/scalable/devices
-%dir %{tde_datadir}/icons/mono/scalable/filesystems
-%dir %{tde_datadir}/icons/mono/scalable/mimetypes
-%{tde_datadir}/icons/mono/index.theme
-%{tde_datadir}/icons/mono/scalable/*/*.svgz
-
-##########
-
-%package -n trinity-kbstate
-Summary:	A keyboard status applet for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kbstate
-A panel applet that displays the keyboard status.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kbstate
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kbstate_panelapplet.la
-%{tde_tdelibdir}/kbstate_panelapplet.so
-%{tde_datadir}/apps/kbstateapplet/
-%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
-
-##########
-
-%package -n trinity-kmag
-Summary:	A screen magnifier for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kmag
-TDE's screen magnifier tool.
-
-You can use KMagnifier to magnify a part of the screen just as you would use 
-a lens to magnify a newspaper fine-print or a photograph.  This application is
-useful for a variety of people: from researchers to artists to web-designers to
-people with low vision.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmag
-%defattr(-,root,root,-)
-%{tde_bindir}/kmag
-%{tde_tdeappdir}/kmag.desktop
-%{tde_datadir}/apps/kmag/
-%{tde_datadir}/icons/hicolor/*/apps/kmag.png
-%{tde_datadir}/icons/locolor/*/apps/kmag.png
-%{tde_tdedocdir}/HTML/en/kmag/
-
-%post -n trinity-kmag
-/sbin/ldconfig ||:
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmag
-/sbin/ldconfig ||:
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kmousetool
-Summary:	TDE mouse manipulation tool for the disabled
-Group:		System/GUI/Other
-
-%description -n trinity-kmousetool
-KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
-designed to help those with repetitive strain injuries, for whom pressing
-buttons hurts.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmousetool
-%defattr(-,root,root,-)
-%{tde_bindir}/kmousetool
-%{tde_tdeappdir}/kmousetool.desktop
-%{tde_datadir}/apps/kmousetool/
-%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
-%{tde_tdedocdir}/HTML/en/kmousetool/
-
-%post -n trinity-kmousetool
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmousetool
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kmouth
-Summary:	A type-and-say KDE frontend for speech synthesizers
-Group:		System/GUI/Other
-
-%description -n trinity-kmouth
-KDE's type-and-say frontend for speech synthesizers.
-
-It includes a history of spoken sentences from which the user can select
-sentences to be re-spoken.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmouth
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kmouthrc
-%{tde_bindir}/kmouth
-%{tde_tdeappdir}/kmouth.desktop
-%{tde_datadir}/apps/kmouth/
-%{tde_datadir}/icons/hicolor/*/actions/speak.png
-%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
-%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
-%{tde_datadir}/icons/locolor/*/actions/speak.png
-%{tde_datadir}/icons/locolor/*/apps/kmouth.png
-%{tde_tdedocdir}/HTML/en/kmouth/
-
-%post -n trinity-kmouth
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmouth
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-ksayit
-Summary:	A frontend for the TDE Text-to-Speech system
-Group:		System/GUI/Other
-
-%description -n trinity-ksayit
-Text-to-speech front-end to kttsd.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-ksayit
-%defattr(-,root,root,-)
-%{tde_bindir}/ksayit
-%{tde_tdelibdir}/libFreeverb_plugin.la
-%{tde_tdelibdir}/libFreeverb_plugin.so
-%{tde_libdir}/libKTTSD_Lib.so.*
-%{tde_tdeappdir}/ksayit.desktop
-%{tde_datadir}/apps/ksayit/
-%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
-%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
-%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
-%{tde_datadir}/services/ksayit_libFreeverb.desktop
-%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
-
-%post -n trinity-ksayit
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksayit
-/sbin/ldconfig ||:
-for icon_theme in mono hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kttsd
-Summary:	A Text-to-Speech system for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kttsd
-The KDE Text-to-Speech system is a plugin based service that allows any KDE
-(or non-KDE) application to speak using the DCOP interface.
-
-ksayit and kmouth are useful front-ends for this capability, while one of
-festival, flite, and epos are essential back-ends.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-Homepage: http://accessibility.kde.org/developer/kttsd
-
-%files -n trinity-kttsd
-%defattr(-,root,root,-)
-%{tde_bindir}/kttsd
-%{tde_bindir}/kttsmgr
-%{tde_tdelibdir}/kcm_kttsd.la
-%{tde_tdelibdir}/kcm_kttsd.so
-%{tde_tdelibdir}/ktexteditor_kttsd.la
-%{tde_tdelibdir}/ktexteditor_kttsd.so
-%if 0%{?with_akode}
-%{tde_tdelibdir}/libkttsd_akodeplugin.la
-%{tde_tdelibdir}/libkttsd_akodeplugin.so
-%endif
-%{tde_tdelibdir}/libkttsd_alsaplugin.la
-%{tde_tdelibdir}/libkttsd_alsaplugin.so
-%{tde_tdelibdir}/libkttsd_artsplugin.la
-%{tde_tdelibdir}/libkttsd_artsplugin.so
-%{tde_tdelibdir}/libkttsd_commandplugin.la
-%{tde_tdelibdir}/libkttsd_commandplugin.so
-%{tde_tdelibdir}/libkttsd_eposplugin.la
-%{tde_tdelibdir}/libkttsd_eposplugin.so
-%{tde_tdelibdir}/libkttsd_festivalintplugin.la
-%{tde_tdelibdir}/libkttsd_festivalintplugin.so
-%{tde_tdelibdir}/libkttsd_fliteplugin.la
-%{tde_tdelibdir}/libkttsd_fliteplugin.so
-%{tde_tdelibdir}/libkttsd_sbdplugin.la
-%{tde_tdelibdir}/libkttsd_sbdplugin.so
-%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
-%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
-%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
-%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
-%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
-%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
-%{tde_tdelibdir}/libkttsjobmgrpart.la
-%{tde_tdelibdir}/libkttsjobmgrpart.so
-%{tde_libdir}/libkttsd.so.*
-%{tde_tdeappdir}/kcmkttsd.desktop
-%{tde_tdeappdir}/kttsmgr.desktop
-%{tde_datadir}/apps/ktexteditor_kttsd/
-%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
-%{tde_datadir}/apps/kttsd/
-%{tde_datadir}/icons/hicolor/16x16/actions/female.png
-%{tde_datadir}/icons/hicolor/16x16/actions/male.png
-%{tde_datadir}/icons/hicolor/*/apps/kttsd.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png
-%{tde_datadir}/services/ktexteditor_kttsd.desktop
-%{tde_datadir}/services/kttsd.desktop
-%if 0%{?with_akode}
-%{tde_datadir}/services/kttsd_akodeplugin.desktop
-%endif
-%{tde_datadir}/services/kttsd_alsaplugin.desktop
-%{tde_datadir}/services/kttsd_artsplugin.desktop
-%{tde_datadir}/services/kttsd_commandplugin.desktop
-%{tde_datadir}/services/kttsd_eposplugin.desktop
-%{tde_datadir}/services/kttsd_festivalintplugin.desktop
-%{tde_datadir}/services/kttsd_fliteplugin.desktop
-%{tde_datadir}/services/kttsd_sbdplugin.desktop
-%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
-%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
-%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
-%{tde_datadir}/services/kttsjobmgr.desktop
-%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
-%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
-%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-%{tde_tdedocdir}/HTML/en/kttsd/
-
-%post -n trinity-kttsd
-/sbin/ldconfig ||:
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kttsd
-/sbin/ldconfig ||:
-for icon_theme in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kttsd-contrib-plugins
-Summary:	The TDE Text-to-Speech system
-Group:		System/GUI/Other
-Requires:	trinity-kttsd = %{version}-%{release}
-
-%description -n trinity-kttsd-contrib-plugins
-kttsd synthetizer plugins that depends on non-free software :
-* FreeTTS plugin.
-* Hadifix (mbrola/txt2pho) plugin.
-Those plugins will require manual installation of third party,
-non free software to work.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kttsd-contrib-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkttsd_freettsplugin.la
-%{tde_tdelibdir}/libkttsd_freettsplugin.so
-%{tde_tdelibdir}/libkttsd_hadifixplugin.la
-%{tde_tdelibdir}/libkttsd_hadifixplugin.so
-%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
-%{tde_datadir}/services/kttsd_freettsplugin.desktop
-%{tde_datadir}/services/kttsd_hadifixplugin.desktop
-
-##########
-
-%package devel
-Summary:	Development files for tdeaccessibility
-Group:		Development/Libraries/X11
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-Requires:	libjpeg-devel
-Requires:	libpng-devel
-
-Obsoletes:		trinity-kdeaccessibility-devel < %{version}-%{release}
-Provides:		trinity-kdeaccessibility-devel = %{version}-%{release}
-
-%description devel
-This package contains the development file for TDE accessibility 
-programs.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkttsd.la
-%{tde_libdir}/libkttsd.so
-%{tde_libdir}/libKTTSD_Lib.la
-%{tde_libdir}/libKTTSD_Lib.so
-%{tde_tdeincludedir}/ksayit_fxplugin.h
-
-%post devel
-/sbin/ldconfig ||:
-
-%postun devel
-/sbin/ldconfig ||:
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Update icons for some control center modules
-%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Avoids conflict with KDE4, if installed
-# see file: '/etc/profile.d/kde.sh' from package 'kde-settings'
-export KDEDIRS=%{tde_prefix}
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --enable-ksayit-audio-plugins \
-  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
-  
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Move desktop files to correct XDG location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kttsd.png    ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
-popd
-
-# Avoid conflict with tdelibs
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kmag         Utility Accessibility
-%suse_update_desktop_file    kmousetool   Utility Accessibility
-%suse_update_desktop_file    kmouth       Utility Accessibility
-%suse_update_desktop_file    kttsmgr      Utility Accessibility
-%suse_update_desktop_file    ksayit       Utility Accessibility
-%suse_update_desktop_file    kcmkttsd     Utility Accessibility
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec
deleted file mode 100644
index ea4c3ccfa..000000000
--- a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec
+++ /dev/null
@@ -1,735 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdeaddons
-Summary:	Trinity Desktop Environment - Plugins
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:	GPLv2
-Group:		User Interface/Desktops
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Obsoletes:	trinity-kdeaddons < %{version}-%{release}
-Provides:	trinity-kdeaddons = %{version}-%{release}
-Obsoletes:	trinity-kdeaddons-extras < %{version}-%{release}
-Provides:	trinity-kdeaddons-extras = %{version}-%{release}
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: qt3-devel >= 3.3.8d
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdegames-devel >= %{tde_version}
-BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires: trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: openssl-devel
-
-# DB4/DB5 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	db4-devel
-%else
-BuildRequires:	db5-devel
-%endif
-%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:	libdb-devel
-BuildRequires:	libdb-cxx-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libdb-4_8-devel
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires:	db4-devel
-%endif
-%endif
-
-# XMMS support: no, always disabled, even on Fedora
-#%if 0%{?fedora}
-#define with_xmms 1
-#BuildRequires:	xmms-devel
-#%endif
-
-Requires: trinity-atlantikdesigner = %{version}-%{release}
-Requires: trinity-kaddressbook-plugins = %{version}-%{release}
-Requires: trinity-kate-plugins = %{version}-%{release}
-Requires: trinity-tdeaddons-tdefile-plugins = %{version}-%{release}
-Requires: trinity-kicker-applets = %{version}-%{release}
-Requires: trinity-knewsticker-scripts = %{version}-%{release}
-Requires: trinity-konq-plugins = %{version}-%{release}
-Requires: trinity-ksig = %{version}-%{release}
-Requires: trinity-noatun-plugins = %{version}-%{release}
-
-
-%description
-A collection of TDE Addons/Plugins, including: 
-* atlantikdesigner: game board designer
-* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
-* kate (plugins) 
-* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
-* knewsticker-scripts
-* noatun-plugins
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-atlantikdesigner
-Summary:	Game board designer for Atlantik
-Group:		Applications/Games
-#Requires:	trinity-atlantik
-Requires:	trinity-tdegames
-
-%description -n trinity-atlantikdesigner
-Atlantik Designer is a game board designer for the game Atlantik.
-
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-
-%files -n trinity-atlantikdesigner
-%defattr(-,root,root,-)
-%doc README atlantikdesigner/TODO
-%{tde_bindir}/atlantikdesigner
-%{tde_datadir}/apps/atlantikdesigner
-%{tde_tdeappdir}/atlantikdesigner.desktop
-%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
-
-%post -n trinity-atlantikdesigner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantikdesigner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaddressbook-plugins
-Summary:	Plugins for KAddressBook, the Trinity address book
-Group:		Applications/Utilities
-Requires:	trinity-kaddressbook
-
-%description -n trinity-kaddressbook-plugins
-This package contains a variety of useful plugins for the KDE address
-book.  These plugins can be loaded through the TDE address book settings.
-
-Highlights include exporting postal addresses as flags in KWorldClock,
-as well as importing and exporting contacts in the native format used
-by the German freemail provider GMX.
-
-%files -n trinity-kaddressbook-plugins
-%defattr(-,root,root,-)
-%doc README
-%{tde_tdelibdir}/libkaddrbk_geo_xxport.la
-%{tde_tdelibdir}/libkaddrbk_geo_xxport.so
-%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
-%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/services/kaddressbook
-
-##########
-
-%package -n trinity-kate-plugins
-Summary:	Plugins for Kate, the TDE Advanced Text Editor
-Group:		Applications/Utilities
-Requires:	trinity-kate
-Requires:	tidy
-
-%description -n trinity-kate-plugins
-This package contains a variety of useful plugins for Kate, the KDE
-Advanced Text Editor.  These plugins can be loaded through the plugin
-manager in Kate settings.
-
-Highlights include spell checking, text filtering, HTML/XML construction
-and validation, vim/emacs modeline handling, templates for new files
-and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
-a tab bar, a Python browser and even more.
-
-%files -n trinity-kate-plugins
-%defattr(-,root,root,-)
-%doc kate/xmltools/ChangeLog kate/xmltools/README
-%{tde_tdelibdir}/katecppsymbolviewerplugin.la
-%{tde_tdelibdir}/katecppsymbolviewerplugin.so
-%{tde_tdelibdir}/katefiletemplates.la
-%{tde_tdelibdir}/katefiletemplates.so
-%{tde_tdelibdir}/katefll_plugin.la
-%{tde_tdelibdir}/katefll_plugin.so
-%{tde_tdelibdir}/katehelloworldplugin.la
-%{tde_tdelibdir}/katehelloworldplugin.so
-%{tde_tdelibdir}/katehtmltoolsplugin.la
-%{tde_tdelibdir}/katehtmltoolsplugin.so
-%{tde_tdelibdir}/kateinsertcommandplugin.la
-%{tde_tdelibdir}/kateinsertcommandplugin.so
-%{tde_tdelibdir}/katemakeplugin.la
-%{tde_tdelibdir}/katemakeplugin.so
-%{tde_tdelibdir}/katemodelineplugin.la
-%{tde_tdelibdir}/katemodelineplugin.so
-%{tde_tdelibdir}/kateopenheaderplugin.la
-%{tde_tdelibdir}/kateopenheaderplugin.so
-%{tde_tdelibdir}/katepybrowseplugin.la
-%{tde_tdelibdir}/katepybrowseplugin.so
-%{tde_tdelibdir}/katesnippetsplugin.la
-%{tde_tdelibdir}/katesnippetsplugin.so
-%{tde_tdelibdir}/katetextfilterplugin.la
-%{tde_tdelibdir}/katetextfilterplugin.so
-%{tde_tdelibdir}/katexmlcheckplugin.la
-%{tde_tdelibdir}/katexmlcheckplugin.so
-%{tde_tdelibdir}/katexmltoolsplugin.la
-%{tde_tdelibdir}/katexmltoolsplugin.so
-%{tde_tdelibdir}/libkatetabbarextensionplugin.la
-%{tde_tdelibdir}/libkatetabbarextensionplugin.so
-%{tde_datadir}/applnk/.hidden/katefll.desktop
-%{tde_datadir}/apps/kate
-%{tde_datadir}/apps/katepart
-%{tde_datadir}/apps/katexmltools
-%{tde_datadir}/services/katecppsymbolviewer.desktop
-%{tde_datadir}/services/katefiletemplates.desktop
-%{tde_datadir}/services/katefll_plugin.desktop
-%{tde_datadir}/services/katehelloworld.desktop
-%{tde_datadir}/services/katehtmltools.desktop
-%{tde_datadir}/services/kateinsertcommand.desktop
-%{tde_datadir}/services/katemake.desktop
-%{tde_datadir}/services/katemodeline.desktop
-%{tde_datadir}/services/kateopenheader.desktop
-%{tde_datadir}/services/katepybrowse.desktop
-%{tde_datadir}/services/katesnippets.desktop
-%{tde_datadir}/services/katetabbarextension.desktop
-%{tde_datadir}/services/katetextfilter.desktop
-%{tde_datadir}/services/katexmlcheck.desktop
-%{tde_datadir}/services/katexmltools.desktop
-%{tde_tdedocdir}/HTML/en/kate-plugins/
-
-##########
-
-%package tdefile-plugins
-Summary:	Trinity file dialog plugins for text files and folders
-Group:		Applications/Utilities
-
-Obsoletes:	trinity-tdeaddons-kfile-plugins < %{version}-%{release}
-Provides:	trinity-tdeaddons-kfile-plugins = %{version}-%{release}
-
-%description tdefile-plugins
-This is a collection of plugins for the TDE file dialog.  These plugins
-extend the file dialog to offer advanced meta-information for text,
-HTML and desktop files, as well as for folders, Windows .lnk files,
-MIME archives and X.509 certificates.
-
-This package also includes plugins for the KDE file rename dialog,
-allowing a user to more easily decide what to do when faced with a
-decision regarding conflicting filenames.  Rename dialog plugins are
-provided for audio and image files.
-
-%files tdefile-plugins
-%defattr(-,root,root,-)
-%doc kfile-plugins/lnk/README
-%{tde_bindir}/lnkforward
-%{tde_tdelibdir}/kfile_cert.la
-%{tde_tdelibdir}/kfile_cert.so
-%{tde_tdelibdir}/kfile_desktop.la
-%{tde_tdelibdir}/kfile_desktop.so
-%{tde_tdelibdir}/kfile_folder.la
-%{tde_tdelibdir}/kfile_folder.so
-%{tde_tdelibdir}/kfile_html.la
-%{tde_tdelibdir}/kfile_html.so
-%{tde_tdelibdir}/kfile_lnk.la
-%{tde_tdelibdir}/kfile_lnk.so
-%{tde_tdelibdir}/kfile_mhtml.la
-%{tde_tdelibdir}/kfile_mhtml.so
-%{tde_tdelibdir}/kfile_txt.la
-%{tde_tdelibdir}/kfile_txt.so
-%{tde_tdelibdir}/librenaudioplugin.la
-%{tde_tdelibdir}/librenaudioplugin.so
-%{tde_tdelibdir}/librenimageplugin.la
-%{tde_tdelibdir}/librenimageplugin.so
-%{tde_datadir}/applnk/.hidden/lnkforward.desktop
-%{tde_datadir}/mimelnk/application/x-win-lnk.desktop
-%{tde_datadir}/services/kfile_cert.desktop
-%{tde_datadir}/services/kfile_desktop.desktop
-%{tde_datadir}/services/kfile_folder.desktop
-%{tde_datadir}/services/kfile_html.desktop
-%{tde_datadir}/services/kfile_lnk.desktop
-%{tde_datadir}/services/kfile_mhtml.desktop
-%{tde_datadir}/services/kfile_txt.desktop
-%{tde_datadir}/services/renaudiodlg.desktop
-%{tde_datadir}/services/renimagedlg.desktop
-
-##########
-
-%package -n trinity-kicker-applets
-Summary:	Applets for Kicker, the Trinity panel
-Group:		Applications/Utilities
-Requires:	trinity-kicker
-
-%description -n trinity-kicker-applets
-This package contains a variety of applets for Kicker, the KDE panel.
-These applets will appear in the panel's Add--Applet menu.
-
-Included are a system monitor, a colour picker, a media player controller,
-a mathematical evaluator and a binary clock.
-
-The media control applet does not support XMMS, as this would force all
-kicker-applets users to install XMMS. If you want a kicker applet that
-controls XMMS, install the xmms-kde-trinity package.
-
-%files -n trinity-kicker-applets
-%defattr(-,root,root,-)
-%doc README 
-%{tde_tdelibdir}/kolourpicker_panelapplet.la
-%{tde_tdelibdir}/kolourpicker_panelapplet.so
-%{tde_tdelibdir}/ktimemon_panelapplet.la
-%{tde_tdelibdir}/ktimemon_panelapplet.so
-%{tde_tdelibdir}/math_panelapplet.la
-%{tde_tdelibdir}/math_panelapplet.so
-%{tde_tdelibdir}/mediacontrol_panelapplet.la
-%{tde_tdelibdir}/mediacontrol_panelapplet.so
-%{tde_tdelibdir}/kbinaryclock_panelapplet.la
-%{tde_tdelibdir}/kbinaryclock_panelapplet.so
-%{tde_datadir}/apps/kicker/applets
-%{tde_datadir}/apps/mediacontrol
-%{tde_datadir}/config.kcfg/kbinaryclock.kcfg
-%{tde_datadir}/icons/locolor/*/apps/ktimemon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
-%{tde_tdedocdir}/HTML/en/kicker-applets/
-
-%post -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kicker-applets
-for f in crystalsvg locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-knewsticker-scripts
-Summary: scripts for KNewsTicker, the Trinity news ticker
-Group:		Applications/Utilities
-Requires:	perl
-Requires:	python
-#Requires:	libfinance-quote-perl
-#Requires:	libmime-perl
-#Requires:	libnews-nntpclient-perl
-Requires:	perl-libwww-perl
-Requires:	trinity-knewsticker
-
-%description -n trinity-knewsticker-scripts
-This package contains a variety of scripts that provide additional news
-sources for KNewsTicker, the news ticker applet for the TDE panel.
-
-Highlights include newsgroup handling, stock data retrieval, sports scores
-and various local news sources.
-
-%files -n trinity-knewsticker-scripts
-%defattr(-,root,root,-)
-%doc README
-%{tde_datadir}/apps/knewsticker/
-
-##########
-
-%package -n trinity-konq-plugins
-Summary:	plugins for Konqueror, the Trinity file/web/doc browser
-Group:		Applications/Utilities
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-Requires:	%{_lib}jpeg8
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	libjpeg
-%endif
-%if 0%{?suse_version} == 1220
-Requires:	libjpeg62
-%endif
-%if 0%{?pclinuxos}
-Requires:	%{_lib}jpeg62
-%endif
-%if 0%{?suse_version} == 1230
-Requires:	libjpeg8
-%endif
-Requires:	python
-Requires:	rsync
-#Requires:	unison
-Requires:	trinity-konqueror
-%if 0%{?fedora}
-Requires:	python-exif
-%endif
-
-%description -n trinity-konq-plugins
-This package contains a variety of useful plugins for Konqueror, the
-file manager, web browser and document viewer for TDE.  Many of these
-plugins will appear in Konqueror's Tools menu.
-
-Highlights for web browsing include web page translation, web page archiving,
-auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
-sidebar news ticker, fast access to common options, bookmarklets, a crash
-monitor, a microformat availability indicator, a del.icio.us bookmarks
-sidebar, and integration with the aKregator RSS feed reader.
-
-Highlights for directory browsing include directory filters, image gallery
-creation, archive compression and extraction, quick copy/move, a sidebar
-media player, a file information metabar/sidebar, a media folder helper, a
-graphical disk usage viewer and image conversions and transformations.
-
-%files -n trinity-konq-plugins
-%defattr(-,root,root,-)
-%doc konq-plugins/README
-%{tde_datadir}/config/translaterc
-%{tde_bindir}/fsview
-%{tde_bindir}/jpegorient
-%{tde_bindir}/kio_media_realfolder
-%{tde_tdelibdir}/konq_sidebarnews.la
-%{tde_tdelibdir}/konq_sidebarnews.so
-%{tde_tdelibdir}/konqsidebar_delicious.la
-%{tde_tdelibdir}/konqsidebar_delicious.so
-%{tde_tdelibdir}/konqsidebar_mediaplayer.la
-%{tde_tdelibdir}/konqsidebar_mediaplayer.so
-%{tde_tdelibdir}/konqsidebar_metabar.la
-%{tde_tdelibdir}/konqsidebar_metabar.so
-%{tde_tdelibdir}/libakregatorkonqfeedicon.la
-%{tde_tdelibdir}/libakregatorkonqfeedicon.so
-%{tde_tdelibdir}/libakregatorkonqplugin.la
-%{tde_tdelibdir}/libakregatorkonqplugin.so
-%{tde_tdelibdir}/libarkplugin.la
-%{tde_tdelibdir}/libarkplugin.so
-%{tde_tdelibdir}/libautorefresh.la
-%{tde_tdelibdir}/libautorefresh.so
-%{tde_tdelibdir}/libbabelfishplugin.la
-%{tde_tdelibdir}/libbabelfishplugin.so
-%{tde_tdelibdir}/libcrashesplugin.la
-%{tde_tdelibdir}/libcrashesplugin.so
-%{tde_tdelibdir}/libdirfilterplugin.la
-%{tde_tdelibdir}/libdirfilterplugin.so
-%{tde_tdelibdir}/librsyncplugin.la
-%{tde_tdelibdir}/librsyncplugin.so
-%{tde_tdelibdir}/libdomtreeviewerplugin.la
-%{tde_tdelibdir}/libdomtreeviewerplugin.so
-%{tde_tdelibdir}/libfsviewpart.la
-%{tde_tdelibdir}/libfsviewpart.so
-%{tde_tdelibdir}/libkhtmlsettingsplugin.la
-%{tde_tdelibdir}/libkhtmlsettingsplugin.so
-%{tde_tdelibdir}/kcm_kuick.la
-%{tde_tdelibdir}/kcm_kuick.so
-%{tde_tdelibdir}/libkimgallery.la
-%{tde_tdelibdir}/libkimgallery.so
-%{tde_tdelibdir}/libkuickplugin.la
-%{tde_tdelibdir}/libkuickplugin.so
-%{tde_tdelibdir}/libmfkonqmficon.la
-%{tde_tdelibdir}/libmfkonqmficon.so
-%{tde_tdelibdir}/libminitoolsplugin.la
-%{tde_tdelibdir}/libminitoolsplugin.so
-%{tde_tdelibdir}/librellinksplugin.la
-%{tde_tdelibdir}/librellinksplugin.so
-%{tde_tdelibdir}/libsearchbarplugin.la
-%{tde_tdelibdir}/libsearchbarplugin.so
-%{tde_tdelibdir}/libuachangerplugin.la
-%{tde_tdelibdir}/libuachangerplugin.so
-%{tde_tdelibdir}/libvalidatorsplugin.la
-%{tde_tdelibdir}/libvalidatorsplugin.so
-%{tde_tdelibdir}/libwebarchiverplugin.la
-%{tde_tdelibdir}/libwebarchiverplugin.so
-%{tde_tdelibdir}/webarchivethumbnail.la
-%{tde_tdelibdir}/webarchivethumbnail.so
-%{tde_datadir}/applnk/.hidden/arkplugin.desktop
-%{tde_datadir}/applnk/.hidden/kcmkuick.desktop
-%{tde_datadir}/applnk/.hidden/kuickplugin.desktop
-%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
-%{tde_datadir}/applnk/.hidden/crashesplugin.desktop
-%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
-%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
-%{tde_datadir}/applnk/.hidden/fsview.desktop
-%{tde_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
-%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
-%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
-%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
-%{tde_datadir}/applnk/.hidden/plugin_validators.desktop
-%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
-%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/apps/domtreeviewer
-%{tde_datadir}/apps/fsview
-%{tde_datadir}/apps/imagerotation/orient.py*
-%{tde_datadir}/apps/imagerotation/exif.py*
-%{tde_datadir}/apps/khtml/kpartplugins
-%{tde_datadir}/apps/konqiconview
-%{tde_datadir}/apps/konqlistview
-%{tde_datadir}/apps/konqsidebartng
-%{tde_datadir}/apps/konqueror/icons
-%{tde_datadir}/apps/konqueror/kpartplugins
-%{tde_datadir}/apps/konqueror/servicemenus
-%{tde_datadir}/apps/metabar/iconsrc
-%{tde_datadir}/apps/metabar/themes/default/default.css
-%{tde_datadir}/apps/metabar/themes/default/layout.html
-%{tde_datadir}/apps/microformat/pics/microformat.png
-%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
-%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png
-%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png
-%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png
-%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png
-%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png
-%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png
-%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
-%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png
-%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/services/akregator_konqplugin.desktop
-%{tde_datadir}/services/ark_plugin.desktop
-%{tde_datadir}/services/fsview_part.desktop
-%{tde_datadir}/services/kuick_plugin.desktop
-%{tde_datadir}/services/webarchivethumbnail.desktop
-%{tde_tdelibdir}/libadblock.la
-%{tde_tdelibdir}/libadblock.so
-%{tde_tdedocdir}/HTML/en/konq-plugins/
-
-%post -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-konq-plugins
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-ksig
-Summary:	Graphical tool for managing multiple email signatures
-Group:		Applications/Utilities
-Requires:	trinity-kmail
-
-%description -n trinity-ksig
-KSig is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  A command-line interface is then available
-for generating random or daily signatures from this list.
-
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.
-
-%files -n trinity-ksig
-%defattr(-,root,root,-)
-%doc README
-%{tde_bindir}/ksig
-%{tde_tdeappdir}/ksig.desktop
-%{tde_datadir}/apps/ksig/ksigui.rc
-%{tde_datadir}/icons/hicolor/*/apps/ksig.png
-%{tde_tdedocdir}/HTML/en/ksig/
-
-%post -n trinity-ksig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-noatun-plugins
-Summary:	plugins for Noatun, the Trinity media player
-Group:		Applications/Utilities
-Requires:	trinity-noatun
-
-%description -n trinity-noatun-plugins
-This package contains a variety of useful plugins for Noatun, the audio and
-video media player for TDE. These plugins can be loaded through the plugin
-manager in Noatun settings.
-
-Highlights include an alarm clock, guessing tags from filenames, adjustable
-playback speed, capture to wave file and displaying lyrics, plus a variety
-of user interfaces, playlists and visualisation plugins.
-
-%files -n trinity-noatun-plugins
-%defattr(-,root,root,-)
-%doc README
-%{tde_bindir}/noatunsynaescope.bin
-%{tde_bindir}/noatuntippecanoe.bin
-%{tde_bindir}/noatuntyler.bin
-%{tde_tdelibdir}/noatunalsaplayer.la
-%{tde_tdelibdir}/noatunalsaplayer.so
-%{tde_tdelibdir}/noatunblurscope.la
-%{tde_tdelibdir}/noatunblurscope.so
-%{tde_tdelibdir}/noatuncharlatan.la
-%{tde_tdelibdir}/noatuncharlatan.so
-%{tde_tdelibdir}/noatundub.la
-%{tde_tdelibdir}/noatundub.so
-%{tde_tdelibdir}/noatun_ffrs.la
-%{tde_tdelibdir}/noatun_ffrs.so
-%{tde_tdelibdir}/noatunluckytag.la
-%{tde_tdelibdir}/noatunluckytag.so
-%{tde_tdelibdir}/noatunlyrics.la
-%{tde_tdelibdir}/noatunlyrics.so
-%{tde_tdelibdir}/noatunmadness.la
-%{tde_tdelibdir}/noatunmadness.so
-%if 0%{?with_db}
-%{tde_tdelibdir}/noatun_oblique.la
-%{tde_tdelibdir}/noatun_oblique.so
-%endif
-%{tde_tdelibdir}/noatunpitchablespeed.la
-%{tde_tdelibdir}/noatunpitchablespeed.so
-%{tde_tdelibdir}/noatunsynaescope.la
-%{tde_tdelibdir}/noatunsynaescope.so
-%{tde_tdelibdir}/noatuntippecanoe.la
-%{tde_tdelibdir}/noatuntippecanoe.so
-%{tde_tdelibdir}/noatuntyler.la
-%{tde_tdelibdir}/noatuntyler.so
-%{tde_tdelibdir}/noatunwakeup.la
-%{tde_tdelibdir}/noatunwakeup.so
-%{tde_tdelibdir}/noatunwavecapture.la
-%{tde_tdelibdir}/noatunwavecapture.so
-%{tde_datadir}/apps/noatun/*
-%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
-
-%post -n trinity-noatun-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-noatun-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Note about DB4:
-#  Fedora 18: /usr/include/libdb4/db_cxx.h , /usr/lib64/libdb_cxx-4.so
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=%{_includedir}/db4:%{_includedir}/db51:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
-  \
-  %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
-  --with-sdl \
-%if 0%{?with_db}
-  --with-berkeley-db \
-%endif
-
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec
deleted file mode 100644
index c6377059d..000000000
--- a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec
+++ /dev/null
@@ -1,538 +0,0 @@
-#
-# spec file for package tdeadmin (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdeadmin
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_sbindir %{tde_prefix}/sbin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Administrative tools for TDE
-Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
-Group:		System/GUI/Other
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kuser.pam
-Source2:		kuser.pamd
-Source5:		kpackagerc
-Source6:		ksysvrc
-Source7:		kuserrc
-
-Obsoletes:		trinity-kdeadmin < %{version}-%{release}
-Provides:		trinity-kdeadmin = %{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	m4
-BuildRequires:	fdupes
-BuildRequires:	gcc-c++
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# RPM support
-BuildRequires: rpm-devel
-
-# PAM support
-BuildRequires: pam-devel
-
-# LILO support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-#define with_lilo 1
-%endif
-%if 0%{?with_lilo}
-BuildRequires:	lilo
-%endif
-
-Requires: trinity-kcron = %{version}-%{release}
-Requires: trinity-kdat = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-knetworkconf = %{version}-%{release}
-Requires: trinity-kpackage = %{version}-%{release}
-Requires: trinity-ksysv = %{version}-%{release}
-Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?with_lilo}
-Requires: trinity-lilo-config = %{version}-%{release}
-%else
-Obsoletes: trinity-lilo-config
-%endif
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-%description
-The tdeadmin package includes administrative tools for the Trinity Desktop
-Environment (TDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
-
-%files
-%defattr(-,root,root,-)
-# LILO is not provided in RHEL or Fedora
-%if 0%{?with_lilo} == 0
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
-
-##########
-
-%package -n trinity-kcron
-Summary:	The Trinity crontab editor
-Group:		System/GUI/Other
-
-%description -n trinity-kcron
-KCron is an application for scheduling programs to run in the background.
-It is a graphical user interface to cron, the UNIX system scheduler.
-
-%files -n trinity-kcron
-%defattr(-,root,root,-)
-%{tde_bindir}/kcron
-%{tde_tdeappdir}/kcron.desktop
-%{tde_datadir}/apps/kcron/
-%{tde_datadir}/icons/hicolor/*/apps/kcron.png
-%{tde_tdedocdir}/HTML/en/kcron/
-
-%post -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcron
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdat
-Summary:	A Trinity tape backup tool
-Group:		System/GUI/Other
-
-%description -n trinity-kdat
-KDat is a tar-based tape archiver. It is designed to work with multiple
-archives on a single tape.
-
-Main features are:
-* Simple graphical interface to local filesystem and tape contents.
-* Multiple archives on the same physical tape.
-* Complete index of archives and files is stored on local hard disk.
-* Selective restore of files from an archive.
-* Backup profiles for frequently used backups.
-
-%files -n trinity-kdat
-%defattr(-,root,root,-)
-%doc rpmdocs/kdat/*
-%{tde_bindir}/kdat
-%{tde_tdeappdir}/kdat.desktop
-%{tde_datadir}/apps/kdat/
-%{tde_datadir}/icons/hicolor/*/apps/kdat.png
-%{tde_datadir}/icons/locolor/*/apps/kdat.png
-%{tde_tdedocdir}/HTML/en/kdat/
-
-%post -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdat
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file metainfo plugins for deb and rpm files
-Group:		System/GUI/Other
-
-%description kfile-plugins
-This package contains the Trinity File metainfo plugins for deb and rpm
-package files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_deb.la
-%{tde_tdelibdir}/kfile_deb.so
-%{tde_tdelibdir}/kfile_rpm.la
-%{tde_tdelibdir}/kfile_rpm.so
-%{tde_datadir}/services/kfile_deb.desktop
-%{tde_datadir}/services/kfile_rpm.desktop
-
-##########
-
-%package -n trinity-knetworkconf
-Summary:	Trinity network configuration tool
-Group:		System/GUI/Other
-
-%description -n trinity-knetworkconf
-This is a TDE control center module to configure TCP/IP settings.  It
-can be used to manage network devices and settings for each device.
-
-%files -n trinity-knetworkconf
-%defattr(-,root,root,-)
-%doc rpmdocs/knetworkconf/*
-%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
-%{tde_datadir}/apps/knetworkconf/
-%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
-%{tde_tdelibdir}/kcm_knetworkconfmodule.so
-%{tde_tdelibdir}/kcm_knetworkconfmodule.la
-%{tde_tdedocdir}/HTML/en/knetworkconf/
-
-%post -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-%postun -n trinity-knetworkconf
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kpackage
-Summary:	Trinity package management tool
-Group:		System/GUI/Other
-
-%description -n trinity-kpackage
-This is a frontend to both .rpm and .deb package formats. It allows you
-to view currently installed packages, browse available packages, and
-install/remove them.
-
-%files -n trinity-kpackage
-%defattr(-,root,root,-)
-%doc rpmdocs/kpackage/*
-%{tde_bindir}/kpackage
-%{tde_tdeappdir}/kpackage.desktop
-%{tde_datadir}/apps/kpackage/
-%{tde_datadir}/config/kpackagerc
-%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
-%{tde_tdedocdir}/HTML/en/kpackage/
-
-%post -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpackage
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksysv
-Summary:	Trinity SysV-style init configuration editor
-Group:		System/GUI/Other
-
-%description -n trinity-ksysv
-This program allows you to edit your start and stop scripts using a
-drag and drop GUI.
-
-%files -n trinity-ksysv
-%defattr(-,root,root,-)
-%doc rpmdocs/ksysv/*
-%{tde_bindir}/ksysv
-%{tde_tdeappdir}/ksysv.desktop
-%{tde_datadir}/apps/ksysv/
-%{tde_datadir}/config/ksysvrc
-%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
-%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
-%{tde_datadir}/mimelnk/application/x-ksysv.desktop
-%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
-%{tde_tdedocdir}/HTML/en/ksysv/
-
-%post -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksysv
-for icon_theme in crystalsvg hicolor  ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kuser
-Summary:	Trinity user/group administration tool
-Group:		System/GUI/Other
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-kuser
-A user/group administration tool for TDE.
-
-%files -n trinity-kuser
-%defattr(-,root,root,-)
-%doc rpmdocs/kuser/*
-%{tde_bindir}/kuser
-%{tde_tdeappdir}/kuser.desktop
-%{tde_datadir}/apps/kuser/
-%{tde_datadir}/config/kuserrc
-%{tde_datadir}/config.kcfg/kuser.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kuser.png
-%{tde_tdedocdir}/HTML/en/kuser/
-
-%if 0%{?with_consolehelper}
-%{tde_sbindir}/kuser
-%{_sbindir}/kuser
-%config(noreplace) /etc/pam.d/kuser
-%config(noreplace) /etc/security/console.apps/kuser
-%endif
-
-%post -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kuser
-for icon_theme in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?with_lilo}
-%package -n trinity-lilo-config
-Summary:	Trinity frontend for lilo configuration
-Group:		System/GUI/Other
-Requires:	trinity-kcontrol
-Requires:	trinity-tdebase-bin
-#Requires:	lilo
-
-%description -n trinity-lilo-config
-lilo-config is a TDE based frontend to the lilo boot manager configuration.
-It runs out of the Trinity Control Center.
-
-If you want to use the menu entry to launch lilo-config, you need to install
-tdebase-bin since it uses the tdesu command to gain root privileges.
-
-%files -n trinity-lilo-config
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lilo.la
-%{tde_tdelibdir}/kcm_lilo.so
-%{tde_tdeappdir}/lilo.desktop
-%{tde_tdedocdir}/HTML/en/lilo-config/
-
-%post -n trinity-lilo-config
-touch /etc/lilo.conf
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTLIB QTINC
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --sbindir=%{tde_sbindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-rpm \
-  --with-pam=kde \
-  --with-shadow \
-  --with-private-groups
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{tde_datadir}/config \
-			%{buildroot}%{_sysconfdir}/security/console.apps \
-			%{buildroot}%{_sysconfdir}/pam.d \
-			%{buildroot}%{tde_sbindir} \
-			%{buildroot}%{_sbindir}
-
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
-
-%if 0%{?with_consolehelper}
-# Run kuser through consolehelper
-%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
-%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
-%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
-%endif
-%endif
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-# The following files are not installed in any binary package.
-# This is deliberate.
-
-# - This file serves no purpose that we can see, and conflicts
-#   with GNOME system tools, so be sure to leave it out.
-%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
-
-# Extract from changelog:
-# tdeadmin (4:3.5.5-2) unstable; urgency=low
-#  +++ Changes by Ana Beatriz Guerrero Lopez:
-#  * Removed useless program secpolicy. (Closes: #399426)
-%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
-
-# Remove lilo related files, if unwanted.
-%if 0%{?with_lilo} == 0
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
-%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
-%endif
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kdat     System Backup
-%suse_update_desktop_file kpackage System PackageManager
-%suse_update_desktop_file kcron    System ServiceConfiguration
-%suse_update_desktop_file ksysv    System ServiceConfiguration
-%suse_update_desktop_file kuser    System SystemSetup
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
deleted file mode 100644
index e1d12b94c..000000000
--- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec
+++ /dev/null
@@ -1,744 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-tdeartwork
-Summary:		Additional artwork (themes, sound themes, ...) for TDE
-Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:	GPLv2
-Group:		User Interface/Desktops
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Url:		http://www.trinitydesktop.org/
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	gettext
-BuildRequires:	esound-devel
-
-# kdeartwork specific settings
-
-# OpenGL support
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-Mesa-libGLU
-%endif
-
-# NAS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# LIBART support
-#  On RHEL, libart is too old !
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_libart 1
-BuildRequires:	libart_lgpl-devel
-%endif
-
-# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
-%define with_xscreensaver 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extrusion
-BuildRequires:	xscreensaver-gl
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	libXScrnSaver-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 6 
-# Provides '/usr/share/xscreensaver/config/deco.xml'
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-extras
-%endif
-%if 0%{?suse_version}
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-# Opensuse does not provide 'webcollage' screensaver
-%if 0%{?suse_version} == 0
-%define with_webcollage 1
-%endif
-
-%endif
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-
-Obsoletes:	trinity-kdeartwork < %{version}-%{release}
-Provides:	trinity-kdeartwork = %{version}-%{release}
-
-# Metapackage
-Requires: %{name}-emoticons = %{version}-%{release}
-Requires: %{name}-misc = %{version}-%{release}
-Requires: %{name}-style = %{version}-%{release}
-Requires: %{name}-theme-icon = %{version}-%{release}
-Requires: %{name}-theme-window = %{version}-%{release}
-Requires: trinity-tdewallpapers = %{version}-%{release}
-Requires: trinity-tdescreensaver = %{version}-%{release}
-
-%if 0%{?with_xscreensaver}
-Requires: trinity-tdescreensaver-xsavers = %{version}-%{release}
-Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
-%if 0%{?with_webcollage}
-Requires: trinity-tdescreensaver-xsavers-webcollage = %{version}-%{release}
-%endif
-%endif
-
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes a collection of artistic extras (themes, widget
-styles, screen savers, wallpaper, icons, emoticons and so on) provided
-with the official release of TDE.
-
-Homepage: http://artist.kde.org 
-
-%files
-
-##########
-
-%package emoticons
-Summary:	emoticon collections for tDE chat clients
-Group:		User Interface/Desktops
-
-%description emoticons
-This package contains several collections of emoticons used by official
-and unofficial TDE chat clients, such as Kopete and Konversation.
-
-This package is part of TDE, and a component of the TDE artwork module.
-
-%files emoticons
-%defattr(-,root,root,-)
-%{tde_datadir}/emoticons/
-
-##########
-
-%package misc
-Summary:	various multimedia goodies released with TDE
-Group:		User Interface/Desktops
-
-%description misc
-This package contains miscellaneous multimedia goodies for TDE.
-Included are additional TDE sounds and kworldclock themes.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files misc
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kworldclock/
-%{tde_datadir}/sounds/KDE_Logout_new.wav
-%{tde_datadir}/sounds/KDE_Startup_new.wav
-
-##########
-
-%package style
-Summary:	widget styles released with Trinity
-Group:		User Interface/Desktops
-
-%description style
-This package contains additional widget styles for Trinity. Widget styles
-can be used to customise the look and feel of interface components such
-as buttons, scrollbars and so on.  They can be applied using the style
-manager in the Trinity Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files style
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/styles/
-%{tde_tdelibdir}/kstyle_phase_config.la
-%{tde_tdelibdir}/kstyle_phase_config.so
-%{tde_datadir}/apps/kstyle/
-
-##########
-
-%package theme-icon
-Summary:	icon themes released with Trinity
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kdeartwork-icons < %{version}-%{release}
-Provides:	trinity-kdeartwork-icons = %{version}-%{release}
-
-%description theme-icon
-This package contains additional icon themes for Trinity. Icon themes can be
-used to customise the appearance of standard icons throughout TDE. They
-can be applied using the icon manager in the Trinity Control Centre.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files theme-icon
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/*/*
-
-%post theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-%postun theme-icon
-for i in locolor ikons kdeclassic kids slick ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-##########
-
-%package theme-window
-Summary:	window decoration themes released with Trinity
-Group:		User Interface/Desktops
-
-%description theme-window
-This package contains additional window decoration themes for Trinity. Window
-decoration themes can be used to customise the look of window borders and
-buttons, and can be applied using the window decoration manager in the Trinity
-Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files theme-window
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kwin*
-%{tde_datadir}/apps/kwin/
-
-##########
-
-%package -n trinity-tdewallpapers
-Summary:	wallpapers released with Trinity
-Group:		User Interface/Desktops
-Obsoletes:	trinity-kdewallpapers < %{version}-%{release}
-Provides:	trinity-kdewallpapers = %{version}-%{release}
-
-%description -n trinity-tdewallpapers
-This package contains additional wallpapers for Trinity. Wallpapers can be
-applied using the background manager in the Trinity Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdewallpapers
-%defattr(-,root,root,-)
-%{tde_datadir}/wallpapers/*
-
-##########
-
-%package -n trinity-tdescreensaver
-Summary:	additional screen savers released with Trinity
-Group:		User Interface/Desktops
-
-Obsoletes:	trinity-kscreensaver < %{version}-%{release}
-Provides:	trinity-kscreensaver = %{version}-%{release}
-
-%description -n trinity-tdescreensaver
-This package contains the screen savers for Trinity. They can be tested and
-selected within the Appearance and Themes section of the Trinity Control
-Center.
-
-The hooks for the standard xscreensavers are no longer part of this
-package. To select and/or configure the standard xscreensavers through
-the Trinity Control Center, install the separate package tdescreensaver-xsavers.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver
-%defattr(-,root,root,-)
-%{tde_bindir}/kslideshow.kss
-%{tde_bindir}/kpolygon.kss
-%{tde_bindir}/krotation.kss
-%{tde_bindir}/ksolarwinds.kss
-%{tde_bindir}/klorenz.kss
-%{tde_bindir}/kvm.kss
-%{tde_bindir}/kflux.kss
-%{tde_bindir}/kscience.kss
-%{tde_bindir}/kbanner.kss
-%{tde_bindir}/kclock.kss
-%{tde_bindir}/kfiresaver.kss
-%{tde_bindir}/keuphoria.kss
-%{tde_bindir}/kfountain.kss
-%{tde_bindir}/kgravity.kss
-%{tde_bindir}/kpartsaver.kss
-%{tde_bindir}/kpendulum.kss
-%{tde_bindir}/kblob.kss
-%{tde_bindir}/klines.kss
-%{tde_bindir}/kwave.kss
-%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kpartsaver.desktop
-%{tde_datadir}/apps/kfiresaver/
-%{tde_datadir}/apps/kscreensaver/
-
-%if 0%{?with_xscreensaver}
-%{tde_bindir}/kspace.kss
-%{tde_bindir}/kswarm.kss
-%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
-%endif
-
-##########
-
-%if 0%{?with_xscreensaver}
-
-%package -n trinity-tdescreensaver-xsavers
-Summary:	Trinity hooks for standard xscreensavers
-Group:		User Interface/Desktops
-Requires:	trinity-tdebase-bin >= %{tde_version}
-Requires:	xscreensaver
-
-Obsoletes:	trinity-kscreensaver-xsavers < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers = %{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers
-This package allows a smooth integration of the standard xscreensavers
-into Trinity. With this package installed you can select and/or configure
-the standard xscreensavers through the Appearances and Themes section of
-the Trinity Control Centre.
-
-Note that this package does not actually contain any screensavers itself.
-For the additional screensavers shipped with Trinity, see the separate package
-tdescreensaver-trinity. This package does depend on the xscreensaver package, and
-recommend the xscreensaver-gl package, as well as contain the necessary
-files to integrate these packages into Trinity.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers
-%defattr(-,root,root,-)
-%{tde_bindir}/xscreensaver-getimage-file
-%{tde_bindir}/xscreensaver-getimage
-%{tde_bindir}/kxsconfig
-%{tde_bindir}/kxsrun
-%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
-
-# These screensavers do not exist on Mageia 2
-%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
-%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
-%endif
-
-##########
-
-%if 0%{?with_webcollage}
-
-%package -n trinity-tdescreensaver-xsavers-webcollage
-Summary:	webcollage screensaver Trinity hook
-Group:		User Interface/Desktops
-Requires:	trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
-Requires:	netpbm
-
-Obsoletes:	trinity-kscreensaver-xsavers-webcollage < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers-webcollage
-This package give access to the webcollage screensaver through the Trinity
-screensaver configuration.
-
-This screensaver downloads random pictures from the internet and creates
-a collage as screensaver.
-
-IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
-you might find inappropriate and offensive.
-You are specially discouraged to install this package if you are using 
-your computer in a working environment or in an environment with children.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers-webcollage
-%defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
-
-%endif
-
-##########
-
-%package -n trinity-tdescreensaver-xsavers-extra
-Summary:	Trinity hooks for standard xscreensavers
-Group:		User Interface/Desktops
-Requires:	trinity-tdescreensaver-xsavers = %{version}-%{release}
-
-Obsoletes:	trinity-kscreensaver-xsavers-extra < %{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-extra = %{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers-extra
-This package allows a smooth integration of the universe xscreensavers
-into Trinity. With this package installed you can select and/or configure
-the universe xscreensavers through the Appearances and Themes section of
-the Trinity Control Centre.
-
-Note that this package does not actually contain any screensavers itself.
-For the additional screensavers shipped with TDE, see the separate package
-tdescreensaver.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers-extra
-%defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
-
-# These screensavers do not exist on OpenSuse
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
-%endif
-
-# These screensavers do not exist on Mageia / Mandriva
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
-%endif
-
-%if 0%{?rhel} >= 6
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%endif
-
-%if 0%{?mgaversion}
-%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
-%endif
-
-%if 0%{?fedora} >= 15 || 0%{?pclinuxos}
-%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
-%endif
-
-%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4
-%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
-%endif
-
-%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4
-%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
-%endif
-
-%endif
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild
-# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then:
-cd kscreensaver/kxsconfig/
-./update_hacks.sh
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
-  %{!?with_libart}:-DWITH_LIBART=OFF} \
-  -DWITH_OPENGL=ON \
-  -DWITH_ARTS=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install -C build DESTDIR=%{buildroot}
-
-# Should not be here if xscreensaver is disabled
-%if 0%{?with_xscreensaver} == 0
-%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage
-%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage-file
-%endif
-
-# Duplicate with trinity-kbabel (from tdesdk)
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec
deleted file mode 100644
index 6c4318f8d..000000000
--- a/redhat/main/tdebase/tdebase-3.5.13.2.spec
+++ /dev/null
@@ -1,3886 +0,0 @@
-#
-# spec file for package tdebase (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdebase
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define tdm kdm
-%define tdm_datadir %{tde_datadir}/apps/%{tdm}
-%define starttde startkde
-
-
-Name:			trinity-%{tde_pkg}
-Version:		%{tde_version}
-Release:		%{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Trinity Base Programs
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-tdebase-rpmlintrc
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version} == 0
-Source2:		pamd.kdm-trinity%{?dist}
-Source3:		pamd.kdm-trinity-np%{?dist}
-Source4:		pamd.kcheckpass-trinity%{?dist}
-Source5:		pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# openSUSE: configuration file for TDM
-Source6:		suse-displaymanagers-tdm
-
-# Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-Source7:		tdm.service%{?dist}
-%endif
-
-# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
-%if 0%{?suse_version} == 1140
-Source7:		xdm.oss114
-%endif
-
-# Fedora >= 17: special selinux policy required for TDM
-#  If login through TDM takes ages, then look at '/var/log/audit/audit.log'.
-#  Locate the line containing 'USER_AVC' and dbus stuff.
-#  Put this line into a temporary file, then (e.g for Fedora 17):
-#   audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te
-#   audit2allow -i /tmp/file -M tdm.fc17
-
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
-%define with_selinux_policy 1
-Source8:	tdm%{?dist}.pp
-%endif
-
-%if 0%{?mgaversion} >= 3
-Source9:	mgabutton.svg
-%endif
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-Obsoletes:	trinity-kdebase < %{version}-%{release}
-Provides:	trinity-kdebase = %{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{version}-%{release}
-Provides:	trinity-kdebase-libs = %{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{version}-%{release}
-Provides:	trinity-kdebase-extras = %{version}-%{release}
-Obsoletes:	tdebase < %{version}-%{release}
-Provides:	tdebase = %{version}-%{release}
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-### Distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 15
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 16
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 17
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 18 Theme: "Spherical Cow"
-%if 0%{?fedora} == 18
-Requires:	spherical-cow-backgrounds-single
-%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 18
-%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
-%endif
-
-# Fedora 19 Theme: "Schroedinger's cat"
-%if 0%{?fedora} == 19
-Requires:	schroedinger-cat-backgrounds-base
-%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 19
-%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
-%endif
-
-# Fedora 20 Theme: "Heisenbug"
-%if 0%{?fedora} == 20
-Requires:	heisenbug-backgrounds-base
-%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-
-Requires:	fedora-release-notes
-%define tde_aboutlabel Fedora 20
-%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 4
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Enterprise Linux 5
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 6
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# RHEL 7 Theme
-%if 0%{?rhel} == 7
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/day.jpg
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-
-Requires:	redhat-indexhtml
-%define tde_aboutlabel Enterprise Linux 7
-%define tde_aboutpage /usr/share/doc/HTML/index.html
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 2
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mageia 3 Theme
-%if 0%{?mgaversion} == 3
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 3
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mageia 4 Theme
-%if 0%{?mgaversion} == 4
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
-
-Requires:	indexhtml
-%define tde_aboutlabel Mageia 4
-%define tde_aboutpage /usr/share/mga/about/index.html
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-
-Requires:	indexhtml
-%define tde_aboutlabel Mandriva 2011
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS
-%if 0%{?pclinuxos}
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires:	indexhtml
-%define tde_aboutlabel PCLinuxOS
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# OpenSuse 11.4 Theme
-%if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding = 11.4
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 11.4
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/manual/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding = 12.2
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 12.2
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.2
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-# OpenSuse 12.3 Theme
-%if "%{?suse_version}" == "1230"
-Requires:	wallpaper-branding = 12.3
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 12.3
-%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
-%endif
-
-# OpenSuse 13.1 Theme
-%if "%{?suse_version}" == "1310"
-Requires:	wallpaper-branding = 13.1
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding = 13.1
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	opensuse-manuals_en
-%define tde_aboutlabel OpenSuse 13.1
-%define tde_aboutpage /usr/share/do%endif
-%endif
-
-# OpenSuse 13.2 Theme
-%if "%{?suse_version}" == "1320"
-Requires:	wallpaper-branding = 13.2
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-
-Requires:	release-notes-openSUSE
-%define tde_aboutlabel OpenSuse 13.2
-%define tde_aboutpage /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html
-%endif
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	make
-BuildRequires:	fdupes
-
-# HTDIG support
-BuildRequires:	htdig
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# AUDIOFILE support
-BuildRequires:	audiofile-devel
-
-# ALSA supportl
-BuildRequires:	alsa-lib-devel
-
-# RAW1394 support
-BuildRequires:	libraw1394-devel
-
-# VORBIS support
-BuildRequires:	libvorbis-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}sasl2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-# LIBUSB support
-BuildRequires:	pam-devel
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-
-# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENLDAP support
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
-%endif
-
-# SENSORS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
-BuildRequires:	lm_sensors-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%endif
-
-# TSAK support (requires libudev-devel)
-#  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libudev-devel
-%define with_tsak 1
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XTEST support
-#  On RHEL4, xtest library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xtest 1
-%endif
-
-# HAL support
-#  On RHEL4, we do not use HAL (too old)
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.5
-%endif
-
-# OPENEXR support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%define with_xscreensaver 1
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%endif
-%endif
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libavahi-tqt-devel
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-# NAS support
-# (what is nas btw ?)
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt >= 0.22-12.EL.9p1
-%else
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-Requires:		libdbus-tqt-1-0 >= %{tde_epoch}:0.63
-%endif
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-# LIBART_LGPL support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_libart 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}art_lgpl-devel
-%endif
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libart_lgpl-devel
-%endif
-%endif
-
-# SAMBA support
-%if 0%{?rhel} == 4
-BuildRequires:	samba-common
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libsmbclient-devel
-%endif
-
-# IMAKE
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	imake
-%endif
-
-# XKB support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libxkbfile-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
-BuildRequires:	libxkbfile-devel
-%endif
-
-# XDMCP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xdmcp-devel
-%else
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXdmcp-devel
-%endif
-
-# XTST support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xtst_devel %{_lib}xtst-devel
-%else
-%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xtst_devel libXtst-devel
-%endif
-%{?xtst_devel:BuildRequires: %{xtst_devel}}
-
-# XDAMAGE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xdamage-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXdamage-devel
-%endif
-
-# Requires 'usb.ids'
-BuildRequires:	usbutils
-
-# LIBFONTENC support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libfontenc-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	libfontenc-devel
-%endif
-
-# Other X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	xorg-x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	xorg-x11-font-utils
-%endif
-
-%if 0%{?suse_version} >= 1220
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%endif
-
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	drakconf
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{version}-%{release}
-Requires: %{name}-data = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: %{name}-tdeio-pim-plugins = %{version}-%{release}
-Requires: trinity-kappfinder = %{version}-%{release}
-Requires: trinity-kate = %{version}-%{release}
-Requires: trinity-kwrite = %{version}-%{release}
-Requires: trinity-kcontrol = %{version}-%{release}
-Requires: trinity-kdepasswd = %{version}-%{release}
-Requires: trinity-tdeprint = %{version}-%{release}
-Requires: trinity-kdesktop = %{version}-%{release}
-Requires: trinity-tdm = %{version}-%{release}
-Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-khelpcenter = %{version}-%{release}
-Requires: trinity-kicker = %{version}-%{release}
-Requires: trinity-klipper = %{version}-%{release}
-Requires: trinity-kmenuedit = %{version}-%{release}
-Requires: trinity-konqueror = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
-Requires: trinity-konsole = %{version}-%{release}
-Requires: trinity-kpager = %{version}-%{release}
-Requires: trinity-kpersonalizer = %{version}-%{release}
-Requires: trinity-ksmserver = %{version}-%{release}
-Requires: trinity-ksplash = %{version}-%{release}
-Requires: trinity-ksysguard = %{version}-%{release}
-Requires: trinity-ksysguardd = %{version}-%{release}
-Requires: trinity-ktip = %{version}-%{release}
-Requires: trinity-twin = %{version}-%{release}
-Requires: trinity-libkonq = %{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{version}-%{release}
-Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
- 
-Requires:	trinity-arts >= %{tde_epoch}:1.5.10
-Requires:	trinity-tdelibs >= %{tde_version}
-Requires:	openssl
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-
-Requires:	%{name}-bin-devel = %{version}-%{release}
-Requires:	trinity-kate-devel = %{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{version}-%{release}
-Requires:	trinity-kicker-devel = %{version}-%{release}
-Requires:	trinity-konqueror-devel = %{version}-%{release}
-Requires:	trinity-ksplash-devel = %{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{version}-%{release}
-Requires:	trinity-libkonq-devel = %{version}-%{release}
-Requires:	trinity-tdm-devel = %{version}-%{release}
-Requires:	trinity-twin-devel = %{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{version}-%{release}
-Provides:	tdebase-devel = %{version}-%{release}
-Obsoletes:	tdebase-devel < %{version}-%{release}
-
-Obsoletes:	trinity-kdebase-cmake < %{version}-%{release}
-Obsoletes:	tdebase-cmake < %{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or TWin styles.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package tdeio-pim-plugins
-Summary:	PIM TDEIOslaves from %{name}
-Group:		System/GUI/Other
-
-Provides:	trinity-kdebase-pim-ioslaves = %{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-pim-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-pim-plugins < %{version}-%{release}
-
-%description tdeio-pim-plugins
-Protocol handlers (TDEIOslaves) for personal information management, including:
- * tdeio_ldap
- * tdeio_nntp
- * tdeio_pop3
- * tdeio_smtp
-
-%files tdeio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_ldap.la
-%{tde_tdelibdir}/kio_ldap.so
-%{tde_tdelibdir}/kio_nntp.la
-%{tde_tdelibdir}/kio_nntp.so
-%{tde_tdelibdir}/kio_pop3.la
-%{tde_tdelibdir}/kio_pop3.so
-%{tde_tdelibdir}/kio_smtp.la
-%{tde_tdelibdir}/kio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		System/GUI/Other
-
-Provides:	tdebase-runtime-data-common = %{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/autostart/khotkeys.desktop
-%{tde_datadir}/desktop-directories/
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates/
-
-%post runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun runtime-data-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	Non-TDE application finder for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-%post -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kappfinder
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		System/GUI/Other
-
-%description -n trinity-libkateinterfaces
-This package contains the kateinterface library.
-
-%files -n trinity-libkateinterfaces
-%defattr(-,root,root,-)
-%{tde_libdir}/libkateinterfaces.so.*
-
-%post -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-%postun -n trinity-libkateinterfaces
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate
-Summary:	Advanced text editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kwrite = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/libkdeinit_kate.la
-%{tde_libdir}/libkdeinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/kconf_update/kate-2.4.upd
-%config(noreplace) %{_sysconfdir}/trinity/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-%post -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kate
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries/Other
-Requires:	trinity-kate = %{version}-%{release}
-
-%description -n trinity-kate-devel
-This package contains the development files fare Kate.
-
-%files -n trinity-kate-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-%post -n trinity-kate-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kate-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kwrite
-Summary:	Advanced text editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is an advanced text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/libkdeinit_kwrite.la
-%{tde_libdir}/libkdeinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-%post -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kwrite
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	Control center for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-# Requires 'usb.ids'
-Requires:	usbutils
-%if 0%{?suse_version} == 0
-Requires:	hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/kfontinst
-%{tde_bindir}/kfontview
-%{tde_bindir}/kinfocenter
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_ioslaveinfo.la
-%{tde_tdelibdir}/kcm_ioslaveinfo.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_%{tdm}.la
-%{tde_tdelibdir}/kcm_%{tdm}.so
-%{tde_tdelibdir}/kcm_kdnssd.so
-%{tde_tdelibdir}/kcm_kdnssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_kio.la
-%{tde_tdelibdir}/kcm_kio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/kfile_font.la
-%{tde_tdelibdir}/kfile_font.so
-%{tde_tdelibdir}/kio_fonts.la
-%{tde_tdelibdir}/kio_fonts.so
-%{tde_tdelibdir}/kstyle_keramik_config.la
-%{tde_tdelibdir}/kstyle_keramik_config.so
-%{tde_tdelibdir}/libkfontviewpart.la
-%{tde_tdelibdir}/libkfontviewpart.so
-%{tde_tdelibdir}/libkshorturifilter.la
-%{tde_tdelibdir}/libkshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/libkdeinit_kaccess.la
-%{tde_libdir}/libkdeinit_kaccess.so
-%{tde_libdir}/libkdeinit_kcontrol.la
-%{tde_libdir}/libkdeinit_kcontrol.so
-%{tde_libdir}/libkfontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/ioslaveinfo.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_kdnssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/%{tdm}.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/kfontview.desktop
-%{tde_tdeappdir}/khtml_behavior.desktop
-%{tde_tdeappdir}/khtml_fonts.desktop
-%{tde_tdeappdir}/khtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/kfile_font.desktop
-%{tde_datadir}/services/kfontviewpart.desktop
-%{tde_datadir}/services/kshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcmcolors.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcomponentchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmdesktop.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmdesktopbehavior.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkdnssd.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmlaunch.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmmedia.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmmouse.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmnetpref.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmnic.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmperformance.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmprivacy.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmtaskbar.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcgi.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcrypto.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmhistory.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmjoystick.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkded.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
-
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/apps/kcmview1394/
-
-# The following features are not compiled under RHEL 5 and older
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%{tde_bindir}/krandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/krandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/krandrtray-autostart.desktop
-%endif
-
-%post -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-kcontrol
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Languages/Other
-Requires:	trinity-kcontrol = %{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-This package contains the development files for Kcontrol.
-
-%files -n trinity-kcontrol-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkfontinst.la
-%{tde_libdir}/libkfontinst.so
-
-%post -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kcontrol-devel
-/sbin/ldconfig || :
-
-##########
-
-%package bin
-Summary:	Core binaries for the TDE base module
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-%if 0%{?rhel} >= 7
-Requires:	xorg-x11-server-Xorg
-Requires:	xorg-x11-drv-evdev
-Requires:	dejavu-sans-fonts
-%endif
-
-Provides:	tdebase-bin = %{version}-%{release}
-Obsoletes:	tdebase-bin < %{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-%if 0%{?with_tsak}
-%{tde_bindir}/tsak
-%endif
-%{tde_bindir}/kdebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/crashtest
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/kdesu
-%attr(0755,root,root) %{tde_bindir}/kdesud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%dir %{tde_libdir}/kconf_update_bin
-%{tde_libdir}/kconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/libkdeinit_kcminit.la
-%{tde_libdir}/libkdeinit_kcminit.so
-%{tde_libdir}/libkdeinit_kcminit_startup.la
-%{tde_libdir}/libkdeinit_kcminit_startup.so
-%{tde_libdir}/libkdeinit_khotkeys.la
-%{tde_libdir}/libkdeinit_khotkeys.so
-%{tde_libdir}/libkdeinit_kxkb.la
-%{tde_libdir}/libkdeinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kded/khotkeys.desktop
-%{tde_datadir}/services/kxkb.desktop
-%if 0%{?suse_version} == 0
-%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
-%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/kdebugdialog//
-%{tde_tdedocdir}/HTML/en/kdesu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-# SETUID binaries
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%if 0%{?with_tsak}
-%verify(not mode) %{tde_bindir}/%{tdm}tsak
-%endif
-%verify(not mode) %{tde_bindir}/kcheckpass
-%else
-%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
-%endif
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%endif
-
-%post bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-# Sets permissions on setuid files (openSUSE specific)
-%if 0%{?suse_version}
-%if 0%{?with_tsak}
-%set_permissions %{tde_bindir}/%{tdm}tsak
-%endif
-%set_permissions %{tde_bindir}/kcheckpass
-%endif
-
-%postun bin
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries/Other
-Requires:	%{name}-bin = %{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-Obsoletes:	tdebase-bin-devel < %{version}-%{release}
-Provides:	tdebase-bin-devel = %{version}-%{release}
-
-%description bin-devel
-This package contains the development files for core binaries for 
-the TDE base module
-
-%files bin-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-%post bin-devel
-/sbin/ldconfig || :
-
-%postun bin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package data
-Summary:	Shared data files for the TDE base module
-Group:		System/GUI/Other
-Requires:	%{name}-runtime-data-common = %{version}-%{release}
-
-Obsoletes:	tdebase-data < %{version}-%{release}
-Provides:	tdebase-data = %{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/kshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/
-%{tde_datadir}/apps/kcmcss/
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/
-%{tde_datadir}/apps/kconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/kconf_update/kaccel.upd
-%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/kconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/kdisplay/
-%{tde_datadir}/apps/kfontview/
-%{tde_datadir}/apps/kinfocenter/
-%{tde_datadir}/apps/kthememanager/
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-# XDG directories information
-%dir %{_sysconfdir}/xdg/menus/applications-merged
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
-
-%post data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%if "%{distribution}" == "Mandriva Linux"
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-fi
-%endif
-
-%if "%{distribution}" == "Mageia"
-if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then
-  ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
-fi
-%endif
-
-%postun data
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package tdeio-plugins
-Summary:	Core I/O slaves for TDE
-Group:		System/GUI/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.4.8
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{version}-%{release}
-Provides:	tdebase-kio-plugins = %{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdebase-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package includes the base tdeioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media tdeioslave, which handles removable devices,
-and which works best with hal (and therefore udev) and pmount. Media
-also extends the functionality of many other tdeioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/kfile_media.la
-%{tde_tdelibdir}/kfile_media.so
-%{tde_tdelibdir}/kfile_trash.la
-%{tde_tdelibdir}/kfile_trash.so
-%{tde_tdelibdir}/kio_about.la
-%{tde_tdelibdir}/kio_about.so
-%{tde_tdelibdir}/kio_cgi.la
-%{tde_tdelibdir}/kio_cgi.so
-%{tde_tdelibdir}/kio_filter.la
-%{tde_tdelibdir}/kio_filter.so
-%{tde_tdelibdir}/kio_finger.la
-%{tde_tdelibdir}/kio_finger.so
-%{tde_tdelibdir}/kio_fish.la
-%{tde_tdelibdir}/kio_fish.so
-%{tde_tdelibdir}/kio_floppy.la
-%{tde_tdelibdir}/kio_floppy.so
-%{tde_tdelibdir}/kio_home.la
-%{tde_tdelibdir}/kio_home.so
-%{tde_tdelibdir}/kio_info.la
-%{tde_tdelibdir}/kio_info.so
-%{tde_tdelibdir}/kio_mac.la
-%{tde_tdelibdir}/kio_mac.so
-%{tde_tdelibdir}/kio_man.la
-%{tde_tdelibdir}/kio_man.so
-%{tde_tdelibdir}/kio_media.la
-%{tde_tdelibdir}/kio_media.so
-%{tde_tdelibdir}/kio_nfs.la
-%{tde_tdelibdir}/kio_nfs.so
-%{tde_tdelibdir}/kio_remote.la
-%{tde_tdelibdir}/kio_remote.so
-%{tde_tdelibdir}/kio_settings.la
-%{tde_tdelibdir}/kio_settings.so
-%{tde_tdelibdir}/kio_sftp.la
-%{tde_tdelibdir}/kio_sftp.so
-%{tde_tdelibdir}/kio_system.la
-%{tde_tdelibdir}/kio_system.so
-%{tde_tdelibdir}/kio_tar.la
-%{tde_tdelibdir}/kio_tar.so
-%{tde_tdelibdir}/kio_thumbnail.la
-%{tde_tdelibdir}/kio_thumbnail.so
-%{tde_tdelibdir}/kio_trash.la
-%{tde_tdelibdir}/kio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/kio_finger/
-%{tde_datadir}/apps/kio_info/
-%{tde_datadir}/apps/kio_man/
-%{tde_datadir}/apps/systemview/
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/kfile_media.desktop
-%{tde_datadir}/services/kfile_trash_system.desktop
-%{tde_datadir}/services/lzma.protocol
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/xz.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/kfile_trash.desktop
-%{tde_tdedocdir}/HTML/en/kioslave/
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-%if 0%{?with_hal}
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-%endif
-
-%post tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun tdeio-plugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdepasswd
-Summary:	Password changer for TDE
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kdepasswd < %{version}-%{release}
-Provides:	trinity-kdepasswd = %{version}-%{release}
-
-%description -n trinity-tdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-tdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/kdepasswd.desktop
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-%{_datadir}/faces/Apple.png
-%{_datadir}/faces/BeachBall.png
-%{_datadir}/faces/Blowfish.png
-%{_datadir}/faces/Bug.png
-%{_datadir}/faces/Butterfly.png
-%{_datadir}/faces/Car.png
-%{_datadir}/faces/Cow.png 
-%{_datadir}/faces/Daemon.png
-%{_datadir}/faces/Dog.png
-%{_datadir}/faces/Elephant.png
-%{_datadir}/faces/Flower.png
-%{_datadir}/faces/Frog.png
-%{_datadir}/faces/Ghost.png
-%{_datadir}/faces/Guitar.png
-%{_datadir}/faces/Heart.png
-%{_datadir}/faces/Konqui.png
-%{_datadir}/faces/Lion.png
-%{_datadir}/faces/Monkey.png
-%{_datadir}/faces/Penguin.png
-%{_datadir}/faces/Pig.png
-%{_datadir}/faces/Rabbit.png
-%{_datadir}/faces/Ring.png
-%{_datadir}/faces/Scream.png
-%{_datadir}/faces/Shark.png
-%{_datadir}/faces/Splash.png
-%{_datadir}/faces/Star.png
-%{_datadir}/faces/Teddybear.png
-%{_datadir}/faces/Turtle.png
-
-%post -n trinity-tdepasswd
-update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
-
-%postun -n trinity-tdepasswd
-update-desktop-database %{tde_tdeappdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	Print system for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/kdeprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/kio_print.la
-%{tde_tdelibdir}/kio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/libkdeprint_part.la
-%{tde_tdelibdir}/libkdeprint_part.so
-%{tde_libdir}/libkdeinit_kjobviewer.la
-%{tde_libdir}/libkdeinit_kjobviewer.so
-%{tde_libdir}/libkdeinit_kprinter.la
-%{tde_libdir}/libkdeinit_kprinter.so
-%{tde_tdeappdir}/kdeprintfax.desktop
-%{tde_tdeappdir}/kjobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/kdeprint/
-%{tde_datadir}/apps/kdeprintfax/
-%{tde_datadir}/apps/kjobviewer/
-%{tde_datadir}/apps/kdeprint_part/
-%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/kdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/kdeprint/
-
-%post -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-tdeprint
-/sbin/ldconfig || :
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	Miscellaneous binaries and files for the TDE desktop
-Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1
-%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/kxdglauncher
-%{tde_bindir}/kdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/libkdeinit_kdesktop.la
-%{tde_libdir}/libkdeinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/klaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-%post -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kdesktop
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries/Other
-Requires:	trinity-kdesktop = %{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-This package contains the development files for kdesktop.
-
-%files -n trinity-kdesktop-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-bin = %{version}-%{release}
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	pam
-Requires:	logrotate
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version} == 1140
-Requires:	xorg-x11
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-%if 0%{?rhel} || 0%{?fedora}
-Provides:	service(graphical-login)
-%endif
-# Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	dm
-Provides:	%{tdm}
-%endif
-
-%description -n trinity-tdm
-TDM manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the tdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen%{tdm}conf
-%{tde_bindir}/%{tdm}
-%{tde_bindir}/%{tdm}_config
-%{tde_bindir}/%{tdm}ctl
-%{tde_bindir}/%{tdm}_greet
-%{tde_bindir}/krootimage
-%dir %{tdm_datadir}
-%dir %{tdm_datadir}/pics
-%{tdm_datadir}/pics/kdelogo.png
-%{tdm_datadir}/pics/kdelogo-crystal.png
-%{tdm_datadir}/pics/shutdown.jpg
-%{tdm_datadir}/pics/users
-%dir %{tdm_datadir}/sessions
-%{tdm_datadir}/sessions/*.desktop
-%{tdm_datadir}/themes/
-%{tde_datadir}/config/%{tdm}
-%dir %{_sysconfdir}/trinity/%{tdm}
-%if 0%{?with_selinux_policy}
-%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
-%endif
-%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
-%{tde_tdedocdir}/HTML/en/%{tdm}/
-%if 0%{?suse_version} == 0
-%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
-%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
-%endif
-
-# XDG user faces
-%dir %{_datadir}/faces
-%{_datadir}/faces/default1.png
-%{_datadir}/faces/default2.png
-%{_datadir}/faces/default3.png
-%{_datadir}/faces/root1.png
-
-# Distribution specific stuff
-%if 0%{?suse_version} == 1140
-%{_sysconfdir}/init.d/xdm.tde
-%endif
-%if 0%{?suse_version} >= 1210
-/usr/lib/X11/displaymanagers/tdm
-%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-/usr/lib/systemd/system/tdm.service
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%{_datadir}/xsessions/tde.desktop
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-%endif
-
-# SELINUX policy
-%if 0%{?with_selinux_policy}
-%{?_sysconfdir}/trinity/%{tdm}/tdm.pp
-%endif
-
-# Logrotate configuration
-%config %{_sysconfdir}/logrotate.d/trinity-tdm
-
-%pre -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
-  if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
-    # If there is already something under '/etc/trinity/tdm', simply delete old configuration
-    echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
-    rm -rf "%{tde_datadir}/config/%{tdm}"
-  else
-    # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
-    if [ ! -d "%{_sysconfdir}/trinity" ]; then
-      mkdir -p "%{_sysconfdir}/trinity"
-    fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
-    mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
-  fi
-fi
-
-# Remove actual directory before creating a symlink
-if [ ! -L "%{tdm_datadir}/pics/users" ]; then
-  [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
-  cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
-  rm -rf "%{tdm_datadir}/pics/users"
-fi
-
-%post -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-%if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
-%endif
-
-# Sets default user icon in TDM
-if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
-  [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
-  cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
-fi
-
-# Sets default language for TDM
-if [ "$1" = "1" ]; then
-  if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
-  fi
-fi
-
-# openSUSE 11.4 tdm's startup script
-if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
-  cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
-fi
-
-
-%posttrans -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
-  mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
-  rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
-fi
-
-%postun -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries/Other
-Requires:	trinity-tdm = %{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-tdm-devel
-This package contains the development files for TDM.
-
-%files -n trinity-tdm-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	File-find utility for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-%post -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kfind
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	Help center for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the TDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/libkdeinit_khelpcenter.la
-%{tde_libdir}/libkdeinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-%post -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-khelpcenter
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker
-Summary:	Desktop panel for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_kdeprint.la
-%{tde_tdelibdir}/kickermenu_kdeprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/libkdeinit_appletproxy.la
-%{tde_libdir}/libkdeinit_appletproxy.so
-%{tde_libdir}/libkdeinit_extensionproxy.la
-%{tde_libdir}/libkdeinit_extensionproxy.so
-%{tde_libdir}/libkdeinit_kicker.la
-%{tde_libdir}/libkdeinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/
-%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
-%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-%if 0%{?mgaversion} >= 3
-%{tde_datadir}/oxygen/scalable/mgabutton.svg
-%endif
-
-%post -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries/Other
-Requires:	trinity-kicker = %{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-kicker-devel
-This package contains the development files for kicker.
-
-%files -n trinity-kicker-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-%post -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kicker-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-klipper
-Summary:	Clipboard utility for Trinity
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%config(noreplace) %{_sysconfdir}/trinity/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/libkdeinit_klipper.la
-%{tde_libdir}/libkdeinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/kconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/kconf_update/klipperrc.upd
-%{tde_datadir}/apps/kconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-%post -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-klipper
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	Menu editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the TDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/libkdeinit_kcontroledit.la
-%{tde_libdir}/libkdeinit_kcontroledit.so
-%{tde_libdir}/libkdeinit_kmenuedit.la
-%{tde_libdir}/libkdeinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-%post -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-kmenuedit
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-kcontrol = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-kdesktop = %{version}-%{release}
-Requires:	trinity-kfind = %{version}-%{release}
-Requires:	trinity-libkonq = %{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libkhtmlkttsdplugin.la
-%{tde_tdelibdir}/libkhtmlkttsdplugin.so
-%{tde_libdir}/libkdeinit_keditbookmarks.la
-%{tde_libdir}/libkdeinit_keditbookmarks.so
-%{tde_libdir}/libkdeinit_kfmclient.la
-%{tde_libdir}/libkdeinit_kfmclient.so
-%{tde_libdir}/libkdeinit_konqueror.la
-%{tde_libdir}/libkdeinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/khtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/kconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/
-%{tde_datadir}/apps/khtml/kpartplugins/
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%dir %{tde_datadir}/apps/konqueror/dirtree
-%dir %{tde_datadir}/apps/konqueror/dirtree/remote
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-
-%post -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-if [ $1 -eq 1 ]; then
-  update-alternatives --install \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-    10 || :
-fi
-
-%postun -n trinity-konqueror
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries/Other
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-devel
-This package contains the development files for konqueror.
-
-%files -n trinity-konqueror-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-%post -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-konqueror-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		System/GUI/Other
-Requires:	trinity-konqueror = %{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/khtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-%post -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-%postun -n trinity-konqueror-nsplugins
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/libkdeinit_konsole.la
-%{tde_libdir}/libkdeinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/kconf_update/konsole.upd
-%{tde_datadir}/apps/kconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
-
-%post -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-konsole
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kpager
-Summary:	Desktop pager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-%post -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpager
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	Installation personalizer for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-%post -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-kpersonalizer
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	Session manager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the TDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a TDE session. It registers TDE with X display managers, and
-provides the 'starttde' command, for starting an X session with TDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-TDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/%{starttde}
-%{tde_bindir}/migratekde3
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/libkdeinit_ksmserver.la
-%{tde_libdir}/libkdeinit_ksmserver.so
-%{tde_datadir}/apps/kconf_update/ksmserver.upd
-%{tde_datadir}/apps/kconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/
-
-# Workaround conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/plasma-desktop
-%endif
-
-%post -n trinity-ksmserver
-/sbin/ldconfig || :
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
-%postun -n trinity-ksmserver
-/sbin/ldconfig || :
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
-##########
-
-%package -n trinity-ksplash
-Summary:	The TDE splash screen
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-%post -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries/Other
-Requires:	trinity-ksplash = %{version}-%{release}
-
-%description -n trinity-ksplash-devel
-This package contains the development files for ksplash.
-
-%files -n trinity-ksplash-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksplash/
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-%post -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksplash-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	System guard for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	trinity-ksysguardd = %{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-%post -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries/Other
-Requires:	trinity-ksysguard = %{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-This package contains the development files for ksysguard.
-
-%files -n trinity-ksysguard-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksgrd/
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-%post -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-ksysguard-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	System guard daemon for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc
-
-##########
-
-%package -n trinity-ktip
-Summary:	Useful tips for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using TDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/kdewizard/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-%post -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-%postun -n trinity-ktip
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-
-##########
-
-%package -n trinity-twin
-Summary:	The TDE window manager
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for TDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/kompmgr
-%{tde_bindir}/kwin
-%{tde_bindir}/kwin_killer_helper
-%{tde_bindir}/kwin_rules_dialog
-%{tde_libdir}/kconf_update_bin/kwin_update_default_rules
-%{tde_libdir}/kconf_update_bin/kwin_update_window_settings
-%{tde_tdelibdir}/kcm_kwin*.la
-%{tde_tdelibdir}/kcm_kwin*.so
-%{tde_tdelibdir}/kwin*.la
-%{tde_tdelibdir}/kwin*.so
-%{tde_libdir}/libkdecorations.so.*
-%{tde_libdir}/libkdeinit_kwin_rules_dialog.la
-%{tde_libdir}/libkdeinit_kwin_rules_dialog.so
-%{tde_libdir}/libkdeinit_kwin.la
-%{tde_libdir}/libkdeinit_kwin.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/kwindecoration.desktop
-%{tde_tdeappdir}/kwinoptions.desktop
-%{tde_tdeappdir}/kwinrules.desktop
-%{tde_datadir}/applnk/.hidden/kwinactions.desktop
-%{tde_datadir}/applnk/.hidden/kwinadvanced.desktop
-%{tde_datadir}/applnk/.hidden/kwinfocus.desktop
-%{tde_datadir}/applnk/.hidden/kwinmoving.desktop
-%{tde_datadir}/applnk/.hidden/kwintranslucency.desktop
-%{tde_datadir}/apps/kconf_update/kwin3_plugin.pl
-%{tde_datadir}/apps/kconf_update/kwin3_plugin.upd
-%{tde_datadir}/apps/kconf_update/kwin_focus1.sh
-%{tde_datadir}/apps/kconf_update/kwin_focus1.upd
-%{tde_datadir}/apps/kconf_update/kwin_focus2.sh
-%{tde_datadir}/apps/kconf_update/kwin_focus2.upd
-%{tde_datadir}/apps/kconf_update/kwin_fsp_workarounds_1.upd
-%{tde_datadir}/apps/kconf_update/kwiniconify.upd
-%{tde_datadir}/apps/kconf_update/kwinsticky.upd
-%{tde_datadir}/apps/kconf_update/kwin.upd
-%{tde_datadir}/apps/kconf_update/kwinupdatewindowsettings.upd
-%{tde_datadir}/apps/kconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/kwin/
-%{tde_datadir}/config.kcfg/kwin.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kwin.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-%post -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-twin
-update-desktop-database %{tde_appdir} 2> /dev/null || : 
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries/Other
-Requires:	trinity-twin = %{version}-%{release}
-
-%description -n trinity-twin-devel
-This package contains the development files for twin.
-
-%files -n trinity-twin-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kwin/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libkdecorations.la
-%{tde_libdir}/libkdecorations.so
-
-%post -n trinity-twin-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-twin-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkonq
-Summary:	Core libraries for Konqueror
-Group:		System/GUI/Other
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/
-%{tde_datadir}/apps/kconf_update/favicons.upd
-%{tde_datadir}/apps/kconf_update/move_favicons.sh
-%dir %{tde_datadir}/apps/konqueror/pics
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-%post -n trinity-libkonq
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq
-/sbin/ldconfig || :
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		System/GUI/Other
-
-Obsoletes:	tdebase-libtqt3-integration < %{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%dir %{tde_tdelibdir}/plugins/integration
-%{tde_tdelibdir}/plugins/integration/libqtkde.la
-%{tde_tdelibdir}/plugins/integration/libqtkde.so
-%{tde_tdelibdir}/plugins/integration/libqtkde.so.*
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	Development files for Konqueror's core libraries
-Group:		Development/Libraries/Other
-Requires:	trinity-libkonq = %{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kfileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-%post -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkonq-devel
-/sbin/ldconfig || :
-
-##########
-
-%package tdeio-smb-plugin
-Summary:	Windows Connection Module for TDE
-Group:		System/GUI/Other
-
-%description tdeio-smb-plugin
-This package provides the "smb://" protocol, to connect to and from
-Windows and Samba shares.
-
-%files tdeio-smb-plugin
-%defattr(-,root,root)
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/kio_smb.la
-%{tde_tdelibdir}/kio_smb.so
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%dir %{tde_datadir}/apps/remoteview
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# TDM Background
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "%{starttde}" \
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
-	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
-%__sed -i "konqueror/about/konq_aboutpage.cc" \
-	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
-	-e "s|help:/kubuntu/|%{tde_aboutpage}|" \
-	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
-%__sed -i "konqueror/about/launch.html" \
-	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "kdm/config.def" \
-	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
-
-# TDE default directory and icon in startup script
-%__sed -i "%{starttde}" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# Sets default TDE menu icon
-%if "%{tde_starticon}" != ""
-%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
-	-e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
-%endif
-
-# Xsession script location may vary on some distro
-%if 0%{?rhel} || 0%{?fedora}
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
-%endif
-%if 0%{?suse_version}
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
-%endif
-
-# Reboot command location may vary on some distributions
-if [ -x "/usr/bin/reboot" ]; then
-  POWEROFF="/usr/bin/poweroff"
-  REBOOT="/usr/bin/reboot"
-fi
-if [ -n "${REBOOT}" ]; then
-  %__sed -i \
-    "doc/%{tdm}/%{tdm}rc-ref.docbook" \
-    "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
-    "%{tdm}/config.def" \
-  -e "s|/sbin/poweroff|${POWEROFF}|g" \
-  -e "s|/sbin/reboot|${REBOOT}|g"
-fi
-
-# Update icons for some control center modules
-%__sed -i "kcontrol/componentchooser/componentchooser.desktop"        -e "s|^Icon=.*|Icon=kcmcomponentchooser|"
-%__sed -i "kcontrol/taskbar/kcmtaskbar.desktop"                       -e "s|^Icon=.*|Icon=kcmtaskbar|"
-%__sed -i "kcontrol/nics/nic.desktop"                                 -e "s|^Icon=.*|Icon=kcmnic|"
-%__sed -i "kcontrol/input/mouse.desktop"                              -e "s|^Icon=.*|Icon=kcmmouse|"
-%__sed -i "kcontrol/smserver/kcmsmserver.desktop"                     -e "s|^Icon=.*|Icon=kcmsmserver|"
-%__sed -i "kcontrol/kded/kcmkded.desktop"                             -e "s|^Icon=.*|Icon=kcmkded|"
-%__sed -i "kcontrol/konq/desktop.desktop"                             -e "s|^Icon=.*|Icon=kcmdesktop|"
-%__sed -i "kcontrol/konq/desktopbehavior.desktop"                     -e "s|^Icon=.*|Icon=kcmdesktopbehavior|"
-%__sed -i "kcontrol/privacy/privacy.desktop"                          -e "s|^Icon=.*|Icon=kcmprivacy|"
-%__sed -i "kcontrol/crypto/crypto.desktop"                            -e "s|^Icon=.*|Icon=kcmcrypto|"
-%__sed -i "kcontrol/kio/netpref.desktop"                              -e "s|^Icon=.*|Icon=kcmnetpref|"
-%__sed -i "kcontrol/konqhtml/khtml_filter.desktop"                    -e "s|^Icon=.*|Icon=kcmkhtml_filter|"
-%__sed -i "kcontrol/joystick/joystick.desktop"                        -e "s|^Icon=.*|Icon=kcmjoystick|"
-%__sed -i "kcontrol/colors/colors.desktop"                            -e "s|^Icon=.*|Icon=kcmcolors|"
-%__sed -i "kcontrol/performance/kcmperformance.desktop"               -e "s|^Icon=.*|Icon=kcmperformance|"
-%__sed -i "kcontrol/launch/kcmlaunch.desktop"                         -e "s|^Icon=.*|Icon=kcmlaunch|"
-%__sed -i "kcontrol/dnssd/kcm_kdnssd.desktop"                         -e "s|^Icon=.*|Icon=kcmkdnssd|"
-%__sed -i "kcontrol/spellchecking/spellchecking.desktop"              -e "s|^Icon=.*|Icon=kcmspellchecking|"
-%__sed -i "konqueror/sidebar/trees/history_module/kcmhistory.desktop" -e "s|^Icon=.*|Icon=kcmhistory|"
-%__sed -i "kioslave/cgi/kcmcgi/kcmcgi.desktop"                        -e "s|^Icon=.*|Icon=kcmcgi|"
-%__sed -i "kioslave/media/kcmodule/media.desktop"                     -e "s|^Icon=.*|Icon=kcmmedia|" 
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export KDEDIR=%{tde_prefix}
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Samba 4.0 includes (Fedora 18)
-if [ -d "/usr/include/samba-4.0" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
-  \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?with_exr:-DWITH_OPENEXR=ON} \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?with_xrandr:-DWITH_XRANDR=ON} \
-  -DWITH_XRENDER=ON \
-  -DWITH_XDAMAGE=ON \
-  -DWITH_XEXT=ON \
-  %{?with_xtest:-DWITH_XTEST=ON} \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  %{?with_libart:-DWITH_LIBART=ON} \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  -DWITH_PAM=ON \
-  -DWITH_SHADOW=ON \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  %{?with_hal:-DWITH_HAL=ON} \
-  -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \
-  -DBUILD_ALL=ON \
-%if 0%{?suse_version}
-  -DKCHECKPASS_PAM_SERVICE="xdm" \
-  -DKDM_PAM_SERVICE="xdm" \
-  -DKSCREENSAVER_PAM_SERVICE="xdm" \
-%else
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-  -DKDM_PAM_SERVICE="tdm-trinity" \
-  -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
-%endif
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Removes obsolete Beagle-related files
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__install -D -m 644 \
-	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-
-# Force session name to be 'TDE'
-%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-	-e "s,^Name=.*,Name=TDE,"
-%endif
-
-# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/%{starttde}
-SCRIPT:
-exec %{tde_bindir}/%{starttde}
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/%{tdm}
-%if 0%{?pclinuxos}
-FNDSESSION_EXEC="/usr/sbin/chksession -k"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
-EOF
-%endif
-
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?tde_prefix}" != "/usr"
-cat <<EOF >"%{?buildroot}%{tde_bindir}/plasma-desktop"
-#!/bin/sh
-
-# This stupid scripts prevent the launch of 'plasma-desktop'
-# (from KDE4) alongside with TDE.
-
-case "\${DESKTOP_SESSION}" in
-        "kde3"|"trinity"|"TDE") exit 0;;
-        *) exec /usr/bin/plasma-desktop;;
-esac
-EOF
-chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop"
-%endif
-
-# PAM configuration files (except openSUSE)
-%if 0%{?suse_version} == 0
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
-%endif
-
-# TDM configuration
-%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%if 0%{?suse_version} || 0%{?mgaversion} >= 4
-%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%else
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
-
-# Makes 'media_safelyremove.desktop' an alternative.
-# This allows the use of 'tdeio-umountwrapper' package.
-%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
-%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
-
-# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
-#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version} >= 1210
-%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
-%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
-%endif
-
-# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
-%endif
-
-# Symlink TDM configuration
-%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
-%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
-
-# SELINUX policy for RHEL / Fedora
-%if 0%{?with_selinux_policy}
-%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
-%endif
-
-# Mageia icon for TDE menu
-%if 0%{?mgaversion} >= 3
-%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
-%endif
-
-# openSUSE 11.4: tdm startup script
-%if 0%{?suse_version} == 1140
-%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
-%endif
-
-# Console font to fontconfig
-%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d"
-cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf"
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <!-- Font directory list -->
-  <dir>%{tde_datadir}/apps/konsole/fonts</dir>
-</fontconfig>
-EOF
-
-# logrotate configuration
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm"
-/var/log/tdm.log {
-    weekly
-    notifempty
-    missingok
-    nocompress
-}
-EOF
-
-# Move faces icon to XDG directory '/usr/share/faces'
-if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
-  %__mkdir_p "%{?buildroot}%{_datadir}/faces"
-  %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces"
-  rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
-fi
-%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png                      hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
-for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
-for i in 16;                   do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png                    hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
-for i in {16,22,32,48};        do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png                        hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png                  hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png                 hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png                 hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                          hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png                  hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
-for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png                      hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png                         hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
-for i in {16,22};              do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png                     hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png                 hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png                 hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
-for i in {16,22,32,48,64};     do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png                    hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png                       hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png                      hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png                   hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png          hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png                 hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop                       Documentation Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop                       System FileManager core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop                       TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop                   X-SuSE-core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop                      System Filesystem core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop                 PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop                    System TrayIcon
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop                  Core-Configuration
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop                 System Network
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop                WebBrowser
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop                System FileManager
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop                    TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop                  TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop                     Utility  DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop              DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop                  System Monitor
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop                       System Utility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kdeprintfax.desktop                PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop                  Graphics Viewer
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop                 Applet X-KDE-settings-desktop
-%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
-%endif
-
-# Icons from TDE Control Center should only be displayed in TDE
-for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
-  if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
-    if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
-      echo "OnlyShowIn=KDE;" >>"${i}"
-    fi
-  fi
-done
-
-# Other apps that should stay in TDE
-for i in ksysguard kfontview showdesktop; do
-  echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
-done
-
-# Remove setuid bit on some binaries.
-%if 0%{?with_tsak}
-chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
-%endif
-chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
-
-# Fix permissions on shell scripts
-chmod 0755 "%{?buildroot}%{tde_datadir}/apps/kconf_update/move_session_config.sh"
-chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%if 0%{?with_tsak}
-%verify_permissions -e %{tde_bindir}/%{tdm}tsak
-%endif
-%verify_permissions -e %{tde_bindir}/kcheckpass
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
deleted file mode 100644
index 1b0e5cd2f..000000000
--- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec
+++ /dev/null
@@ -1,1195 +0,0 @@
-#
-# spec file for package tdebindings (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdebindings
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Special note for RHEL4:
-#  You must create symlink 'libgcj.so' manually because it does not exist by default.
-# E.g:
-#  ln -s /usr/lib/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
-# or 64 bits:
-#  ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE bindings to non-C++ languages
-Version:		%{tde_version}
-Release:		%{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ZLIB support
-BuildRequires: zlib-devel
-
-# PERL module support
-BuildRequires: perl(ExtUtils::MakeMaker)
-
-# GTK2 support
-%if 0%{?rhel} == 4
-BuildRequires:	evolution28-gtk2-devel
-Requires:		evolution28-gtk2
-BuildRequires:	evolution28-glib2-devel
-Requires:		evolution28-glib2
-BuildRequires:	evolution28-cairo-devel
-Requires:		evolution28-cairo
-BuildRequires:	evolution28-pango-devel
-Requires:		evolution28-pango
-BuildRequires:	evolution28-atk-devel
-Requires:		evolution28-atk
-%else
-BuildRequires:	gtk2-devel
-%endif
-
-# XULRUNNER support
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-#BuildRequires: xulrunner-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: mozilla-xulrunner20-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# GTK1 support
-%if 0%{?fedora}
-%define with_gtk1 1
-BuildRequires: glib-devel
-BuildRequires: gtk+-devel
-%endif
-%if 0%{?rhel} == 5
-%define with_gtk1 1
-BuildRequires: glib-devel
-BuildRequires: gtk+-devel
-%endif
-%if 0%{?mdkversion} == 201100
-%define with_gtk1 1
-BuildRequires: %{_lib}glib1.2-devel
-BuildRequires: %{_lib}gtk+-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libgdk_pixbuf2.0-devel
-%else
-BuildRequires:	%{_lib}gdk_pixbuf2.0-devel
-%endif
-%endif
-%if 0%{?fedora}
-%if 0%{?fedora} >= 17
-BuildRequires: gdk-pixbuf2-devel
-%else
-BuildRequires: gdk-pixbuf-devel
-%endif
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-
-## Python
-BuildRequires: python-devel
-%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-
-## ruby
-BuildRequires:	ruby-devel >= 1.8
-BuildRequires:	ruby >= 1.8
-%if 0%{?fedora} >= 19
-BuildRequires:	rubypick
-%endif
-%if "%{?ruby_libarchdir}" != ""
-%define ruby_arch %{?ruby_libarchdir}
-%else
-%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
-%endif
-
-%if "%{?ruby_libdir}" != ""
-%define ruby_rubylibdir %{?ruby_libdir}
-%else
-%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
-%endif
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-## java
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-BuildRequires:	java-1.4.2-gcj-compat-devel
-BuildRequires:	libgcj-devel
-BuildRequires:	gcc-java
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-
-# PCLinuxOS use SUN's Java
-%if 0%{?pclinuxos}
-BuildRequires:	java-1.6.0-sun
-BuildRequires:	java-1.6.0-sun-devel
-%else
-
-# Others use OpenJDK
-BuildRequires: java-openjdk
-BuildRequires: java-devel >= 1.4.2
-%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7
-BuildRequires: java-1.7.0-openjdk-devel
-%else
-BuildRequires: java-1.6.0-openjdk-devel
-%endif
-
-%endif
-%endif
-
-%if 0%{?suse_version}
-%define java_home %{_usr}/%{_lib}/jvm/java
-%else
-%if 0%{?rhel} == 4
-%define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0
-%else
-%define java_home %{_usr}/lib/jvm/java
-%endif
-%endif
-%define _with_java --with-java=%{java_home}
-
-## Perl
-# There is no 'perl-devel' package on RHEL5
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	perl-devel
-%endif
-%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
-
-
-Obsoletes:	trinity-kdebindings < %{version}-%{release}
-Provides:	trinity-kdebindings = %{version}-%{release}
-
-# Metapackage requires
-Requires: trinity-tdebindings-java = %{version}-%{release}
-Requires: trinity-libsmokeqt1 = %{version}-%{release}
-Requires: trinity-libsmoketde = %{version}-%{release}
-Requires: trinity-perl-dcop = %{version}-%{release}
-Requires: trinity-python-dcop = %{version}-%{release}
-Requires: trinity-libkjsembed1 = %{version}-%{release}
-Requires: trinity-kjscmd = %{version}-%{release}
-Requires: trinity-juic = %{version}-%{release}
-Requires: trinity-libkorundum0-ruby = %{version}-%{release}
-Requires: trinity-libqt0-ruby = %{version}-%{release}
-
-
-%description
-TDE/DCOP bindings to non-C++ languages
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package java
-Summary:	TDE Java bindings metapackage [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libdcop3-java = %{version}-%{release}
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
-Requires:	trinity-libqt3-java = %{version}-%{release}
-Requires:	trinity-libqt3-jni = %{version}-%{release}
-Requires:	trinity-libtrinity-java = %{version}-%{release}
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
-
-%description java
-A metapackage depending on all TDE, Qt and DCOP bindings libraries
-related to the Java language.
-
-This package is part of the official TDE bindings module.
-
-%files java
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-libdcop3-java
-Summary:	DCOP bindings for Java [Trinity]
-Group:		System/Libraries
-
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
-
-%description -n trinity-libdcop3-java
-This package contains the Java classes necessary to run Java programs
-using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications
-Protocol, used for communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/org/
-
-##########
-
-%package -n trinity-libdcop3-java-devel
-Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libdcop3-java = %{version}-%{release}
-
-%description -n trinity-libdcop3-java-devel
-This package contains the dcopidl2java program which generates Java 
-stubs from DCOP IDL files, necessary to do development with the DCOP Java
-bindings. DCOP is the TDE Desktop COmmunications Protocol, used for
-communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-java-devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl2java
-
-##########
-
-%package -n trinity-libdcop3-jni
-Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libdcop3-jni
-This package contains the shared libraries and scripts necessary to
-run programs using the Java DCOP bindings. DCOP is the TDE Desktop
-COmmunications Protocol, used for communicating with running TDE
-applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/libjavadcop.la
-%{tde_libdir}/libjavadcop.so
-
-%post -n trinity-libdcop3-jni
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop3-jni
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libqt3-java
-Summary:	Java bindings for Qt [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libdcop3-jni = %{version}-%{release}
-Requires:	trinity-libqt3-jni = %{version}-%{release}
-Requires:	trinity-juic = %{version}-%{release}
-
-%description -n trinity-libqt3-java
-This package contains the Java classes necessary to run Java programs
-using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
-the TDE desktop environment.
-
-It also includes many example programs that make use of these bindings,
-plus many of the Qt Tutorial examples translated into Java.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt3-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/qtjava*.jar
-%{tde_tdedocdir}/HTML/en/javalib/
-
-##########
-
-%package -n trinity-libqt3-jni
-Summary:	Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libqt3-jni
-This package contains the shared libraries necessary to run Java
-programs using the Java Qt bindings. Qt is a very popular GUI
-toolkit, used by the TDE desktop environment.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt3-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/libqtjavasupport.la
-%{tde_libdir}/libqtjavasupport.so.*
-%{tde_libdir}/jni/libqtjava.la
-%{tde_libdir}/jni/libqtjava.so.*
-%doc qtjava/ChangeLog
-
-%post -n trinity-libqt3-jni
-/sbin/ldconfig || :
-
-%postun -n trinity-libqt3-jni
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libqt3-jni-devel
-Summary:	Development files fo Java bindings for Qt ( Native libraries ) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libqt3-jni = %{version}-%{release}
-
-%description -n trinity-libqt3-jni-devel
-This package contains the development files for trinity-libqt3-jni.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt3-jni-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libqtjavasupport.so
-%{tde_libdir}/jni/libqtjava.so
-
-##########
-
-%package -n trinity-libtrinity-java
-Summary:	Tdelibs bindings for Java [Trinity]
-Group:		System/Libraries
-
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
-
-%description -n trinity-libtrinity-java
-This package contains the Java classes necessary to run Java programs
-using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
-very popular UNIX Desktop Environment.
-
-It also includes some example applications that use these Java
-classes, and multiple usage samples of the most common TDE classes.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/koala*.jar
-
-##########
-
-%package -n trinity-libtrinity-jni
-Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libtrinity-jni
-This package contains the shared libraries necessary to run Java
-programs using the Java tdelibs bindings. TDE is the Trinity Desktop
-Environment, a very popular UNIX Desktop Environment.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/jni/libkdejava.la
-%{tde_libdir}/jni/libkdejava.so.*
-%doc kdejava/ChangeLog
-
-##########
-
-%package -n trinity-libtrinity-jni-devel
-Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libtrinity-jni = %{version}-%{release}
-
-%description -n trinity-libtrinity-jni-devel
-This package contains the development files for trinity-libtrinity-jni.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-jni-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/jni/libkdejava.so
-
-##########
-
-%package -n trinity-libsmokeqt1
-Summary:	SMOKE Binding Library to Qt
-Group:		System/Libraries
-
-%description -n trinity-libsmokeqt1
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt library.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmokeqt1
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmokeqt.so.*
-
-%post -n trinity-libsmokeqt1
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmokeqt1
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libsmokeqt-devel
-Summary:	SMOKE Binding Library to Qt - Development Files
-Group:		Development/Languages/Other
-Requires:	trinity-libsmokeqt1 = %{version}-%{release}
-
-%description -n trinity-libsmokeqt-devel
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt library. This package contains the development files for the
-library.
-
-If you are a normal user, you probably don't need this
-package.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmokeqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/smoke.h
-%{tde_libdir}/libsmokeqt.so
-%{tde_libdir}/libsmokeqt.la
-
-%post -n trinity-libsmokeqt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmokeqt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libsmoketde
-Summary:	SMOKE Binding Library to TDE
-Group:		System/Libraries
-
-Obsoletes:	trinity-libsmokekde1 < %{version}-%{release}
-Provides:	trinity-libsmokekde1 = %{version}-%{release}
-
-%description -n trinity-libsmoketde
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-TDE libraries.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketde
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so.*
-
-%post -n trinity-libsmoketde
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketde
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libsmoketde-devel
-Summary:	SMOKE Binding Library to TDE - Development Files
-Group:		Development/Languages/Other
-Requires:	trinity-libsmoketde = %{version}-%{release}
-
-Obsoletes:	trinity-libsmokekde-devel < %{version}-%{release}
-Provides:	trinity-libsmokekde-devel = %{version}-%{release}
-
-%description -n trinity-libsmoketde-devel
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt and TDE libraries. This package contains the development files for
-the library.
-
-If you are a normal user, you probably don't need this
-package.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketde-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmokekde.so
-%{tde_libdir}/libsmokekde.la
-
-%post -n trinity-libsmoketde-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libsmoketde-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n perl-dcop
-Summary:	DCOP Bindings for Perl 
-Group:		System/Libraries
-%if 0%{?suse_version}
-Requires:	perl-base
-%else
-Requires:	perl
-%endif
-
-Obsoletes:	trinity-kdebindings-dcopperl < %{version}-%{release}
-Provides:	trinity-kdebindings-dcopperl = %{version}-%{release}
-
-Obsoletes:	trinity-perl-dcop < %{version}-%{release}
-Provides:	trinity-perl-dcop = %{version}-%{release}
-
-%description -n perl-dcop
-Perl bindings to the DCOP interprocess communication protocol used by TDE
-
-%files -n perl-dcop
-%defattr(-,root,root,-)
-%{perl_vendorarch}/auto/DCOP/
-%{perl_vendorarch}/DCOP.pm
-%{perl_vendorarch}/DCOP/
-%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
-%{tde_mandir}/man3/DCOP.3pm*
-
-##########
-
-%package -n python-dcop
-Summary:	DCOP bindings for Python
-Group:		System/Libraries
-Requires:	python
-
-Obsoletes:	trinity-python-dcop < %{version}-%{release}
-Provides:	trinity-python-dcop = %{version}-%{release}
-
-%description -n python-dcop
-This package contains the shared libraries necessary to run and
-develop Python programs using the Python DCOP bindings
-libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
-communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n python-dcop
-%defattr(-,root,root,-)
-%{python_sitearch}/pcop.la
-%{python_sitearch}/pcop.so
-%{python_sitearch}/pydcop.py*
-
-##########
-
-%package -n trinity-libkjsembed1
-Summary:	Embedded JavaScript library
-Group:		System/Libraries
-
-%description -n trinity-libkjsembed1
-This package contains the shared libraries necessary to run programs
-linked with the KJSEmbed library. This library provides JavaScript
-embedded scripting facilities to TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkjsembed1
-%defattr(-,root,root,-)
-%{tde_libdir}/libkjsembed.so.*
-%{tde_tdelibdir}/libimagefxplugin.la
-%{tde_tdelibdir}/libimagefxplugin.so
-%{tde_datadir}/services/imagefx_plugin.desktop
-%{tde_tdelibdir}/libqprocessplugin.so
-%{tde_tdelibdir}/libqprocessplugin.la
-%{tde_datadir}/services/qprocess_plugin.desktop
-%{tde_tdelibdir}/libfileitemplugin.la
-%{tde_tdelibdir}/libfileitemplugin.so
-%{tde_datadir}/services/kfileitem_plugin.desktop
-%{tde_datadir}/apps/kjsembed/
-%{tde_datadir}/servicetypes/binding_type.desktop
-%{tde_bindir}/embedjs
-%{tde_datadir}/apps/embedjs/
-%{tde_tdeappdir}/embedjs.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png
-%{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png
-%{tde_tdelibdir}/libjavascript.la
-%{tde_tdelibdir}/libjavascript.so
-%dir %{tde_datadir}/apps/kate
-%dir %{tde_datadir}/apps/kate/scripts
-%{tde_datadir}/apps/kate/scripts/swaptabs.js
-%{tde_datadir}/apps/kate/scripts/swaptabs.ui
-%{tde_datadir}/apps/kate/scripts/swaptabs.desktop
-%{tde_datadir}/services/javascript.desktop
-%doc kjsembed/docs/ChangeLog
-
-%post -n trinity-libkjsembed1
-/sbin/ldconfig ||:
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-%postun -n trinity-libkjsembed1
-/sbin/ldconfig ||:
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-
-##########
-
-%package -n trinity-libkjsembed-devel
-Summary:	Embedded JavaScript library (Development files)
-Group:		Development/Libraries/Other
-Requires:	trinity-libkjsembed1 = %{version}-%{release}
-
-%description -n trinity-libkjsembed-devel
-This package contains the header files and symbolic links necessary
-to develop and compile programs using the KJSEmbed library. This
-library provides JavaScript embedded scripting facilities to TDE
-applications.
-
-It also includes lots of example programs that make use of these
-bindings, plus comprehensive documentation of the bindings.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkjsembed-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kjsembed/
-%{tde_libdir}/libkjsembed.so
-%{tde_libdir}/libkjsembed.la
-%{tde_docdir}/trinity-libkjsembed-devel/
-
-%post -n trinity-libkjsembed-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkjsembed-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kjscmd
-Summary:	A script interpreter using the TDE JavaScript library
-Group:		System/Libraries
-
-%description -n trinity-kjscmd
-This package contains the kjscmd program, which is a standalone
-JavaScript interpreter using the KJSEmbed library.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-kjscmd
-%defattr(-,root,root,-)
-%{tde_bindir}/kjscmd
-%{tde_tdeappdir}/kjscmd.desktop
-%{tde_mandir}/man1/kjscmd.*
-%{tde_tdelibdir}/libjsconsoleplugin.la
-%{tde_tdelibdir}/libjsconsoleplugin.so
-
-%post -n trinity-kjscmd
-update-desktop-database >& /dev/null ||:
-
-%postun -n trinity-kjscmd
-update-desktop-database >& /dev/null ||:
-
-##########
-
-%package -n trinity-juic
-Summary:	The Qt Java UI Compiler
-Group:		Development/Languages/Java
-Requires:	trinity-libqt3-java = %{version}-%{release}
-
-%description -n trinity-juic
-This package contains the juic program, which is used to convert
-a UI description file generated by the Qt Designer, and converts
-it into a Qt Java class. It is necessary for compiling and 
-developing programs using the Qt Java bindings together with Qt
-Designer.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-juic
-%defattr(-,root,root,-)
-%{tde_bindir}/juic
-%{tde_datadir}/juic/
-
-##########
-
-%package -n trinity-libkorundum0-ruby
-Summary:	TDE bindings for Ruby [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libqt0-ruby = %{version}-%{release}
-
-%description -n trinity-libkorundum0-ruby
-This package contains the files necessary for running and developing
-Ruby code using the Korundum TDE Ruby bindings.
-
-It also includes some example programs and templates that make use of
-these bindings.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkorundum0-ruby
-%defattr(-,root,root,-)
-%{tde_bindir}/rbkdesh
-%{tde_bindir}/rbkdeapi
-%{tde_bindir}/krubyinit
-%{tde_bindir}/rbkconfig_compiler
-%{ruby_rubylibdir}/Korundum.rb
-%dir %{ruby_rubylibdir}/KDE
-%{ruby_rubylibdir}/KDE/korundum.rb
-%{ruby_arch}/korundum.la
-%{ruby_arch}/korundum.so*
-%doc korundum/ChangeLog
-
-%post -n trinity-libkorundum0-ruby
-/sbin/ldconfig || :
-
-%postun -n trinity-libkorundum0-ruby
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libqt0-ruby
-Summary:	Qt bindings for Ruby [Trinity]
-Group:		System/Libraries
-Requires:	ruby
-
-%description -n trinity-libqt0-ruby
-This package contains the files necessary for running and developing
-Ruby code using the Qt Ruby bindings.
-
-It also includes some example programs that make use of these bindings,
-plus many of the Qt Tutorial examples translated into Ruby.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt0-ruby
-%defattr(-,root,root,-)
-%{tde_bindir}/rbqtsh
-%{tde_bindir}/rbqtapi
-%{tde_bindir}/rbuic
-%{tde_bindir}/qtrubyinit
-%dir %{ruby_rubylibdir}/Qt
-%{ruby_rubylibdir}/Qt/qtruby.rb
-%{ruby_rubylibdir}/Qt.rb
-%{ruby_arch}/qtruby.so*
-%{ruby_arch}/qtruby.la
-%{ruby_arch}/qui.so*
-%{ruby_arch}/qui.la
-%doc qtruby/ChangeLog
-
-%post -n trinity-libqt0-ruby
-/sbin/ldconfig || :
-
-%postun -n trinity-libqt0-ruby
-/sbin/ldconfig || :
-
-##########
-
-%if 0
-%package -n trinity-kmozilla
-Summary:	Kmozilla for TDE
-Group:		System/Libraries
-
-%description -n trinity-kmozilla
-This package contains the kmozilla library fro TDE.
-
-%files -n trinity-kmozilla
-%defattr(-,root,root,-)
-%{tde_bindir}/kmozilla
-%{tde_libdir}/libkmozillapart.so.*
-%{tde_libdir}/libkmozillapart.so
-%{tde_libdir}/libkmozillapart.la
-%{tde_datadir}/services/kmozilla.desktop
-%endif
-
-##########
-
-%package -n trinity-xpart-notepad
-Summary:	A small XPart editor
-Group:		Productivity/Scientific/Math
-
-%description -n trinity-xpart-notepad
-xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
-
-%files -n trinity-xpart-notepad
-%defattr(-,root,root,-)
-%{tde_bindir}/shell_xparthost
-%{tde_bindir}/xp_notepad
-%{tde_libdir}/libxp_notepadpart.la
-%{tde_libdir}/libxp_notepadpart.so
-%{tde_libdir}/libxp_notepadpart.so.*
-%{tde_datadir}/services/xp_notepad.desktop
-%doc xparts/xpart_notepad/README
-
-%post -n trinity-xpart-notepad
-/sbin/ldconfig || :
-
-%postun -n trinity-xpart-notepad
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?with_gtk1}
-%package -n trinity-libgtkxparts1
-Summary:	Xparts library for GTK
-Group:		Development/Languages/Other
-
-%description -n trinity-libgtkxparts1
-This package contains the xparts library for GTK.
-
-%files -n trinity-libgtkxparts1
-%defattr(-,root,root,-)
-%{tde_libdir}/libgtkxparts.so.*
-%{tde_libdir}/libgtkxparts.la
-
-%post -n trinity-libgtkxparts1
-/sbin/ldconfig || :
-
-%postun -n trinity-libgtkxparts1
-/sbin/ldconfig || :
-%endif
-
-##########
-
-%package -n trinity-libtdexparts
-Summary:	Xparts library for TDE
-Group:		Development/Languages/Other
-
-Obsoletes:	trinity-libkdexparts1 < %{version}-%{release}
-Provides:	trinity-libkdexparts1 = %{version}-%{release}
-
-%description -n trinity-libtdexparts
-This package contains the xparts library for TDE.
-
-%files -n trinity-libtdexparts
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdexparts.so.*
-%{tde_libdir}/libkdexparts.la
-
-%post -n trinity-libtdexparts
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdexparts
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libxparts-devel
-Summary:	Xparts development files
-Group:		Development/Languages/Other
-%if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{version}-%{release}
-%endif
-Requires:	trinity-libtdexparts = %{version}-%{release}
-
-%description -n trinity-libxparts-devel
-This package contains the development files for Xparts library.
-
-%files -n trinity-libxparts-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/xkparts/
-%if 0%{?with_gtk1}
-%{tde_libdir}/libgtkxparts.so
-%endif
-%{tde_libdir}/libkdexparts.so
-
-%post -n trinity-libxparts-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libxparts-devel
-/sbin/ldconfig || :
-
-##########
-
-%package xparts-extras
-Summary:	Extra xparts for TDE [Trinity]
-Group:		Development/Languages/Other
-
-# Metapckage requires
-Requires:	trinity-xpart-notepad = %{version}-%{release}
-%if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{version}-%{release}
-%endif
-Requires:	trinity-libtdexparts = %{version}-%{release}
-Requires:	trinity-libdcop-c = %{version}-%{release}
-
-%description xparts-extras
-This package contains extra xparts-based modules for Trinity
-This includes the mozilla-konqueror plugin
-
-This package is part of the official TDE bindings module.
-
-%files xparts-extras
-%defattr(-,root,root,-)
-
-###########
-
-%package -n trinity-libdcop-c
-Summary:	DCOP bindings for C [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libdcop-c
-This package contains the DCOP bindings for C.
-
-%files -n trinity-libdcop-c
-%defattr(-,root,root,-)
-%{tde_libdir}/libdcopc.so.*
-
-%post -n trinity-libdcop-c
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop-c
-/sbin/ldconfig || :
-
-###########
-
-%package -n trinity-libdcop-c-devel
-Summary:	DCOP bindings for C, development files [Trinity]
-Group:		Development/Languages/C and C++
-Requires:	trinity-libdcop-c = %{version}-%{release}
-
-%description -n trinity-libdcop-c-devel
-This package contains the development files for DCOP bindings for C.
-
-%files -n trinity-libdcop-c-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libdcopc.so
-%{tde_libdir}/libdcopc.la
-%{tde_tdeincludedir}/dcopc/
-
-%post -n trinity-libdcop-c-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libdcop-c-devel
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Languages/Other
-
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{version}-%{release}
-
-Obsoletes:	trinity-kdebindings-devel < %{version}-%{release}
-Provides:	trinity-kdebindings-devel = %{version}-%{release}
-
-# Metapackage
-Requires:	trinity-libsmokeqt-devel = %{version}-%{release}
-Requires:	trinity-libdcop3-java-devel = %{version}-%{release}
-Requires:	trinity-libsmoketde-devel = %{version}-%{release}
-Requires:	trinity-libkjsembed-devel = %{version}-%{release}
-Requires:	trinity-libxparts-devel = %{version}-%{release}
-Requires:	trinity-libdcop-c-devel = %{version}-%{release}
-Requires:	trinity-libqt3-jni-devel = %{version}-%{release}
-Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
-
-%description devel
-This package contains the development files for the TDE bindings.
-
-%files devel
-%defattr(-,root,root,-)
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-%if "%{?perl_vendorarch}" == ""
-exit 1
-%endif
-
-# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" -e "s|rb_frame_this_func|rb_frame_last_func|g"
-%endif
-
-# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
-%__sed -i "xparts/Makefile.am" \
-  -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-unset JAVA_HOME ||:
-%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
-
-# sip/PyQt/PyKDE built separately, not here
-export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
-
-# Ruby headers, strange location ...
-if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
-  export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux"
-fi
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-if [ -d /usr/evolution28 ]; then
-  export PATH="/usr/evolution28/bin:${PATH}"
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-
-# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
-%if 0%{?suse_version} >= 1310
-EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
-%endif
-
-# Do NOT remove "%{_includedir}/tqt" from extra-includes !!!
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \
-  --with-extra-libs=%{tde_libdir} \
-  --with-pythondir=%{_usr} \
-  \
-  %{?_with_java} %{!?_with_java:--without-java} \
-  %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
-
-# Build dcopperl with specific options
-pushd dcopperl
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
-
-# [Bug #348] Ugly hack to modify the man pages directory
-sed -i Makefile \
-  -e "s|/usr/share/man|%{tde_mandir}|g"
-
-%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
-popd
-
-# smoke (not smp-safe)
-%__make -C smoke
-
-# The rest is smp-safe
-%__make %{?_smp_mflags} PYTHON=%{__python}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-
-%__make install DESTDIR=%{?buildroot} \
-  PYTHON=%{__python}
-
-# Removes some perl files
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-
-# Installs juic
-%__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
-%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
-%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
-
-# kjsembed sample files
-%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-
-# Man installation location is wrong on RHEL4...
-if [ -d "%{buildroot}%{_mandir}/man3" ]; then
-  mv -f %{buildroot}%{_mandir}/man3 %{buildroot}%{tde_mandir}/man3/
-  rm -rf %{buildroot}%{_mandir}
-fi
-
-# Move 'embedjs.desktop' to correct location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -u kjscmd  Development 
-%suse_update_desktop_file -u embedjs Development 
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec
deleted file mode 100644
index 336316c10..000000000
--- a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec
+++ /dev/null
@@ -1,1367 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:			trinity-tdeedu
-Summary:		Educational/Edutainment applications
-Version:		%{tde_version}
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:		GPLv2
-Group:			Amusements/Games
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: python-devel python
-BuildRequires: boost-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: ocaml(compiler)
-%else
-BuildRequires: ocaml
-%endif
-
-Obsoletes:		trinity-kdeedu < %{version}-%{release}
-Provides:		trinity-kdeedu = %{version}-%{release}
-Obsoletes:		trinity-kdeedu-libs < %{version}-%{release}
-Provides:		trinity-kdeedu-libs = %{version}-%{release}
-
-# Meta-package
-Requires: %{name}-data = %{version}-%{release}
-Requires: trinity-blinken = %{version}-%{release}
-Requires: trinity-kalzium = %{version}-%{release}
-Requires: trinity-kalzium-data = %{version}-%{release}
-Requires: trinity-kanagram = %{version}-%{release}
-Requires: trinity-kbruch = %{version}-%{release}
-Requires: trinity-keduca = %{version}-%{release}
-Requires: trinity-kgeography = %{version}-%{release}
-Requires: trinity-kgeography-data = %{version}-%{release}
-Requires: trinity-khangman = %{version}-%{release}
-Requires: trinity-kig = %{version}-%{release}
-Requires: trinity-kiten = %{version}-%{release}
-Requires: trinity-klatin = %{version}-%{release}
-Requires: trinity-klettres = %{version}-%{release}
-Requires: trinity-klettres-data = %{version}-%{release}
-Requires: trinity-kmplot = %{version}-%{release}
-Requires: trinity-kpercentage = %{version}-%{release}
-Requires: trinity-kstars = %{version}-%{release}
-Requires: trinity-kstars-data = %{version}-%{release}
-Requires: trinity-ktouch = %{version}-%{release}
-Requires: trinity-kturtle = %{version}-%{release}
-Requires: trinity-kverbos = %{version}-%{release}
-Requires: trinity-kvoctrain = %{version}-%{release}
-Requires: trinity-kwordquiz = %{version}-%{release}
-Requires: trinity-libtdeedu3 = %{version}-%{release}
-Requires: trinity-libkiten1 = %{version}-%{release}
-Requires: trinity-indi = %{version}-%{release}
-
-
-%description
-Educational/Edutainment applications, including:
-* blinken: Simon Says Game
-* kalzium: Periodic Table of Elements
-* kanagram: Letter Order Game
-* kbruch: Exercise Fractions
-* keduca: Tests and Exams
-* kgeography: Geography Trainer
-* khangman: Hangman Game
-* kig: Interactive Geometry
-* kiten: Japanese Reference/Study Tool
-* klatin: Latin Reviser
-* klettres: French alphabet tutor
-* kmplot: Mathematical Function Plotter
-* kpercentage: Excersie Percentages
-* kstars: Desktop Planetarium
-* ktouch: Touch Typing Tutor
-* kturtle: Logo Programming Environment
-* kverbos: Study Spanish Verbforms
-* kvoctrain: Vocabulary Trainer
-* kwordquiz: Vocabulary Trainer
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING README
-
-##########
-
-%package data
-Summary:	shared data for Trinity educational applications
-Group:		Amusements/Games
-
-%description data
-This package contains shared data necessary for running the
-educational applications provided with KDE (the K Desktop
-Environment).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/applnk/Edutainment/Languages/.directory
-%{tde_datadir}/applnk/Edutainment/Miscellaneous/.directory
-%{tde_datadir}/applnk/Edutainment/Mathematics/.directory
-%{tde_datadir}/applnk/Edutainment/Science/.directory
-%{tde_datadir}/applnk/Edutainment/Tools/.directory
-
-##########
-
-%package -n trinity-blinken
-Summary:	Trinity version of the Simon Says electronic memory game
-Group:		Amusements/Games
-#Requires:	sj-delphine-fonts
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-blinken
-Blinken is based on an electronic game released in 1978, which
-challenges players to remember sequences of increasing length.  On
-the face of the device, there are 4 different color buttons, each
-with its own distinctive sound.  These buttons light up randomly,
-creating the sequence that the player must then recall.  If the
-player is successful in remembering the sequence of lights in the
-correct order, they advance to the next stage, where an identical
-sequence with one extra step is presented.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-blinken
-%defattr(-,root,root,-)
-%{tde_bindir}/blinken
-%{tde_tdeappdir}/blinken.desktop
-%{tde_datadir}/apps/blinken/
-%{tde_datadir}/config.kcfg/blinken.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/blinken.png
-%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
-%{tde_tdedocdir}/HTML/en/blinken/
-
-%post -n trinity-blinken
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-blinken
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kalzium
-Summary:	chemistry teaching tool for Trinity
-Group:		Amusements/Games
-Requires:	trinity-kalzium-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kalzium
-Kalzium is a program which shows you the Periodic System of Elements
-(PSE).  You can use Kalzium to search for information about the
-elements or to learn facts about the PSE.
-
-Kalzium provides you with all kinds of information about the PSE.
-You can look up lots of information about the elements and also use
-visualisations to show them.
-
-You can visualise the Periodic Table of the Elements by blocks,
-groups, acidic behavior or different states of matter.  You can also
-plot data for a range of elements (weight, mean weight, density, IE1,
-IE2, electronegativity), and you can go back in time to see what
-elements were known at a given date.  In addition, on platforms where
-OCaml supports native code generation, Kalzium includes a chemical
-equation solver.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kalzium
-%defattr(-,root,root,-)
-%{tde_bindir}/kalzium
-%{tde_tdeappdir}/kalzium.desktop
-%{tde_datadir}/config.kcfg/kalzium.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kalzium.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
-%{tde_tdedocdir}/HTML/en/kalzium/
-
-%post -n trinity-kalzium
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalzium
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kalzium-data
-Summary:	data files for Kalzium
-Group:		Amusements/Games
-
-%description -n trinity-kalzium-data
-This package contains architecture-independent data files for
-Kalzium, the KDE periodic table application.  This includes pictures
-of various chemical equipment and of samples of several elements, in
-addition to the actual chemical data.
-
-See the kalzium package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kalzium-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kalzium/
-
-##########
-
-%package -n trinity-kanagram
-Summary:	letter order game for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kanagram
-KAnagram is a game that is based on the word/letter puzzles that the
-author played as a child.  A word is picked at random and displayed
-with its letters in a messed order, with difficulty dependent on the
-chosen level.  You have an unlimited number of attempts, and scores
-are kept.
-
-It is a very simply constructed game, with 3 difficulty levels of
-play.  It is fully customizable, allowing you to write in your own
-words and set your own 'look and feel' of the game.  It is aimed for
-children aged 10+ because of the difficulty, but of course everyone
-is welcome to try.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kanagram
-%defattr(-,root,root,-)
-%{tde_bindir}/kanagram
-%{tde_tdeappdir}/kanagram.desktop
-%{tde_datadir}/apps/kanagram/
-%{tde_datadir}/config.kcfg/kanagram.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kanagram.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
-%{tde_tdedocdir}/HTML/en/kanagram/
-
-%post -n trinity-kanagram
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kanagram
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kbruch
-Summary:	fraction calculation teaching tool for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kbruch
-KBruch is a small program to practice calculating with fractions.
-Different exercises are provided for this purpose.  The program
-checks the user's input and gives feedback.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kbruch
-%defattr(-,root,root,-)
-%{tde_bindir}/kbruch
-%{tde_datadir}/apps/kbruch/kbruchui.rc
-%{tde_tdeappdir}/kbruch.desktop
-%{tde_datadir}/config.kcfg/kbruch.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kbruch.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
-%{tde_tdedocdir}/HTML/en/kbruch/
-
-%post -n trinity-kbruch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbruch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-keduca
-Summary:	interactive form-based tests for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-keduca
-KEduca is a flash-card application which allows you to make
-interactive form-based tests.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-keduca
-%defattr(-,root,root,-)
-%{tde_bindir}/keduca
-%{tde_bindir}/keducabuilder
-%{tde_tdelibdir}/libkeducapart.la
-%{tde_tdelibdir}/libkeducapart.so
-%{tde_tdeappdir}/keduca.desktop
-%{tde_tdeappdir}/keducabuilder.desktop
-%{tde_datadir}/apps/keduca/
-%{tde_datadir}/config.kcfg/keduca.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keduca.png
-%{tde_datadir}/mimelnk/application/x-edu.desktop
-%{tde_datadir}/mimelnk/application/x-edugallery.desktop
-%{tde_datadir}/services/keduca_part.desktop
-%{tde_tdedocdir}/HTML/en/keduca/
-
-%post -n trinity-keduca
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-keduca
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgeography
-Summary:	Geography learning tool for Trinity
-Group:		Amusements/Games
-Requires:	trinity-kgeography-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kgeography
-KGeography contains maps allowing you to learn various countries or
-the political divisions of several countries.  It has several modes,
-including a map browser and games involving the names, capitals, or
-flags of the map divisions.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kgeography
-%defattr(-,root,root,-)
-%{tde_bindir}/kgeography
-%{tde_tdeappdir}/kgeography.desktop
-%{tde_datadir}/config.kcfg/kgeography.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
-%{tde_tdedocdir}/HTML/en/kgeography
-
-%post -n trinity-kgeography
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgeography
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgeography-data
-Summary:	data files for KGeography
-Group:		Amusements/Games
-
-%description -n trinity-kgeography-data
-This package contains architecture-independent data files for
-KGeography, the geography learning tool for KDE. This includes map
-and flag images.
-
-See the kgeography package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kgeography-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kgeography/
-
-##########
-
-%package -n trinity-khangman
-Summary:	the classical hangman game for Trinity
-Group:		Amusements/Games
-#Requires:	dustin-dustismo-sans-fonts
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-khangman
-KHangMan is a game based on the well known hangman game.  It is aimed
-for children aged 6 and above.  It has four levels of difficulty:
-Animals (animals words), Easy, Medium and Hard.
-
-A word is picked at random and the letters are hidden.  You must
-guess the word by trying one letter after another.  Each time you
-guess a wrong letter, a picture of a hangman is drawn.  You must
-guess the word before getting hanged!  You have 10 tries.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-khangman
-%defattr(-,root,root,-)
-%{tde_datadir}/config/khangmanrc
-%{tde_bindir}/khangman
-%{tde_tdeappdir}/khangman.desktop
-%{tde_datadir}/apps/khangman/
-%{tde_datadir}/config.kcfg/khangman.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khangman.png
-%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
-%{tde_tdedocdir}/HTML/en/khangman/
-
-%post -n trinity-khangman
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khangman
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kig
-Summary:	interactive geometry program for KDE
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kig
-Kig is an application for interactive geometry.  It is intended to
-serve two purposes:
-
-- to allow students to interactively explore mathematical figures and
-  concepts using the computer;
-- to serve as a WYSIWYG tool for drawing mathematical figures and
-  including them in other documents.
-
-With this program you can do geometry on a computer just like you
-would on a blackboard in a classroom.  However, the program allows
-you to move and change parts of a geometrical drawing so that you can
-see how the other parts change as a result.
-
-Kig supports loci and user-defined macros.  It also supports imports
-and exports to/from foreign file formats including Cabri, Dr. Geo,
-KGeo, KSeg and XFig.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kig
-%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/cabri.magic
-%{tde_datadir}/config/magic/drgeo.magic
-%{tde_bindir}/kig
-%{tde_bindir}/pykig.py*
-%{tde_tdelibdir}/kfile_drgeo.la
-%{tde_tdelibdir}/kfile_drgeo.so
-%{tde_tdelibdir}/kfile_kig.la
-%{tde_tdelibdir}/kfile_kig.so
-%{tde_tdelibdir}/libkigpart.la
-%{tde_tdelibdir}/libkigpart.so
-%{tde_tdeappdir}/kig.desktop
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%{tde_datadir}/apps/katepart/syntax/python-kig.xml
-%endif
-%{tde_datadir}/apps/kig/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kig_doc.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kig.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kig.svgz
-%{tde_datadir}/mimelnk/application/x-cabri.desktop
-%{tde_datadir}/mimelnk/application/x-drgeo.desktop
-%{tde_datadir}/mimelnk/application/x-kig.desktop
-%{tde_datadir}/mimelnk/application/x-kgeo.desktop
-%{tde_datadir}/mimelnk/application/x-kseg.desktop
-%{tde_datadir}/services/kfile_drgeo.desktop
-%{tde_datadir}/services/kfile_kig.desktop
-%{tde_datadir}/services/kig_part.desktop
-%{tde_tdedocdir}/HTML/en/kig/
-
-%post -n trinity-kig
-for i in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kig
-for i in crystalsvg hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kiten
-Summary:	Japanese reference/study tool for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-#Requires:	ttf-kochi-gothic | ttf-kochi-mincho
-
-%description -n trinity-kiten
-Kiten is a Japanese reference and study tool for KDE.  It is an
-application with multiple functions.  Firstly, it is a convenient
-English to Japanese and Japanese to English dictionary.  Secondly, it
-is a Kanji dictionary, with multiple ways to look up specific
-characters.  Thirdly, it is a tool to help you learn Kanji.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kiten
-%defattr(-,root,root,-)
-%{tde_bindir}/kiten
-%{tde_bindir}/kitengen
-%{tde_tdeappdir}/kiten.desktop
-%{tde_tdedocdir}/HTML/en/kiten/
-%{tde_datadir}/icons/hicolor/*/apps/kiten.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
-
-%post -n trinity-kiten
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kiten
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klatin
-Summary:	application to help revise/teach Latin
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-klatin
-KLatin is a program to help revise Latin.  There are three "sections"
-in which different aspects of the language can be revised.  These are
-the vocabulary, grammar and verb testing sections.  In addition there
-is a set of revision notes that can be used for self-guided revision.
-
-In the vocabulary section an XML file is loaded containing various
-words and their local language translations.  KLatin asks you what
-each of these words translate into.  The questions take place in a
-multiple-choice environment.
-
-In the grammar and verb sections KLatin asks for a particular part of
-a noun or a verb, such as the "ablative singular", or the "1st person
-indicative passive plural", and is not multiple choice.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klatin
-%defattr(-,root,root,-)
-%{tde_bindir}/klatin
-%{tde_tdeappdir}/klatin.desktop
-%{tde_datadir}/apps/klatin/
-%{tde_datadir}/config.kcfg/klatin.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klatin.png
-%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
-%{tde_tdedocdir}/HTML/en/klatin/
-
-%post -n trinity-klatin
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klatin
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klettres
-Summary:	foreign alphabet tutor for Trinity
-Group:		Amusements/Games
-Requires:	trinity-klettres-data = %{version}-%{release}
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-klettres
-KLettres is an application specially designed to help the user to
-learn the alphabet in a new language and then to learn to read simple
-syllables.  The user can be a young child aged from two and a half or
-an adult that wants to learn the basics of a foreign language.
-
-Seven languages are currently available: Czech, Danish, Dutch,
-English, French, Italian and Slovak.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klettres
-%defattr(-,root,root,-)
-%{tde_datadir}/config/klettresrc
-%{tde_bindir}/klettres
-%{tde_tdeappdir}/klettres.desktop
-%{tde_datadir}/config.kcfg/klettres.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klettres.png
-%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
-%{tde_tdedocdir}/HTML/en/klettres/
-
-%post -n trinity-klettres
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klettres
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klettres-data
-Summary:	data files for KLettres foreign alphabet tutor
-Group:		Amusements/Games
-
-%description -n trinity-klettres-data
-This package contains architecture-independent data files for
-KLettres, the foreign alphabet tutor for KDE.  This includes sound
-files and graphics.
-
-See the klettres package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klettres-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/klettres/
-
-##########
-
-%package -n trinity-kmplot
-Summary:	mathematical function plotter for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kmplot
-KmPlot is a mathematical function plotter for KDE.  It has a powerful
-built-in parser.  You can plot different functions simultaneously and
-combine them to build new functions.
-
-KmPlot supports parametric functions and functions in polar
-coordinates.  Several grid modes are supported.  Plots may be printed
-with high precision in the correct scale.
-
-KmPlot also provides some numerical and visual features, like filling
-and calculating the area between the plot and the first axis, finding
-maximum and minimum values, changing function parameters dynamically
-and plotting derivatives and integral functions.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kmplot
-%defattr(-,root,root,-)
-%{tde_bindir}/kmplot
-%{tde_tdelibdir}/libkmplotpart.la
-%{tde_tdelibdir}/libkmplotpart.so
-%{tde_tdeappdir}/kmplot.desktop
-%{tde_datadir}/apps/kmplot/
-%{tde_datadir}/config.kcfg/kmplot.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kmplot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmplot.svgz
-%{tde_datadir}/mimelnk/application/x-kmplot.desktop
-%{tde_datadir}/services/kmplot_part.desktop
-%{tde_tdedocdir}/HTML/en/kmplot/
-
-%post -n trinity-kmplot
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmplot
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpercentage
-Summary:	percentage calculation teaching tool for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kpercentage
-KPercentage is a small math application that will help pupils to
-improve their skills in calculating percentages.
-
-There is a special training section for the three basic tasks.
-Finally the pupil can select a random mode, in which all three tasks
-are mixed randomly.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kpercentage
-%defattr(-,root,root,-)
-%{tde_bindir}/kpercentage
-%{tde_tdeappdir}/kpercentage.desktop
-%{tde_datadir}/apps/kpercentage/
-%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
-%{tde_tdedocdir}/HTML/en/kpercentage/
-
-%post -n trinity-kpercentage
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpercentage
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kstars
-Summary:	desktop planetarium for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-Requires:	trinity-kstars-data = %{version}-%{release}
-Requires:	trinity-indi = %{version}-%{release}
-
-%description -n trinity-kstars
-KStars is a graphical desktop planetarium for KDE.  It depicts an
-accurate simulation of the night sky, including stars,
-constellations, star clusters, nebulae, galaxies, all planets, the
-Sun, the Moon, comets and asteroids.  You can see the sky as it
-appears from any location on Earth, on any date.
-
-The user interface is highly intuitive and flexible.  The display can
-be panned and zoomed with the mouse, and you can easily identify
-objects and track their motion across the sky.  KStars includes many
-powerful features, yet the interface is clean and simple and fun to
-use.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kstars
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kstarsrc
-%{tde_bindir}/kstars
-%{tde_tdeappdir}/kstars.desktop
-%{tde_datadir}/config.kcfg/kstars.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kstars.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
-%{tde_tdedocdir}/HTML/en/kstars/
-
-%post -n trinity-kstars
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kstars
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kstars-data
-Summary:	data files for KStars desktop planetarium
-Group:		Amusements/Games
-
-%description -n trinity-kstars-data
-This package contains architecture-independent data files for KStars,
-the graphical desktop planetarium for KDE.  This includes star
-catalogues and astronomical images.
-
-See the kstars package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kstars-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kstars/
-
-##########
-
-%package -n trinity-ktouch
-Summary:	touch typing tutor for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-ktouch
-KTouch is a program for learning touch typing - it helps you learn to
-type on a keyboard quickly and correctly.  Every finger has its place
-on the keyboard with associated keys to press.
-
-KTouch helps you learn to touch type by providing you with text to
-train on, and adjusts to different levels depending on how good you
-are.  It can display which key to press next, and the correct finger
-to use.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-ktouch
-%defattr(-,root,root,-)
-%{tde_bindir}/ktouch
-%{tde_tdeappdir}/ktouch.desktop
-%{tde_datadir}/apps/ktouch/
-%{tde_datadir}/config.kcfg/ktouch.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ktouch.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
-%{tde_tdedocdir}/HTML/en/ktouch/
-
-%post -n trinity-ktouch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktouch
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kturtle
-Summary:	educational Logo programming environment
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kturtle
-KTurtle is an educational programming environment using the Logo
-programming language.  It tries to make programming as easy and
-accessible as possible.  This makes KTurtle suitable for teaching
-kids the basics of mathematics, geometry and programming.
-
-The commands used to program are in the style of the Logo programming
-language.  The unique feature of Logo is that the commands are often
-translated into the speaking language of the programmer.
-
-KTurtle is named after "the turtle" that plays a central role in the
-programming environment.  The user programs the turtle, using the
-Logo commands, to draw a picture on the canvas.
-
-Note that this version of Logo is only focused on the educational
-qualities of the programming language and will not try to suit
-professional programmers' needs.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kturtle
-%defattr(-,root,root,-)
-%{tde_bindir}/kturtle
-%{tde_tdeappdir}/kturtle.desktop
-%{tde_datadir}/apps/katepart/syntax/logohighlightstyle*
-%{tde_datadir}/apps/kturtle/
-%{tde_datadir}/config.kcfg/kturtle.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
-%{tde_tdedocdir}/HTML/en/kturtle/
-
-%post -n trinity-kturtle
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kturtle
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kverbos
-Summary:	Spanish verb form study application for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kverbos
-Kverbos allows the user to learn the forms of Spanish verbs.  The
-program suggests a verb and a time and the user enters the different
-verb forms.  The program corrects the user input and gives feedback.
-
-The user can edit the list of the verbs that can be studied.  The
-program can build regular verb forms by itself.  Irregular verb forms
-have to be entered by the user.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kverbos
-%defattr(-,root,root,-)
-%{tde_bindir}/kverbos
-%{tde_tdeappdir}/kverbos.desktop
-%{tde_datadir}/apps/kverbos/
-%{tde_datadir}/config.kcfg/kverbos.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/kverbosuser.png
-%{tde_datadir}/icons/hicolor/*/apps/kverbos.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
-%{tde_tdedocdir}/HTML/en/kverbos/
-
-%post -n trinity-kverbos
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kverbos
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kvoctrain
-Summary:	vocabulary trainer for Trinity
-Group:		Amusements/Games
-Requires:	perl
-Requires:	perl-libwww-perl
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kvoctrain
-KVocTrain is a little utility to help you train your vocabulary when
-you are trying to learn a foreign language.  You can create your own
-database with the words you need.  It is intended as a replacement
-for index (flash) cards.
-
-You probably remember flashcards from school.  The teacher would
-write the original expression on the front side of the card and the
-translation on the back.  Then look at the cards one after another.
-If you knew the translation, you could put it away.  If you failed,
-you put it back to try again.
-
-KVocTrain is not intended to teach you grammar or other sophisticated
-things.  This is and probably will stay beyond the scope of this
-application.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kvoctrain
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kvoctrainrc
-%{tde_bindir}/kvoctrain
-%{tde_bindir}/spotlight2kvtml
-%{tde_libdir}/libkvoctraincore.so.*
-%{tde_tdeappdir}/kvoctrain.desktop
-%{tde_datadir}/apps/kvoctrain/
-%{tde_datadir}/mimelnk/text/x-kvtml.desktop
-%{tde_datadir}/config.kcfg/kvoctrain.kcfg
-%{tde_datadir}/config.kcfg/languagesettings.kcfg
-%{tde_datadir}/config.kcfg/presettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
-%{tde_tdedocdir}/HTML/en/kvoctrain/
-
-%post -n trinity-kvoctrain
-/sbin/ldconfig || :
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kvoctrain
-/sbin/ldconfig || :
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kwordquiz
-Summary:	flashcard and vocabulary learning program for Trinity
-Group:		Amusements/Games
-Requires:	trinity-tdeedu-data = %{version}-%{release}
-
-%description -n trinity-kwordquiz
-KWordQuiz is a flashcard-based tool that helps you to master new
-vocabularies. It may be a language or any other kind of terminology.
-
-KWordQuiz can open several types of vocabulary data.  Supported are
-kvtml files used by other KDE programs such as KVocTrain, wql files
-used by WordQuiz for Windows, csv files with comma-separated text,
-and xml.gz files created by Pauker (http://pauker.sourceforge.net).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kwordquiz
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kwordquizrc
-%{tde_bindir}/kwordquiz
-%{tde_tdeappdir}/kwordquiz.desktop
-%{tde_datadir}/apps/kwordquiz/
-%{tde_datadir}/config.kcfg/kwordquiz.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kwordquiz.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kwordquiz.svg
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kwordquiz_doc.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
-%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
-%{tde_tdedocdir}/HTML/en/kwordquiz/
-
-%post -n trinity-kwordquiz
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kwordquiz
-for i in hicolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libtdeedu3
-Summary:	library for use with Trinity educational apps
-Group:		Environment/Libraries
-
-%description -n trinity-libtdeedu3
-The KDE-based library libtdeedu is used with educational
-applications.  It currently provides support for data plotting and
-vocabulary items (including a parser for kvtml vocabulary files).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libtdeedu3
-%defattr(-,root,root,-)
-%{tde_libdir}/libextdate.so.*
-%{tde_libdir}/libkdeeducore.so.*
-%{tde_libdir}/libkdeeduplot.so.*
-%{tde_libdir}/libkdeeduui.so.*
-
-%post -n trinity-libtdeedu3
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdeedu3
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdeedu-devel
-Summary:	development files for Trinity educational library
-Group:		Development/Libraries
-Requires:	trinity-libtdeedu3 = %{version}-%{release}
-
-%description -n trinity-libtdeedu-devel
-The KDE-based library libtdeedu is used with educational
-applications.  It currently provides support for data plotting and
-vocabulary items (including a parser for kvtml vocabulary files).
-
-Development files for libtdeedu are included in this package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libtdeedu-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libkdeedu/
-%{tde_libdir}/libextdate.la
-%{tde_libdir}/libextdate.so
-%{tde_libdir}/libkdeeducore.la
-%{tde_libdir}/libkdeeducore.so
-%{tde_libdir}/libkdeeduui.la
-%{tde_libdir}/libkdeeduui.so
-%{tde_libdir}/libkdeeduplot.la
-%{tde_libdir}/libkdeeduplot.so
-
-%post -n trinity-libtdeedu-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdeedu-devel
-/sbin/ldconfig || :
-
-
-##########
-
-%package -n trinity-libkiten1
-Summary:	library for Kiten Japanese reference/study tool
-Group:		Environment/Libraries
-#Requires:	kanjidic
-
-%description -n trinity-libkiten1
-Kiten is a Japanese reference/study tool for KDE.  The library
-libkiten contains portions of Kiten that may be useful for other
-applications.  These portions include dictionary, character lookup
-and widget classes.
-
-This package contains the libkiten library along with supporting
-data, such as Japanese language data files and GUI resource files.
-For further information, see the kiten package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libkiten1
-%defattr(-,root,root,-)
-%{tde_libdir}/libkiten.so.*
-%{tde_datadir}/apps/kiten/
-%{tde_datadir}/config.kcfg/kiten.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/kanjidic.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_add.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_remove.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/kanjidic.png
-%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png
-%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png
-
-%post -n trinity-libkiten1
-for i in crystalsvg locolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkiten1
-for i in crystalsvg locolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkiten-devel
-Summary:	development files for Kiten library
-Group:		Development/Libraries
-Requires:	trinity-libkiten1 = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-
-%description -n trinity-libkiten-devel
-Kiten is a Japanese reference/study tool for KDE.  The library
-libkiten contains portions of Kiten that may be useful for other
-applications.  These portions include dictionary, character lookup
-and widget classes.
-
-Development files for libkiten are included in this package.  For
-further information, see the kiten package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libkiten-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libkiten/
-%{tde_libdir}/libkiten.la
-%{tde_libdir}/libkiten.so
-
-%post -n trinity-libkiten-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkiten-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-indi
-Summary:	Instrument Neutral Distributed Interface for astronomical devices
-Group:		Amusements/Games
-
-%description -n trinity-indi
-INDI is an Instrument Neutral Distributed Interface control protocol for
-astronomical devices, which provides a framework that decouples low level
-hardware drivers from high level front end clients. Clients that use the
-device drivers are completely unaware of the device capabilities and
-communicate with the device drivers and build a completely dynamic GUI
-based on the services provided by the device.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-indi
-%defattr(-,root,root,-)
-%{tde_bindir}/apmount
-%{tde_bindir}/apogee_ppi
-%{tde_bindir}/celestrongps
-%{tde_bindir}/fliccd
-%{tde_bindir}/fliwheel
-%{tde_bindir}/indiserver
-%{tde_bindir}/lx200_16
-%{tde_bindir}/lx200autostar
-%{tde_bindir}/lx200basic
-%{tde_bindir}/lx200classic
-%{tde_bindir}/lx200generic
-%{tde_bindir}/lx200gps
-%{tde_bindir}/meade_lpi
-%{tde_bindir}/sbigccd
-%{tde_bindir}/skycommander
-%{tde_bindir}/temma
-%{tde_bindir}/v4ldriver
-%{tde_bindir}/v4lphilips
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-libtdeedu-devel = %{version}-%{release}
-Requires:	trinity-libkiten-devel = %{version}-%{release}
-
-Obsoletes:	trinity-kdeedu-devel < %{version}-%{release}
-Provides:	trinity-kdeedu-devel = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%doc libkdeedu/AUTHORS libkdeedu/README
-# kstars
-%{tde_tdeincludedir}/kstarsinterface.h
-%{tde_tdeincludedir}/simclockinterface.h
-# kvoctrain
-%{tde_libdir}/libkvoctraincore.la
-%{tde_libdir}/libkvoctraincore.so
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-   --enable-kig-python-scripting \
-%else
-   --disable-kig-python-scripting \
-%endif
-   --enable-ocamlsolver
-
-%__make %{_smp_mflags} \
-  OCAMLLIB=$(ocamlc -where) \
-  FACILELIB=$(ocamlc -where)
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec
deleted file mode 100644
index 0b457e10a..000000000
--- a/redhat/main/tdegames/tdegames-3.5.13.2.spec
+++ /dev/null
@@ -1,1647 +0,0 @@
-#
-# spec file for package tdegames (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdegames
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Trinity Desktop Environment - Games
-Version:		%{tde_version}
-Release:		%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:		trinity-kdegames < %{version}-%{release}
-Provides:		trinity-kdegames = %{version}-%{release}
-Obsoletes:		trinity-kdegames-libs < %{version}-%{release}
-Provides:		trinity-kdegames-libs = %{version}-%{release}
-
-Requires: trinity-libtdegames1 = %{version}-%{release}
-Requires: trinity-tdegames-card-data = %{version}-%{release}
-Requires: trinity-atlantik = %{version}-%{release}
-Requires: trinity-kasteroids = %{version}-%{release}
-Requires: trinity-katomic = %{version}-%{release}
-Requires: trinity-kbackgammon = %{version}-%{release}
-Requires: trinity-kbattleship = %{version}-%{release}
-Requires: trinity-kblackbox = %{version}-%{release}
-Requires: trinity-kbounce = %{version}-%{release}
-Requires: trinity-kenolaba = %{version}-%{release}
-Requires: trinity-kfouleggs = %{version}-%{release}
-Requires: trinity-kgoldrunner = %{version}-%{release}
-Requires: trinity-kjumpingcube = %{version}-%{release}
-Requires: trinity-klickety = %{version}-%{release}
-Requires: trinity-klines = %{version}-%{release}
-Requires: trinity-kmahjongg = %{version}-%{release}
-Requires: trinity-kmines = %{version}-%{release}
-Requires: trinity-knetwalk = %{version}-%{release}
-Requires: trinity-kolf = %{version}-%{release}
-Requires: trinity-konquest = %{version}-%{release}
-Requires: trinity-kpat = %{version}-%{release}
-Requires: trinity-kpoker = %{version}-%{release}
-Requires: trinity-kreversi = %{version}-%{release}
-Requires: trinity-ksame = %{version}-%{release}
-Requires: trinity-kshisen = %{version}-%{release}
-Requires: trinity-ksirtet = %{version}-%{release}
-Requires: trinity-ksmiletris = %{version}-%{release}
-Requires: trinity-ksnake = %{version}-%{release}
-Requires: trinity-ksokoban = %{version}-%{release}
-Requires: trinity-kspaceduel = %{version}-%{release}
-Requires: trinity-ktron = %{version}-%{release}
-Requires: trinity-ktuberling = %{version}-%{release}
-Requires: trinity-twin4 = %{version}-%{release}
-Requires: trinity-lskat = %{version}-%{release}
-
-
-%description
-Games and gaming libraries for the Trinity Desktop Environment.
-Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
-kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
-ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
-
-%files
-
-##########
-
-%package devel
-Summary:	Development files for %{name} 
-Group:		Amusements/Games/Other
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	trinity-libtdegames-devel = %{version}-%{release}
-Requires:	trinity-atlantik-devel = %{version}-%{release}
-Requires:	trinity-kolf-devel = %{version}-%{release}
-
-Obsoletes:		trinity-kdegames-devel < %{version}-%{release}
-Provides:		trinity-kdegames-devel = %{version}-%{release}
-
-%description devel
-Install %{name}-devel if you wish to develop or compile games for the
-TDE desktop.
-
-%files devel
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-libtdegames1
-Summary:	Trinity games library and common files
-Group:		Amusements/Games/Other
-
-%description -n trinity-libtdegames1
-This library provides a common infrastructure for several of the
-games in the TDE distribution. Features include standardized menu
-items, high score handling, card display, and network connections
-including chat capabilities.
-
-This package is part of TDE, and a component of the TDE games module.
-
-%files -n trinity-libtdegames1
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdegames.so.*
-%dir %{tde_datadir}/apps/kdegames
-%dir %{tde_datadir}/apps/kdegames/pics
-%{tde_datadir}/apps/kdegames/pics/star.png
-%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
-%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-
-%post -n trinity-libtdegames1
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdegames1
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdegames-devel
-Summary:	Trinity games library headers
-Group:		Development/Libraries/Other
-Requires:	trinity-libtdegames1 = %{version}-%{release}
-
-%description -n trinity-libtdegames-devel
-This package is necessary if you want to develop your own games using
-the TDE games library.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-libtdegames-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdeincludedir}/kgame
-%{tde_libdir}/libkdegames.so
-%{tde_libdir}/libkdegames.la
-
-##########
-
-%package card-data
-Summary:	Card decks for Trinity games
-Group:		Amusements/Games/Other
-
-%description card-data
-Several different collections of card images for use by TDE games.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files card-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/carddecks/
-
-##########
-
-%package -n trinity-atlantik
-Summary:	TDE client for Monopoly-like network games
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-atlantik
-This is a TDE client for playing Monopoly-like boardgames on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game, as well as the Atlantik
-game in which the property includes several major cities in North
-America and Europe.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-atlantik
-%defattr(-,root,root,-)
-%{tde_bindir}/atlantik
-%{tde_libdir}/libatlantic.so.*
-%{tde_libdir}/libatlantikclient.so.*
-%{tde_libdir}/libatlantikui.so.*
-%{tde_tdelibdir}/kio_atlantik.la
-%{tde_tdelibdir}/kio_atlantik.so
-%{tde_datadir}/services/atlantik.protocol
-%{tde_tdeappdir}/atlantik.desktop
-%{tde_datadir}/icons/hicolor/*/apps/atlantik.png
-%{tde_datadir}/apps/atlantik/
-%{tde_tdedocdir}/HTML/en/atlantik/
-
-%post -n trinity-atlantik
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-atlantik
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-atlantik-devel
-Summary:	Development files for Atlantik
-Group:		Development/Libraries/Other
-Requires:	trinity-atlantik = %{version}-%{release}
-
-%description -n trinity-atlantik-devel
-This package contains header files for compiling programs against the
-libraries which come with Atlantik.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-atlantik-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/atlantik
-%{tde_tdeincludedir}/atlantic
-%{tde_libdir}/libatlantic.so
-%{tde_libdir}/libatlantic.la
-%{tde_libdir}/libatlantikclient.so
-%{tde_libdir}/libatlantikclient.la
-%{tde_libdir}/libatlantikui.so
-%{tde_libdir}/libatlantikui.la
-
-%post -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-atlantik-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kasteroids
-Summary:	Asteroids for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kasteroids
-You know this game.  It is based on Warwick Allison's QwSpriteField
-widget.
-
-The objective of kasteroids is to destroy all the asteroids on the
-screen to advance to the next level. Your ship is destroyed if it
-makes contact with an asteroid.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kasteroids
-%defattr(-,root,root,-)
-%{tde_bindir}/kasteroids
-%{tde_datadir}/icons/hicolor/*/apps/kasteroids.png
-%{tde_tdeappdir}/kasteroids.desktop
-%{tde_datadir}/apps/kasteroids/
-%{tde_datadir}/config.kcfg/kasteroids.kcfg
-%{tde_tdedocdir}/HTML/en/kasteroids/
-
-%post -n trinity-kasteroids
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kasteroids
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-katomic
-Summary:	Atomic Entertainment game for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-katomic
-This is a puzzle game, in which the object is to assemble a molecule
-from its atoms on a Sokoban-like board.  On each move, an atom goes
-as far as it can in a specified direction before being stopped by a
-wall or another atom.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-katomic
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/katomic/
-%{tde_datadir}/icons/hicolor/*/apps/katomic.png
-%{tde_tdeappdir}/katomic.desktop
-%{tde_bindir}/katomic
-%{tde_tdedocdir}/HTML/en/katomic/
-
-%post -n trinity-katomic
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-katomic
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kbackgammon
-Summary:	A Backgammon game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kbackgammon
-KBackgammon is a backgammon program for Trinity. It is based on the
-code, ideas and concepts of KFibs (which is a FIBS client for
-TDE1). For a short time, KBackgammon was called bacKgammon (if you
-know somebody who is still using bacKgammon, please force them to
-upgrade :-)).
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbackgammon
-%defattr(-,root,root,-)
-%{tde_bindir}/kbackgammon
-%{tde_tdeappdir}/kbackgammon.desktop
-%{tde_datadir}/apps/kbackgammon/
-%{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
-%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
-%{tde_tdedocdir}/HTML/en/kbackgammon/
-
-%post -n trinity-kbackgammon
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbackgammon
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kbattleship
-Summary:	Battleship game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kbattleship
-This is an implementation of the Battleship game.  Each player tries
-to be the first to sink all the opponent's ships by firing "blindly"
-at them.  The game has options to play over a network connection or
-against the computer.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbattleship
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kbattleship/
-%{tde_datadir}/apps/zeroconf/_kbattleship._tcp
-%{tde_datadir}/icons/hicolor/*/apps/kbattleship.png
-%{tde_tdeappdir}/kbattleship.desktop
-%{tde_bindir}/kbattleship
-%{tde_tdedocdir}/HTML/en/kbattleship/
-
-%post -n trinity-kbattleship
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbattleship
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kblackbox
-Summary:	A simple logical game for the Trinity project
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kblackbox
-KBlackBox is a game of hide and seek played on an grid of boxes. Your
-opponent (Random number generator, in this case) has hidden several
-balls within this box. By shooting rays into the box and observing
-where they emerge it is possible to deduce the positions of the
-hidden balls. The fewer rays you use to find the balls, the lower
-your score.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kblackbox
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kblackbox/
-%{tde_datadir}/icons/hicolor/*/apps/kblackbox.png
-%{tde_tdeappdir}/kblackbox.desktop
-%{tde_bindir}/kblackbox
-%{tde_tdedocdir}/HTML/en/kblackbox/
-
-%post -n trinity-kblackbox
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kblackbox
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kbounce
-Summary:	Jezzball clone for the K Desktop Environment
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kbounce
-This is a clone of the popular Jezzball game originally created by
-Microsoft. Jezzball is one of the rare and simple games requiring
-skill, timing, and patience in order to be successful.  A ball begins
-to bounce off of an area enclosed by four borders (like a
-square). You must move your pointer to certain areas within the
-square. Upon clicking, a new border is constructed at a relatively
-quick pace. You can change the direction of the borders by 90 degrees
-as well. Ultimately, you must force the ball to bounce around in a
-smaller, and smaller area as time goes by without the ball ever
-touching the borders as they are being constructed. If a ball touches
-a certain part of the border as it is being built, the game is over.
-After 75% of the original space has been blocked off from the moving
-ball, you advance one level, and one more ball is added to the mix in
-the following level.
-
-This game was previously known as kjezz.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbounce
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kbounce/
-%{tde_tdeappdir}/kbounce.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kbounce.png
-%{tde_bindir}/kbounce
-%{tde_tdedocdir}/HTML/en/kbounce/
-
-%post -n trinity-kbounce
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbounce
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kenolaba
-Summary:	Enolaba board game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kenolaba
-kenolaba is a simple board strategy game that is played by two
-players. There are red and yellow pieces for each player. Beginning
-from a start position where each player has 14 pieces, moves are
-drawn until one player has pushed 6 pieces of his opponent out of the
-board.
-
-This game was previously known as kabalone, and was inspired by the
-board game Abalone by Abalone SA, France.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kenolaba
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kenolaba/
-%{tde_datadir}/icons/hicolor/*/apps/kenolaba.png
-%{tde_tdeappdir}/kenolaba.desktop
-%{tde_bindir}/kenolaba
-%{tde_tdedocdir}/HTML/en/kenolaba/
-
-%post -n trinity-kenolaba
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kenolaba
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfouleggs
-Summary:	A TDE clone of the Japanese PuyoPuyo game
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kfouleggs
-KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
-features such as multiplayer games against human or AI, and network
-play.  If you have played Tetris or one of its many clones, you will
-find KFouleggs easy to learn.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kfouleggs
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/kfouleggs.desktop
-%{tde_datadir}/apps/kfouleggs/
-%{tde_datadir}/config.kcfg/kfouleggs.kcfg
-%{tde_bindir}/kfouleggs
-%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
-%{tde_tdedocdir}/HTML/en/kfouleggs/
-
-%post -n trinity-kfouleggs
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfouleggs
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgoldrunner
-Summary:	A Trinity clone of the Loderunner arcade game
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kgoldrunner
-KGoldrunner, a game of action and puzzle solving.  Run through the
-maze, dodge your enemies, collect all the gold and climb up to the
-next level.
-
-You must guide the hero with the mouse or keyboard and collect all
-the gold nuggets, then you can climb up into the next level.  Your
-enemies are also after the gold and they will kill you if they catch
-you!
-
-The problem is you have no weapon to kill them.  All you can do is
-run away, dig holes in the floor to trap them or lure them into some
-area where they cannot hurt you.  After a short time a trapped enemy
-climbs out of his hole, but if it closes before that, he will die and
-reappear somewhere else.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kgoldrunner
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kgoldrunner/
-%{tde_datadir}/icons/hicolor/*/apps/kgoldrunner.png
-%{tde_tdeappdir}/KGoldrunner.desktop
-%{tde_bindir}/kgoldrunner
-%{tde_tdedocdir}/HTML/en/kgoldrunner/
-
-%post -n trinity-kgoldrunner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgoldrunner
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kjumpingcube
-Summary:	Tactical one or two player game
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-kjumpingcube
-KJumpingCube is a simple tactical game. You can play it against the
-computer or against a friend. The playing field consists of squares
-that contains points.  By clicking on the squares you can increase
-the points and if the points reach a maximum the points will jump to
-the squares neighbours and take them over. Winner is the one, who
-owns all squares.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kjumpingcube
-%defattr(-,root,root,-)
-%{tde_bindir}/kjumpingcube
-%{tde_datadir}/icons/hicolor/*/apps/kjumpingcube.png
-%{tde_datadir}/apps/kjumpingcube/
-%{tde_tdeappdir}/kjumpingcube.desktop
-%{tde_datadir}/config.kcfg/kjumpingcube.kcfg
-%{tde_tdedocdir}/HTML/en/kjumpingcube/
-
-%post -n trinity-kjumpingcube
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjumpingcube
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klickety
-Summary:	A Clickomania-like game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-klickety
-Klickety is an adaptation of the (perhaps) well-known Clickomania
-game; it is very similar to the "same" game.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-klickety
-%defattr(-,root,root,-)
-%{tde_bindir}/klickety
-%{tde_tdeappdir}/klickety.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klickety.png
-%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
-%{tde_datadir}/apps/klickety/
-%{tde_tdedocdir}/HTML/en/klickety/
-
-%post -n trinity-klickety
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klickety
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klines
-Summary:	Color lines for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-klines
-KLines is a simple game. It is played by one player, so there is only
-one winner :-). You play for fun and against the high score. It was
-inspired by a well known game - "Color lines", written for DOS by
-Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in
-1992.
-
-The main rules of the game are as simple as possible: you move (using
-the mouse) marbles from cell to cell and build lines (horizontal,
-vertical or diagonal). When a line contains 5 or more marbles, they
-are removed and your score grows. After each turn the computer drops
-three more marbles.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-klines
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/klines/
-%{tde_tdeappdir}/klines.desktop
-%{tde_bindir}/klines
-%{tde_datadir}/config.kcfg/klines.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klines.png
-%{tde_tdedocdir}/HTML/en/klines/
-
-%post -n trinity-klines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmahjongg
-Summary:	The classic mahjongg game for Trinity project
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kmahjongg
-Your mission in this game is to remove all tiles from the game board. A
-matching pair of tiles can be removed, if they are 'free', which means that
-no other tiles block them on the left or right side.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kmahjongg
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmahjongg/
-%{tde_datadir}/icons/hicolor/*/apps/kmahjongg.png
-%{tde_tdeappdir}/kmahjongg.desktop
-%{tde_bindir}/kmahjongg
-%{tde_datadir}/config.kcfg/kmahjongg.kcfg
-%{tde_tdedocdir}/HTML/en/kmahjongg/
-
-%post -n trinity-kmahjongg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmahjongg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmines
-Summary:	Minesweeper for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kmines
-KMines is the classic Minesweeper game. You must uncover all the
-empty cases without blowing on a mine.
-
-When you uncover a case, a number appears : it indicates how many
-mines surround this case. If there is no number the neighbour cases
-are automatically uncovered. In your process of uncovering secure
-cases, it is very useful to put a flag on the cases which contain a
-mine.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kmines
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/hicolor/*/apps/kmines.png
-%{tde_tdeappdir}/kmines.desktop
-%{tde_datadir}/apps/kmines/
-%{tde_bindir}/kmines
-%{tde_tdedocdir}/HTML/en/kmines/
-
-%post -n trinity-kmines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmines
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knetwalk
-Summary:	A game for system administrators
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-knetwalk
-This game presents the player with a rectangular field consisting of
-a server, several clients, and pieces of wire.  The object is to
-rotate these elements until every client is connected to the server,
-and no wires are left unconnected.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-knetwalk
-%defattr(-,root,root,-)
-%{tde_bindir}/knetwalk
-%{tde_datadir}/apps/knetwalk
-%{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
-%{tde_tdeappdir}/knetwalk.desktop
-
-%post -n trinity-knetwalk
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knetwalk
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kolf
-Summary:	Minigolf game for TDE
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kolf
-This is a minigolf game for TDE that allows you to go through different
-golf courses and waste an exorbitant amount of time.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kolf
-%defattr(-,root,root,-)
-%{tde_datadir}/config/magic/kolf.magic
-%{tde_datadir}/apps/kolf/
-%{tde_bindir}/kolf
-%{tde_tdeappdir}/kolf.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kolf.png
-%{tde_datadir}/mimelnk/application/x-kolf.desktop
-%{tde_datadir}/mimelnk/application/x-kourse.desktop
-%{tde_libdir}/libkdeinit_kolf.so
-%{tde_libdir}/libkdeinit_kolf.la
-%{tde_tdelibdir}/kolf.la
-%{tde_tdelibdir}/kolf.so
-%{tde_libdir}/libkolf.so.1
-%{tde_libdir}/libkolf.so.1.2.0
-%{tde_tdedocdir}/HTML/en/kolf/
-
-%post -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolf
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kolf-devel
-Summary:	Development files for Kolf
-Group:		Development/Libraries/Other
-Requires:	trinity-kolf = %{version}-%{release}
-
-%description -n trinity-kolf-devel
-This package contains headers and development libraries for compiling
-Kolf plugins.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kolf-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kolf
-%{tde_libdir}/libkolf.la
-%{tde_libdir}/libkolf.so
-
-%post -n trinity-kolf-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kolf-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konquest
-Summary:	TDE based GNU-Lactic Konquest game
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-konquest
-This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
-game. The goal of the game is to expand your interstellar empire
-across the galaxy and, of course, crush your rivals in the process.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-konquest
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konquest/
-%{tde_datadir}/icons/hicolor/*/apps/konquest.png
-%{tde_tdeappdir}/konquest.desktop
-%{tde_bindir}/konquest
-%{tde_tdedocdir}/HTML/en/konquest/
-
-%post -n trinity-konquest
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konquest
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpat
-Summary:	Trinity solitaire patience game
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-kpat
-KPatience is a collection of 14 card games. All the games are single
-player games.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kpat
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/hicolor/*/apps/kpat.png
-%{tde_datadir}/apps/kpat/
-%{tde_tdeappdir}/kpat.desktop
-%{tde_bindir}/kpat
-%{tde_tdedocdir}/HTML/en/kpat/
-
-%post -n trinity-kpat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpoker
-Summary:	Trinity based Poker clone
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-kpoker
-KPoker is a TDE compliant clone of those highly addictive pocket
-video poker games which are sometimes called "Videopoker" as well.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kpoker
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kpoker/
-%{tde_datadir}/icons/hicolor/*/apps/kpoker.png
-%{tde_tdeappdir}/kpoker.desktop
-%{tde_bindir}/kpoker
-%{tde_tdedocdir}/HTML/en/kpoker/
-
-%post -n trinity-kpoker
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpoker
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kreversi
-Summary:	Reversi for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kreversi
-Reversi is a simple strategy game that is played by two
-players. There is only one type of piece - one side of it is black,
-the other white. If a player captures a piece on the board, that
-piece is turned and belongs to that player. The winner is the person
-that has more pieces of his own color on the board and if there are
-no more moves possible.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kreversi
-%defattr(-,root,root,-)
-%{tde_bindir}/kreversi
-%{tde_tdeappdir}/kreversi.desktop
-%{tde_datadir}/apps/kreversi/
-%{tde_datadir}/config.kcfg/kreversi.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/lastmoves.png
-%{tde_datadir}/icons/crystalsvg/*/actions/legalmoves.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/lastmoves.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kreversi.png
-%{tde_tdedocdir}/HTML/en/kreversi/
-
-%post -n trinity-kreversi
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kreversi
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksame
-Summary:	SameGame for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-ksame
-KSame is a simple game. It's played by one player, so there is only
-one winner :-) You play for fun and against the high score. It has
-been inspired by SameGame, that is only famous on the Macintosh
-platform.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksame
-%defattr(-,root,root,-)
-%{tde_bindir}/ksame
-%{tde_datadir}/icons/hicolor/*/apps/ksame.png
-%{tde_datadir}/apps/ksame/
-%{tde_tdeappdir}/ksame.desktop
-%{tde_tdedocdir}/HTML/en/ksame/
-
-%post -n trinity-ksame
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksame
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kshisen
-Summary:	Shisen-Sho for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kshisen
-KShisen-Sho is a single-player-game similar to Mahjongg and uses the
-same set of tiles as Mahjongg.
-
-The object of the game is to remove all tiles from the field.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kshisen
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kshisen/
-%{tde_datadir}/config.kcfg/kshisen.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kshisen.png
-%{tde_tdeappdir}/kshisen.desktop
-%{tde_bindir}/kshisen
-%{tde_tdedocdir}/HTML/en/kshisen/
-
-%post -n trinity-kshisen
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kshisen
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksirtet
-Summary:	Tetris and Puyo-Puyo games for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-ksirtet
-This program is a clone of the well known game Tetris. You must fit
-the falling pieces to form full lines. You can rotate and translate
-the falling piece. The game ends when no more piece can fall ie when
-your incomplete lines reach the top of the board.
-
-Every time you have destroyed 10 lines, you gain a level and the
-pieces fall quicker (exactly the piece falls from a line each
-1/(1+level) second).
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksirtet
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/ksirtet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksirtet.png
-%{tde_datadir}/apps/ksirtet/
-%{tde_bindir}/ksirtet
-%{tde_datadir}/config.kcfg/ksirtet.kcfg
-%{tde_tdedocdir}/HTML/en/ksirtet/
-
-%post -n trinity-ksirtet
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksirtet
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksmiletris
-Summary:	Tetris like game for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ksmiletris
-This is a game with falling blocks composed of different types of
-smilies. The object of the game is to "crack a smile" by guiding
-blocks so there are two or more of the same symbol vertically.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksmiletris
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/ksmiletris/
-%{tde_datadir}/icons/hicolor/*/apps/ksmiletris.png
-%{tde_tdeappdir}/ksmiletris.desktop
-%{tde_bindir}/ksmiletris
-%{tde_tdedocdir}/HTML/en/ksmiletris/
-
-%post -n trinity-ksmiletris
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksmiletris
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksnake
-Summary:	Snake Race for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ksnake
-Snake Race is a game of speed and agility. You are a hungry snake and
-are trying to eat all the apples in the room before getting out!
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksnake
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/ksnake/
-%{tde_datadir}/config.kcfg/ksnake.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksnake.png
-%{tde_tdeappdir}/ksnake.desktop
-%{tde_bindir}/ksnake
-%{tde_tdedocdir}/HTML/en/ksnake/
-
-%post -n trinity-ksnake
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnake
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksokoban
-Summary:	Sokoban game for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-ksokoban
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
-"warehouse keeper". The idea is that you are a warehouse keeper
-trying to push crates to their proper locations in a warehouse.
-
-The problem is that you cannot pull the crates or step over them. If
-you are not careful, some of the crates can get stuck in wrong places
-and/or block your way.
-
-It can be rather difficult just to solve a level. But if you want to
-make it even harder, you can try to minimise the number of moves
-and/or pushes you use to solve the level.
-
-To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in KSokoban. These
-are marked (easy) in the level collection menu. Of course, these
-levels can be fun for adults too, for example if you don't want to
-expose yourself to too much mental strain.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksokoban
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/ksokoban.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
-%{tde_bindir}/ksokoban
-%{tde_tdedocdir}/HTML/en/ksokoban/
-
-%post -n trinity-ksokoban
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksokoban
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kspaceduel
-Summary:	Arcade two-player space game for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kspaceduel
-KSpaceduel is an space arcade game for two players.
-
-Each player controls a ship that flies around the sun and tries to
-shoot at the other ship. You can play KSpaceduel with another person,
-against the computer, or you can have the computer control both ships
-and play each other.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kspaceduel
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kspaceduel/
-%{tde_datadir}/icons/hicolor/*/apps/kspaceduel.png
-%{tde_tdeappdir}/kspaceduel.desktop
-%{tde_bindir}/kspaceduel
-%{tde_datadir}/config.kcfg/kspaceduel.kcfg
-%{tde_tdedocdir}/HTML/en/kspaceduel/
-
-%post -n trinity-kspaceduel
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kspaceduel
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktron
-Summary:	Tron clone for the K Desktop Environment
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ktron
-The object of the game is to avoid running into walls, your own tail,
-and that of your opponent.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ktron
-%defattr(-,root,root,-)
-%{tde_bindir}/ktron
-%{tde_datadir}/icons/hicolor/*/apps/ktron.png
-%{tde_tdeappdir}/ktron.desktop
-%{tde_datadir}/apps/ktron/
-%{tde_datadir}/config.kcfg/ktron.kcfg
-%{tde_tdedocdir}/HTML/en/ktron/
-
-%post -n trinity-ktron
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktron
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktuberling
-Summary:	Potato Guy for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ktuberling
-KTuberling is a game intended for small children. Of course, it may
-be suitable for adults who have remained young at heart.
-
-It is a potato editor. That means that you can drag and drop eyes,
-mouths, moustache, and other parts of face and goodies onto a
-potato-like guy.  Similarly, you have a penguin on which you can drop
-other stuff.
-
-There is no winner for the game. The only purpose is to make the
-funniest faces you can.
-
-There is a museum (like a "Madame Tusseau" gallery) where you can
-find many funny examples of decorated potatoes. Of course, you can
-send your own creations to the programmer, Eric Bischoff, who will
-include them in the museum if he gets some spare time.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ktuberling
-%defattr(-,root,root,-)
-%{tde_bindir}/ktuberling
-%{tde_datadir}/icons/hicolor/*/apps/ktuberling.png
-%{tde_tdeappdir}/ktuberling.desktop
-%{tde_datadir}/apps/ktuberling/
-%{tde_datadir}/mimelnk/application/x-tuberling.desktop
-%{tde_tdedocdir}/HTML/en/ktuberling/
-
-%post -n trinity-ktuberling
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktuberling
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-twin4
-Summary:	Connect Four clone for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-twin4
-Four wins is a game for two players. Each player is represented by a
-colour (yellow and red). The goal of the game is to get four
-connected pieces of your colour into a row, column or any
-diagonal. This is done by placing one of your pieces into any of the
-seven columns. A piece will begin to fill a column from the bottom,
-i.e. it will fall down until it reaches the ground level or another
-stone. After a move is done it is the turn of the other player. This
-is repeated until the game is over, i.e. one of the players has four
-pieces in a row, column or diagonal or no more moves are possible
-because the board is filled.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-twin4
-%defattr(-,root,root,-)
-%{tde_bindir}/kwin4
-%{tde_bindir}/kwin4proc
-%{tde_datadir}/apps/kwin4/
-%{tde_datadir}/config.kcfg/kwin4.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kwin4.png
-%{tde_tdeappdir}/kwin4.desktop
-%{tde_tdedocdir}/HTML/en/kwin4/
-
-%post -n trinity-twin4
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-twin4
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-lskat
-Summary:	Lieutnant Skat card game for Trinity
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-lskat
-Lieutnant Skat (from German Offiziersskat) is a card game for two
-players. It is roughly played according to the rules of Skat but with
-only two players and simplified rules.
-
-Every player has a set of cards in front of him/her, half of them
-covered and half of them open. Both players try to win more than 60
-of the 120 possible points. After 16 moves all cards are played and
-the game ends.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-lskat
-%defattr(-,root,root,-)
-%{tde_bindir}/lskat
-%{tde_bindir}/lskatproc
-%{tde_datadir}/apps/lskat/
-%{tde_datadir}/icons/hicolor/*/apps/lskat.png
-%{tde_tdeappdir}/lskat.desktop
-%{tde_tdedocdir}/HTML/en/lskat/
-
-%post -n trinity-lskat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-lskat
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR="%{tde_prefix}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --disable-setgid
-
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir atlantik/libatlantic/.libs
-ln -s . atlantik/libatlantic/.libs/.libs
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kasteroids      Game ArcadeGame
-%suse_update_desktop_file -r KGoldrunner     Game ArcadeGame
-%suse_update_desktop_file -r ksnake          Game ArcadeGame
-%suse_update_desktop_file -r kspaceduel      Game ArcadeGame
-%suse_update_desktop_file -r ktron           Game ArcadeGame
-%suse_update_desktop_file -r kfouleggs       Game BlocksGame
-%suse_update_desktop_file -r ksirtet         Game BlocksGame
-%suse_update_desktop_file -r klickety        Game BoardGame
-%suse_update_desktop_file -r ksmiletris      Game BlocksGame
-%suse_update_desktop_file -r ktuberling      Game KidsGame
-%suse_update_desktop_file -r atlantik        Game BoardGame
-%suse_update_desktop_file -r kbackgammon     Game BoardGame
-%suse_update_desktop_file -r kbattleship     Game BoardGame
-%suse_update_desktop_file -r kblackbox       Game BoardGame
-%suse_update_desktop_file -r kenolaba        Game BoardGame
-%suse_update_desktop_file -r kmahjongg       Game BoardGame
-%suse_update_desktop_file -r kreversi        Game BoardGame
-%suse_update_desktop_file -r kshisen         Game BoardGame
-%suse_update_desktop_file -r kwin4           Game BoardGame
-%suse_update_desktop_file -r kpat            Game CardGame
-%suse_update_desktop_file -r kpoker          Game CardGame
-%suse_update_desktop_file -r lskat           Game CardGame
-%suse_update_desktop_file -r katomic         Game LogicGame
-%suse_update_desktop_file -r kjumpingcube    Game LogicGame
-%suse_update_desktop_file -r klines          Game LogicGame
-%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
-%suse_update_desktop_file -r kmines          Game LogicGame
-%suse_update_desktop_file -r konquest        Game LogicGame
-%suse_update_desktop_file -r ksame           Game LogicGame
-%suse_update_desktop_file -r ksokoban        Game LogicGame
-%suse_update_desktop_file -r kbounce         Game LogicGame
-%suse_update_desktop_file -r kolf            Game SportsGame
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec
deleted file mode 100644
index a625a2b6a..000000000
--- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec
+++ /dev/null
@@ -1,1332 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-tdegraphics
-Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
-
-License:	GPL
-Summary:    Trinity Desktop Environment - Graphics Applications
-
-Group:      Applications/Multimedia
-Prefix:		%{tde_prefix}
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-# TDE
-## RHEL / Fedora specific patches
-# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
-Patch3:		kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
-
-# [tdegraphics] Fix build on RHEL4
-Patch201:	kdegraphics-3.5.13.1-fix_rhel4_libraries.patch
-
-BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: trinity-tdebase-devel >= %{version}
-BuildRequires: gettext
-BuildRequires: libmng-devel
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires: %{_lib}png15-devel
-%else
-BuildRequires: libpng-devel
-%endif
-BuildRequires: libtiff-devel
-BuildRequires: automake libtool
-BuildRequires: libusb-devel
-BuildRequires: pcre-devel
-
-# GIF support
-%if 0%{?suse_version}
-BuildRequires: giflib-devel
-%else
-BuildRequires: libungif-devel
-%endif
-
-# GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
-%else
-BuildRequires: gphoto2-devel
-%endif
-
-# PAPER support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_paper 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}paper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	libpaper-devel
-%endif
-%endif
-
-# T1LIB support
-%if 0%{?suse_version} && 0%{?suse_version} <= 1230
-%define with_t1lib 1
-BuildRequires:	t1lib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora}
-%define with_t1lib 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}t1lib-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	t1lib-devel
-%endif
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sane1-devel
-# kuickshow
-#BuildRequires:	%{_lib}imlib-devel
-# kpovmodeler
-BuildRequires:	%{_lib}xi-devel
-# kgamma
-BuildRequires:	%{_lib}xxf86vm-devel
-# ksvg
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xmu-devel
-%else
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-# kpovmodeler
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-%else
-BuildRequires:	sane-backends-devel
-
-# kuickshow
-#BuildRequires:	imlib-devel
-
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires: libdrm-devel
-
-# kpovmodeler
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%else
-BuildRequires:	libXi-devel
-
-# kgamma
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# ksvg
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%else
-BuildRequires:	libXmu-devel
-%endif
-%endif
-
-# kpovmodeler
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1220
-BuildRequires:	Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
-%else
-BuildRequires:	Mesa-devel
-%endif
-%else
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
-%endif
-%endif
-
-#kfile-plugin
-BuildRequires:	OpenEXR-devel
-
-# kpdf
-%if 0%{?suse_version} == 1140
-BuildRequires: freetype2-devel
-%else
-BuildRequires: freetype-devel
-%endif
-
-# poppler
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires: poppler-devel >= 0.12
-#BuildRequires:	poppler-qt-devel >= 0.12
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel >= 0.12
-BuildRequires:	trinity-poppler-qt3-devel >= 0.12
-%endif
-
-# ksvg
-BuildRequires: fontconfig-devel
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libart_lgpl-devel
-
-# kuickshow
-#define build_kuickshow 1
-BuildRequires: fribidi-devel
-
-# kamera
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define build_kamera 1
-%endif
-
-# kmrml
-#define build_kmrml 1
-#Requires:		gift
-Obsoletes:		trinity-kmrml
-
-Obsoletes:	trinity-kdegraphics < %{version}-%{release}
-Provides:	trinity-kdegraphics = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{version}-%{release}
-
-
-%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}}
-Requires: trinity-kcoloredit = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: trinity-kdvi = %{version}-%{release}
-Requires: trinity-kfax = %{version}-%{release}
-Requires: trinity-kfaxview = %{version}-%{release}
-Requires: trinity-kgamma = %{version}-%{release}
-Requires: trinity-kghostview = %{version}-%{release}
-Requires: trinity-kiconedit = %{version}-%{release}
-%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}}
-Requires: trinity-kolourpaint = %{version}-%{release}
-Requires: trinity-kooka = %{version}-%{release}
-Requires: trinity-kpdf = %{version}-%{release}
-Requires: trinity-kpovmodeler = %{version}-%{release}
-Requires: trinity-kruler = %{version}-%{release}
-Requires: trinity-ksnapshot = %{version}-%{release}
-Requires: trinity-ksvg = %{version}-%{release}
-Requires: trinity-kview = %{version}-%{release}
-Requires: trinity-kviewshell = %{version}-%{release}
-Requires: trinity-libkscan = %{version}-%{release}
-Requires: trinity-libpoppler-tqt = %{version}-%{release}
-
-%description
-Graphics applications for the Trinity Desktop Environment, including
-%if 0%{?build_kamera}
-* kamera (digital camera support)
-%endif
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kfax
-* kfaxview
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-* kooka (scanner application)
-* kpdf (displays PDF files)
-* kpovmodler
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README
-
-##########
-
-%if 0%{?build_kamera}
-
-%package -n trinity-kamera
-Summary:	Digital camera io_slave for Konqueror
-Group:		Applications/Graphics
-
-%description -n trinity-kamera
-This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
-to allow access to your camera's pictures with the URL camera:/
-
-%post -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kamera
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%files -n trinity-kamera
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kamera.la
-%{tde_tdelibdir}/kcm_kamera.so
-%{tde_tdelibdir}/kio_kamera.la
-%{tde_tdelibdir}/kio_kamera.so
-%{tde_tdeappdir}/kamera.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
-%{tde_datadir}/icons/crystalsvg/*/apps/camera.png
-%{tde_datadir}/icons/crystalsvg/*/devices/camera.png
-%{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png
-%{tde_datadir}/services/camera.protocol
-%{tde_tdedocdir}/HTML/en/kamera/
-
-%endif
-
-##########
-
-%package -n trinity-kcoloredit
-Summary:	A color palette editor and color picker for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kcoloredit
-This package contains two programs, a color palette editor and also a color
-picker.
-
-%files -n trinity-kcoloredit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcolorchooser
-%{tde_bindir}/kcoloredit
-%{tde_tdeappdir}/kcolorchooser.desktop
-%{tde_tdeappdir}/kcoloredit.desktop
-%{tde_datadir}/apps/kcoloredit/kcoloreditui.rc
-%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
-%{tde_tdedocdir}/HTML/en/kcoloredit/
-
-%post -n trinity-kcoloredit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcoloredit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	TDE metainfo plugins for graphic files
-Group:		Environment/Libraries
- 
-%description kfile-plugins
-This packages provides meta information for graphic files (file sizes,
-tags, etc. all from within the file manager).
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/gsthumbnail.la
-%{tde_tdelibdir}/gsthumbnail.so
-%{tde_tdelibdir}/kfile_bmp.la
-%{tde_tdelibdir}/kfile_bmp.so
-%{tde_tdelibdir}/kfile_dds.la
-%{tde_tdelibdir}/kfile_dds.so
-%{tde_tdelibdir}/kfile_dvi.la
-%{tde_tdelibdir}/kfile_dvi.so
-%{tde_tdelibdir}/kfile_exr.la
-%{tde_tdelibdir}/kfile_exr.so
-%{tde_tdelibdir}/kfile_gif.la
-%{tde_tdelibdir}/kfile_gif.so
-%{tde_tdelibdir}/kfile_ico.la
-%{tde_tdelibdir}/kfile_ico.so
-%{tde_tdelibdir}/kfile_jpeg.la
-%{tde_tdelibdir}/kfile_jpeg.so
-%{tde_tdelibdir}/kfile_pcx.la
-%{tde_tdelibdir}/kfile_pcx.so
-%{tde_tdelibdir}/kfile_pdf.la
-%{tde_tdelibdir}/kfile_pdf.so
-%{tde_tdelibdir}/kfile_png.la
-%{tde_tdelibdir}/kfile_png.so
-%{tde_tdelibdir}/kfile_pnm.la
-%{tde_tdelibdir}/kfile_pnm.so
-%{tde_tdelibdir}/kfile_ps.la
-%{tde_tdelibdir}/kfile_ps.so
-%{tde_tdelibdir}/kfile_raw.la
-%{tde_tdelibdir}/kfile_raw.so
-%{tde_tdelibdir}/kfile_rgb.la
-%{tde_tdelibdir}/kfile_rgb.so
-%{tde_tdelibdir}/kfile_tga.la
-%{tde_tdelibdir}/kfile_tga.so
-%{tde_tdelibdir}/kfile_tiff.la
-%{tde_tdelibdir}/kfile_tiff.so
-%{tde_tdelibdir}/kfile_xbm.la
-%{tde_tdelibdir}/kfile_xbm.so
-%{tde_tdelibdir}/kfile_xpm.la
-%{tde_tdelibdir}/kfile_xpm.so
-%{tde_datadir}/services/gsthumbnail.desktop
-%{tde_datadir}/services/kfile_bmp.desktop
-%{tde_datadir}/services/kfile_dds.desktop
-%{tde_datadir}/services/kfile_dvi.desktop
-%{tde_datadir}/services/kfile_exr.desktop
-%{tde_datadir}/services/kfile_gif.desktop
-%{tde_datadir}/services/kfile_ico.desktop
-%{tde_datadir}/services/kfile_jpeg.desktop
-%{tde_datadir}/services/kfile_pcx.desktop
-%{tde_datadir}/services/kfile_pdf.desktop
-%{tde_datadir}/services/kfile_png.desktop
-%{tde_datadir}/services/kfile_pnm.desktop
-%{tde_datadir}/services/kfile_ps.desktop
-%{tde_datadir}/services/kfile_raw.desktop
-%{tde_datadir}/services/kfile_rgb.desktop
-%{tde_datadir}/services/kfile_tga.desktop
-%{tde_datadir}/services/kfile_tiff.desktop
-%{tde_datadir}/services/kfile_xbm.desktop
-%{tde_datadir}/services/kfile_xpm.desktop
-
-##########
-
-%package -n trinity-kdvi
-Summary:	Dvi viewer for TDE
-Group:		Applications/Graphics
-
-%description -n trinity-kdvi
-This program and KPart allow the user to display *.DVI files from TeX.
-
-%files -n trinity-kdvi
-%defattr(-,root,root,-)
-%{tde_bindir}/kdvi
-%{tde_tdelibdir}/kdvipart.la
-%{tde_tdelibdir}/kdvipart.so
-%{tde_tdeappdir}/kdvi.desktop
-%{tde_datadir}/apps/kdvi/
-%{tde_datadir}/config.kcfg/kdvi.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
-%{tde_datadir}/services/kdvimultipage.desktop
-%{tde_tdedocdir}/HTML/en/kdvi/
-
-%post -n trinity-kdvi
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdvi
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfax
-Summary:	G3/G4 fax viewer for Trinity
-Group:		Applications/Graphics
-Requires:	libtiff
-
-%description -n trinity-kfax
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-%files -n trinity-kfax
-%defattr(-,root,root,-)
-%{tde_bindir}/kfax
-%{tde_tdeappdir}/kfax.desktop
-%{tde_datadir}/apps/kfax/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
-
-%post -n trinity-kfax
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfax
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfaxview
-Summary:	G3/G4 fax viewer for Trinity using kviewshell
-Group:		Applications/Graphics
-
-%description -n trinity-kfaxview
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-This faxviewer uses kviewshell and is intended to replace the standalone
-kfax application once it reproduces all of kfax's features.
-
-%files -n trinity-kfaxview
-%defattr(-,root,root,-)
-%{tde_bindir}/kfaxview
-%{tde_libdir}/libkfaximage.so.*
-%{tde_tdelibdir}/kfaxviewpart.*
-%{tde_tdeappdir}/kfaxview.desktop
-%{tde_datadir}/apps/kfaxview/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{tde_datadir}/services/kfaxmultipage.desktop
-%{tde_datadir}/services/kfaxmultipage_tiff.desktop
-
-%post -n trinity-kfaxview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kfaxview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kgamma
-Summary:	Gamma correction module for the Trinity Control Center
-Group:		Applications/Graphics
-
-%description -n trinity-kgamma
-KGamma is a Trinity Control Center module for gamma calibration/correction
-of XFree86. With proper gamma settings, your display (websites, images,
-etc.) will look the same on your monitor as on other monitors.
-
-Homepage: http://kgamma.berlios.de/index2.php
-
-%files -n trinity-kgamma
-%defattr(-,root,root,-)
-%{tde_bindir}/xf86gammacfg
-%{tde_tdelibdir}/kcm_kgamma.la
-%{tde_tdelibdir}/kcm_kgamma.so
-%{tde_tdeappdir}/kgamma.desktop
-%{tde_datadir}/apps/kgamma/
-%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
-%{tde_tdedocdir}/HTML/en/kgamma/
-
-%post -n trinity-kgamma
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgamma
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kghostview
-Summary:	PostScript viewer for Trinity
-Group:		Applications/Graphics
-Requires:	ghostscript
-
-%description -n trinity-kghostview
-KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
-Ghostview program which is used to view documents prepared in Adobe's
-PostScript page description language. PostScript is the major page
-description language for printing on UNIX systems, and this application is
-useful to preview material intended for printing, or for reading documents
-online.
-
-%files -n trinity-kghostview
-%defattr(-,root,root,-)
-%{tde_bindir}/kghostview
-%{tde_tdelibdir}/libkghostviewpart.la
-%{tde_tdelibdir}/libkghostviewpart.so
-%{tde_libdir}/libkghostviewlib.so.*
-%{tde_tdeappdir}/kghostview.desktop
-%{tde_datadir}/apps/kconf_update/kghostview.upd
-%{tde_datadir}/apps/kconf_update/update-to-xt-names.pl
-%{tde_datadir}/apps/kghostview/
-%{tde_datadir}/config.kcfg/kghostview.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
-%{tde_datadir}/services/kghostview_part.desktop
-%{tde_tdedocdir}/HTML/en/kghostview/
-
-%post -n trinity-kghostview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kghostview
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-tdeiconedit
-Summary:	An icon editor for Trinity
-Group:		Applications/Graphics
-
-Obsoletes:	trinity-kiconedit < %{version}-%{release}
-Provides:	trinity-kiconedit = %{version}-%{release}
-
-%description -n trinity-tdeiconedit
-TDEIconedit allows you easily to create and edit icons.
-
-%files -n trinity-tdeiconedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kiconedit
-%{tde_tdeappdir}/kiconedit.desktop
-%{tde_datadir}/apps/kiconedit/
-%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
-%{tde_tdedocdir}/HTML/en/kiconedit/
-
-%post -n trinity-tdeiconedit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdeiconedit
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?build_kmrml}
-
-%package -n trinity-kmrml
-Summary: 	A Konqueror plugin for searching pictures
-Group:		Applications/Graphics
-
-%description -n trinity-kmrml
-MRML is short for Multimedia Retrieval Markup Language, which defines a
-protocol for querying a server for images based on their content. See 
-http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
-MRML server.
-
-%files -n trinity-kmrml
-%defattr(-,root,root,-)
-%{tde_bindir}/mrmlsearch
-%{tde_tdelibdir}/kcm_kmrml.la
-%{tde_tdelibdir}/kcm_kmrml.so
-%{tde_tdelibdir}/kded_daemonwatcher.la
-%{tde_tdelibdir}/kded_daemonwatcher.so
-%{tde_tdelibdir}/kio_mrml.la
-%{tde_tdelibdir}/kio_mrml.so
-%{tde_tdelibdir}/libkmrmlpart.la
-%{tde_tdelibdir}/libkmrmlpart.so
-%{tde_tdelibdir}/mrmlsearch.la
-%{tde_tdelibdir}/mrmlsearch.so
-%{tde_libdir}/libkdeinit_mrmlsearch.so
-%{tde_tdeappdir}/kcmkmrml.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-%{tde_datadir}/mimelnk/text/mrml.desktop
-%{tde_datadir}/services/kded/daemonwatcher.desktop
-%{tde_datadir}/services/mrml.protocol
-%{tde_datadir}/services/mrml_part.desktop
-
-%post -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kmrml
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%endif
-
-##########
-
-%package -n trinity-kolourpaint
-Summary:	A simple paint program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kolourpaint
-KolourPaint is a very simple paint program for Trinity. It aims to be
-conceptually simple to understand; providing a level of functionality
-targeted towards the average user. It's designed for daily tasks like:
-
-* Painting - drawing diagrams and "finger painting" 
-* Image Manipulation - editing screenshots and photos; applying effects 
-* Icon Editing - drawing clipart and logos with transparency 
-
-It's not an unusable and monolithic program where simple tasks like
-drawing lines become near impossible. Nor is it so simple that it lacks
-essential features like Undo/Redo.
-
-Homepage: http://kolourpaint.sourceforge.net
-
-%files -n trinity-kolourpaint
-%defattr(-,root,root,-)
-%{tde_bindir}/kolourpaint
-%{tde_tdeappdir}/kolourpaint.desktop
-%{tde_datadir}/apps/kolourpaint/
-%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
-%{tde_tdedocdir}/HTML/en/kolourpaint/
-
-%post -n trinity-kolourpaint
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kolourpaint
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kooka
-Summary:	Scanner program for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kooka
-Kooka is an open source GNU/Linux scan program based on SANE and
-KScan library.
-
-Kooka helps you to handle the most important scan parameters, find the
-correct image file format to save and manage your scanned images. It
-offers support for different OCR modules. Libkscan, a autonomous part
-of Kooka, provides a scan service for easy and consistent use to all
-KDE applications.
-
-Install ocrad or gocr if you wish to enable optical character recognition
-in kooka.
-
-Homepage: http://kooka.kde.org/
-
-%files -n trinity-kooka
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kookarc
-%{tde_bindir}/kooka
-%{tde_tdeappdir}/kooka.desktop
-%{tde_datadir}/apps/kooka/
-%{tde_tdedocdir}/HTML/en/kooka/
-
-%post -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kooka
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpdf
-Summary:	PDF viewer for Trinity
-Group:		Applications/Graphics
-#Recommends: kghostview-trinity (= ${binary:Version})
-
-%description -n trinity-kpdf
-KPDF allows you to view PDF (Portable Document Format) files. This package
-includes kpdfpart so you can embed in konqueror or run as a standalone
-application.
-
-%files -n trinity-kpdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kpdf
-%{tde_tdelibdir}/libkpdfpart.la
-%{tde_tdelibdir}/libkpdfpart.so
-%{tde_tdeappdir}/kpdf.desktop
-%{tde_datadir}/apps/kpdf/shell.rc
-%{tde_datadir}/apps/kpdfpart/part.rc
-%{tde_datadir}/config.kcfg/kpdf.kcfg
-%{tde_tdedocdir}/HTML/en/kpdf/
-%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
-%{tde_datadir}/services/kpdf_part.desktop
-
-%post -n trinity-kpdf
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kpdf
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kpovmodeler
-Summary:	A graphical editor for povray scenes
-Group:		Applications/Graphics
-#Requires:	povray
-
-%description -n trinity-kpovmodeler
-KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
-modeling and composition program for creating POV-Ray scenes in KDE.
-
-For most modelers, POV-Ray is nothing but a rendering engine. This greatly
-limits the innate possibilities of the POV-Ray scripted language. This
-is not the case for KPovModeler, which allows you to use all the features
-of POV-Ray through the translation of POV-Ray language into a graphical
-tree.
-
-kpovmodeler uses the povray package, currently available only in Debian's
-non-free, unsupported repository.
-
-Homepage: http://www.kpovmodeler.org
-
-%files -n trinity-kpovmodeler
-%defattr(-,root,root,-)
-%{tde_bindir}/kpovmodeler
-%{tde_libdir}/libkpovmodeler.so.*
-%{tde_tdelibdir}/libkpovmodelerpart.*
-%{tde_tdeappdir}/kpovmodeler.desktop
-%{tde_datadir}/apps/kpovmodeler/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
-
-%post -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kpovmodeler
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kruler
-Summary:	A screen ruler and color measurement tool for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kruler
-Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
-
-%files -n trinity-kruler
-%defattr(-,root,root,-)
-%{tde_bindir}/kruler
-%{tde_tdeappdir}/kruler.desktop
-%{tde_datadir}/applnk/Graphics/kruler.desktop
-%{tde_datadir}/apps/kruler/
-%{tde_datadir}/icons/hicolor/*/apps/kruler.png
-%{tde_tdedocdir}/HTML/en/kruler/
-
-%post -n trinity-kruler
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kruler
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksnapshot
-Summary:	Screenshot utility for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksnapshot
-KSnapshot is a simple applet for taking screenshots. It is capable of 
-capturing images of either the whole desktop or just a single window. 
-The images can then be saved in a variety of formats.
-
-%files -n trinity-ksnapshot
-%defattr(-,root,root,-)
-%{tde_bindir}/ksnapshot
-%{tde_tdeappdir}/ksnapshot.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
-%{tde_tdedocdir}/HTML/en/ksnapshot/
-
-%post -n trinity-ksnapshot
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ksnapshot
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksvg
-Summary:	SVG viewer for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-ksvg
-KSVG allows you view SVG (scalable vector graphics) files. This package
-includes kpart so you can embed it in konqueror and a standalone
-application.
-
-%files -n trinity-ksvg
-%defattr(-,root,root,-)
-%{tde_bindir}/printnodetest
-%{tde_bindir}/svgdisplay
-%{tde_tdelibdir}/libksvgplugin.la
-%{tde_tdelibdir}/libksvgplugin.so
-%{tde_tdelibdir}/libksvgrendererlibart.la
-%{tde_tdelibdir}/libksvgrendererlibart.so
-%{tde_tdelibdir}/svgthumbnail.la
-%{tde_tdelibdir}/svgthumbnail.so
-%{tde_libdir}/libksvg.so.0
-%{tde_libdir}/libksvg.so.0.0.1
-%{tde_libdir}/libtext2path.so.0
-%{tde_libdir}/libtext2path.so.0.0.0
-%{tde_datadir}/apps/ksvg/ksvgplugin.rc
-%{tde_datadir}/services/ksvglibartcanvas.desktop
-%{tde_datadir}/services/ksvgplugin.desktop
-%{tde_datadir}/services/svgthumbnail.desktop
-%{tde_datadir}/servicetypes/ksvgrenderer.desktop
-
-%post -n trinity-ksvg
-/sbin/ldconfig || :
-
-%postun -n trinity-ksvg
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kview
-Summary:	Simple image viewer/converter for Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kview
-KView is a simple image viewer and converter application. It supports
-a number of plugins, which add an array of basic editing capabilities
-as well.
-
-%files -n trinity-kview
-%defattr(-,root,root,-)
-%{tde_bindir}/kview
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
-%{tde_tdelibdir}/kview.la
-%{tde_tdelibdir}/kview.so
-%{tde_tdelibdir}/kview_browserplugin.la
-%{tde_tdelibdir}/kview_browserplugin.so
-%{tde_tdelibdir}/kview_effectsplugin.la
-%{tde_tdelibdir}/kview_effectsplugin.so
-%{tde_tdelibdir}/kview_presenterplugin.la
-%{tde_tdelibdir}/kview_presenterplugin.so
-%{tde_tdelibdir}/kview_scannerplugin.la
-%{tde_tdelibdir}/kview_scannerplugin.so
-%{tde_tdelibdir}/libkviewcanvas.la
-%{tde_tdelibdir}/libkviewcanvas.so
-%{tde_tdelibdir}/libkviewviewer.la
-%{tde_tdelibdir}/libkviewviewer.so
-%{tde_libdir}/libkdeinit_kview.so
-%{tde_libdir}/libkimageviewer.so.*
-%{tde_tdelibdir}/libphotobook.la
-%{tde_tdelibdir}/libphotobook.so
-%{tde_tdeappdir}/kview.desktop
-%{tde_datadir}/apps/kview/
-%{tde_datadir}/apps/kviewviewer/
-%{tde_datadir}/apps/photobook/photobookui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
-%{tde_datadir}/icons/hicolor/*/apps/kview.png
-%{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
-%{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
-%{tde_datadir}/services/kviewcanvas.desktop
-%{tde_datadir}/services/kviewviewer.desktop
-%{tde_datadir}/services/photobook.desktop
-%{tde_datadir}/servicetypes/kimageviewer.desktop
-%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
-%{tde_tdedocdir}/HTML/en/kview/
-
-%post -n trinity-kview
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-%postun -n trinity-kview
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kviewshell
-Summary:	Generic framework for viewer applications in Trinity
-Group:		Applications/Graphics
-
-%description -n trinity-kviewshell
-KViewShell is a generic viewing framework that allows the graphical
-applications, such as the kview image viewer, to be embedded in other
-KDE applications, such as Konqueror.
-
-KViewShell comes with a djvuviewpart plugin included, for viewing
-DjVu images.
-
-%files -n trinity-kviewshell
-%defattr(-,root,root,-)
-%{tde_bindir}/kviewshell
-%{tde_libdir}/libdjvu.la
-%{tde_libdir}/libdjvu.so
-%{tde_tdelibdir}/djvuviewpart.so
-%{tde_tdelibdir}/djvuviewpart.la
-%{tde_tdelibdir}/emptymultipagepart.la
-%{tde_tdelibdir}/emptymultipagepart.so
-%{tde_tdelibdir}/kviewerpart.la
-%{tde_tdelibdir}/kviewerpart.so
-%{tde_libdir}/libkmultipage.so.*
-%{tde_datadir}/apps/djvumultipage.rc
-%{tde_datadir}/apps/kviewerpart/
-%{tde_datadir}/apps/kviewshell/kviewshell.rc
-%{tde_datadir}/config.kcfg/djvumultipage.kcfg
-%{tde_datadir}/config.kcfg/kviewshell.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
-%{tde_datadir}/services/emptymultipage.desktop
-%{tde_datadir}/services/djvumultipage.desktop
-%{tde_datadir}/servicetypes/kmultipage.desktop
-
-%post -n trinity-kviewshell
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-kviewshell
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkscan
-Summary:	Scanner library for Trinity
-Group:		Environment/Libraries
-
-%description -n trinity-libkscan
-KScan is TDE's scanner library. It's used by kooka and by koffice currently.
-It provides an easy-to-use library, which allows you to access your scanner
-(as long as it's sane compatible).
-
-%files -n trinity-libkscan
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.so.*
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
-%{tde_datadir}/services/scanservice.desktop
-
-%post -n trinity-libkscan
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkscan-devel
-Summary:	Development files for the Trinity scanner library
-Group:		Development/Libraries
-
-%description -n trinity-libkscan-devel
-This package contains development files for Trinity's scanner library.
-
-%files -n trinity-libkscan-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.la
-%{tde_libdir}/libkscan.so
-
-%post -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkscan-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libpoppler-tqt
-Summary:	TQt support for Poppler
-Group:		Environment/Libraries
-Obsoletes:	poppler-tqt < %{version}-%{release}
-Provides:	poppler-tqt = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt = %{version}-%{release}
-
-%description -n trinity-libpoppler-tqt
-TQt support library for Poppler.
-This library is used by the Trinity graphics file plugins for PDF support.
-
-%files -n trinity-libpoppler-tqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libpoppler-tqt.so.*
-
-%post -n trinity-libpoppler-tqt
-/sbin/ldconfig || :
-
-%postun -n trinity-libpoppler-tqt
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libpoppler-tqt-devel
-Summary:	Development files for TQt support for Poppler
-Group:		Development/Libraries
-Requires:	trinity-libpoppler-tqt = %{version}-%{release}
-Obsoletes:	poppler-tqt-devel < %{version}-%{release}
-Provides:	poppler-tqt-devel = %{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt-devel < %{version}-%{release}
-Provides:	%{name}-libpoppler-tqt-devel = %{version}-%{release}
-
-%description -n trinity-libpoppler-tqt-devel
-Development files of TQt support library for Poppler.
-This package contains the development files needed to compile applications against poppler-tqt.
-
-%files -n trinity-libpoppler-tqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/poppler-link-qt3.h
-%{tde_tdeincludedir}/poppler-page-transition.h
-%{tde_tdeincludedir}/poppler-qt.h
-%{tde_libdir}/libpoppler-tqt.la
-%{tde_libdir}/libpoppler-tqt.so
-%{tde_libdir}/pkgconfig/poppler-tqt.pc
-
-%post -n trinity-libpoppler-tqt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libpoppler-tqt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-
-Obsoletes:	trinity-kdegraphics-devel < %{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{version}-%{release}
-
-Requires: %{name} = %{version}-%{release}
-Requires: trinity-libkscan-devel = %{version}-%{release}
-Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/dom/
-%{tde_tdeincludedir}/kfaximage.h
-%{tde_tdeincludedir}/kmultipageInterface.h
-%{tde_tdeincludedir}/ksvg/
-%{tde_tdeincludedir}/kviewshell/
-%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
-%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
-%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
-%{tde_libdir}/libkdeinit_kview.la
-%if 0%{?build_kmrml}
-%{tde_libdir}/libkdeinit_mrmlsearch.la
-%endif
-%{tde_libdir}/libkghostviewlib.la
-%{tde_libdir}/libkghostviewlib.so
-%{tde_libdir}/libkimageviewer.la
-%{tde_libdir}/libkimageviewer.so
-%{tde_libdir}/libkmultipage.la
-%{tde_libdir}/libkmultipage.so
-%{tde_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodeler.so
-%{tde_libdir}/libksvg.la
-%{tde_libdir}/libksvg.so
-%{tde_libdir}/libtext2path.la
-%{tde_libdir}/libtext2path.so
-# kfaxview
-%{tde_libdir}/libkfaximage.so
-%{tde_libdir}/libkfaximage.la
-# cmake
-%{tde_datadir}/cmake/*
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-############
-
-# Excludes kuickshow (built separately)
-#%exclude %{tde_bindir}/kuickshow
-#%exclude %{tde_tdelibdir}/kuickshow.la
-#%exclude %{tde_tdelibdir}/kuickshow.so
-#%exclude %{tde_libdir}/libkdeinit_kuickshow.la
-#%exclude %{tde_libdir}/libkdeinit_kuickshow.so
-#%exclude %{tde_tdeappdir}/kuickshow.desktop
-#%exclude %{tde_datadir}/apps/kuickshow/
-#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
-#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%patch3 -p1 -b .mkstemps
-%endif
-
-%if 0%{?rhel} == 4
-%patch201 -p1 -b .rhel4
-%endif
-
-%if 0%{?build_kamera} == 0
-%__rm -rf doc/kamera/
-%endif
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Note: the "-L%{tde_libdir}" is required for RHEL5, where poppler is under /opt/trinity.
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir} -I%{tde_includedir}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  \
-  %{?with_t1lib:-DWITH_T1LIB=ON} \
-  %{?with_paper:-DWITH_LIBPAPER=ON} \
-  -DWITH_TIFF=ON \
-  -DWITH_OPENEXR=ON \
-  -DWITH_PDF=ON \
-  -DBUILD_ALL=ON \
-  -DBUILD_KUICKSHOW=OFF \
-  %{!?build_kmrml:-DBUILD_KMRML=OFF} \
-  %{!?build_kamera:-DBUILD_KAMERA=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
deleted file mode 100644
index 7775f4908..000000000
--- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec
+++ /dev/null
@@ -1,581 +0,0 @@
-#
-# spec file for package tdelibs (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdelibs
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		TDE Libraries
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-tdelibs-rpmlintrc
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-Obsoletes:		tdelibs < %{version}-%{release}
-Provides:		tdelibs = %{version}-%{release}
-Obsoletes:		trinity-kdelibs < %{version}-%{release}
-Provides:		trinity-kdelibs = %{version}-%{release}
-Obsoletes:		trinity-kdelibs-apidocs < %{version}-%{release}
-Provides:		trinity-kdelibs-apidocs = %{version}-%{release}
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# Trinity dependencies
-BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-BuildRequires:	trinity-filesystem >= %{tde_version}
-
-Requires:		trinity-arts >= %{tde_epoch}:1.5.10
-Requires:		trinity-filesystem >= %{tde_version}
-Requires:		fileshareset >= 2.0
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# XSLT support
-BuildRequires:	libxslt-devel
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# CUPS support
-BuildRequires:	cups-devel
-
-# TIFF support
-BuildRequires:	libtiff-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-# LIBART_LGPL support
-BuildRequires:	libart_lgpl-devel
-
-# ASPELL support
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_pcre 1
-BuildRequires:	pcre-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_inotify 1
-%endif
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# UTEMPTER support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libutempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-
-# HSPELL support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENEXR support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_openexr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# LIBTOOL
-BuildRequires:	libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# X11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-Requires:		iceauth
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:		xorg-x11-server-utils
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:		xorg-x11
-%endif
-
-# XZ support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define with_lzma 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	liblzma-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xz-devel
-%endif
-%endif
-
-# Certificates support
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
-BuildRequires:	ca-certificates
-Requires:		ca-certificates
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%if 0%{?rhel} == 5
-%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%if 0%{?suse_version}
-%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
-BuildRequires:	ca-certificates
-Requires:		ca-certificates
-%endif
-%if "%{cacert}" != ""
-Requires:		%{cacert}
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xcomposite_devel libxcomposite-devel
-%else
-%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xcomposite_devel libXcomposite-devel
-%endif
-%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
-
-# XT support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%define xt_devel libXt-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xt_devel libxt-devel
-%endif
-%{?xt_devel:BuildRequires: %{xt_devel}}
-
-
-%description
-Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
-kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{tde_bindir}/artsmessage
-%{tde_bindir}/cupsdconf
-%{tde_bindir}/cupsdoprint
-%{tde_bindir}/dcop
-%{tde_bindir}/dcopclient
-%{tde_bindir}/dcopfind
-%{tde_bindir}/dcopobject
-%{tde_bindir}/dcopquit
-%{tde_bindir}/dcopref
-%{tde_bindir}/dcopserver
-%{tde_bindir}/dcopserver_shutdown
-%{tde_bindir}/dcopstart
-%{tde_bindir}/imagetops
-%{tde_bindir}/kab2kabc
-%{tde_bindir}/kaddprinterwizard
-%{tde_bindir}/kbuildsycoca
-%{tde_bindir}/kcmshell
-%{tde_bindir}/kconf_update
-%{tde_bindir}/kcookiejar
-%{tde_bindir}/kde-config
-%{tde_bindir}/kde-menu
-%{tde_bindir}/kded
-%{tde_bindir}/kdeinit
-%{tde_bindir}/kdeinit_shutdown
-%{tde_bindir}/kdeinit_wrapper
-%{tde_bindir}/kdesu_stub
-%{tde_bindir}/kdetcompmgr
-%{tde_bindir}/kdontchangethehostname
-%{tde_bindir}/kdostartupconfig
-%{tde_bindir}/kfile
-%{tde_bindir}/kfmexec
-%{tde_bindir}/khotnewstuff
-%{tde_bindir}/kinstalltheme
-%{tde_bindir}/kio_http_cache_cleaner
-%{tde_bindir}/kio_uiserver
-%{tde_bindir}/kioexec
-%{tde_bindir}/kioslave
-%{tde_bindir}/klauncher
-%{tde_bindir}/kmailservice
-%{tde_bindir}/kmimelist
-%{tde_bindir}/ksendbugmail
-%{tde_bindir}/kshell
-%{tde_bindir}/kstartupconfig
-%{tde_bindir}/ktelnetservice
-%{tde_bindir}/ktradertest
-%{tde_bindir}/kwrapper
-%{tde_bindir}/lnusertemp
-%{tde_bindir}/make_driver_db_cups
-%{tde_bindir}/make_driver_db_lpr
-%{tde_bindir}/meinproc
-%{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_kdeinit_wrapper
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/libkdeinit_*.la
-%{tde_libdir}/libkdeinit_*.so
-%{tde_datadir}/applications/kde/*.desktop
-%{tde_datadir}/autostart/kab2kabc.desktop
-%{tde_datadir}/applnk/kio_iso.desktop
-%{tde_datadir}/apps/*
-%exclude %{tde_datadir}/apps/ksgmltools2/
-%config(noreplace) %{tde_datadir}/config/*
-%{tde_datadir}/emoticons/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_datadir}/icons/default.kde
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_datadir}/mimelnk/magic
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_tdedocdir}/HTML/en/common/*
-%{tde_tdedocdir}/HTML/en/kspell/
-
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/kgrantpty
-%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
-%verify(not mode) %{tde_bindir}/start_kdeinit
-%else
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%attr(4711,root,root) %{tde_bindir}/start_kdeinit
-%endif
-
-%config %{_sysconfdir}/xdg/menus/tde-applications.menu
-
-%pre
-# TDE Bug #1074
-if [ -d "%{tde_datadir}/locale/all_languages" ]; then
-  rm -rf "%{tde_datadir}/locale/all_languages"
-fi
-
-%post
-/sbin/ldconfig || :
-
-%if 0%{?suse_version}
-# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/kgrantpty
-%set_permissions %{tde_bindir}/kpac_dhcp_helper
-%set_permissions %{tde_bindir}/start_kdeinit
-%endif
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	TDE Libraries (Development files)
-Group:		Development/Libraries/X11
-Requires:	%{name} = %{tde_epoch}:%{version}-%{release}
-
-Obsoletes:	tdelibs-devel < %{tde_epoch}:%{version}-%{release}
-Provides:	tdelibs-devel = %{tde_epoch}:%{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{tde_epoch}:%{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{tde_epoch}:%{version}-%{release}
-
-Requires:	qt3-devel >= 3.3.8d
-Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
-Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-Requires:	libart_lgpl-devel
-%{?xcomposite_devel:Requires: %{xcomposite_devel}}
-%{?xt_devel:Requires: %{xt_devel}}
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl*
-%{tde_bindir}/kconfig_compiler
-%{tde_bindir}/makekdewidgets
-%{tde_datadir}/apps/ksgmltools2/
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.a
-%exclude %{tde_libdir}/libkdeinit_*.la
-%exclude %{tde_libdir}/libkdeinit_*.so
-%{tde_datadir}/cmake/kdelibs.cmake
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="${QTDIR}/bin:${PATH}"
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
-export KDEDIR="%{tde_prefix}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?with_jasper:-DWITH_JASPER=ON} \
-  %{?with_openexr:-DWITH_OPENEXR=ON} \
-  -DWITH_UTEMPTER=ON \
-  %{?with_avahi:-DWITH_AVAHI=ON} \
-  %{?!with_pcre:-DWITH_PCRE=OFF} \
-  %{?!with_inotify:-DWITH_INOTIFY=OFF} \
-  %{?!with_gamin:-DWITH_GAMIN=OFF} \
-  -DWITH_SUDO_KDESU_BACKEND=OFF \
-  %{?!with_lzma:-DWITH_LZMA=OFF} \
-  -DWITH_ASPELL=ON \
-  %{?!with_hspell:-DWITH_HSPELL=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf "%{?buildroot}"
-%__make install DESTDIR="%{?buildroot}" -C build
-
-# Use system-wide CA certificates
-%if "%{?cacert}" != ""
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%endif
-
-# Symlinks duplicate files (mostly under 'ksgmltools2')
-%fdupes -s "%{?buildroot}"
-
-# Fix 'tderesources.desktop' (openSUSE only)
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop
-%endif
-
-# Remove setuid bit on some binaries.
-chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
-chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
-chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
-
-# fileshareset 2.0 is provided separately.
-# Remove integrated fileshareset 1.0 .
-%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
-%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%verify_permissions -e %{tde_bindir}/kgrantpty
-%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
-%verify_permissions -e %{tde_bindir}/start_kdeinit
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
deleted file mode 100644
index 397314c05..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ /dev/null
@@ -1,1336 +0,0 @@
-#
-# spec file for package tdemultimedia (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdemultimedia
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
-Version:	%{tde_version}
-Release:	%{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Productivity/Multimedia/Sound/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:	trinity-kdemultimedia < %{version}-%{release}
-Provides:	trinity-kdemultimedia = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# TAGLIB support
-%define with_taglib 1
-BuildRequires: taglib-devel
-
-# AKODE support
-%if 0%{?with_akode}
-BuildRequires: trinity-akode-devel
-%{?with_libmad:BuildRequires: trinity-akode-libmad}
-%endif
-
-# ZLIB support
-BuildRequires:	zlib-devel
-
-# MUSICBRAINZ support
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define with_musicbrainz 1
-#BuildRequires: libmusicbrainz-devel libtunepimp-devel
-
-# Audio libraries
-BuildRequires:	libvorbis-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
-BuildRequires:	cdparanoia
-
-# NAS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	nas-devel
-%endif
-
-# CDDA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia-devel
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libflac-devel
-%else
-BuildRequires:	%{_lib}flac-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	flac-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libgstreamer0.10-devel
-%else
-BuildRequires:	%{_lib}gstreamer0.10-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	gstreamer-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-devel
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86dga-devel
-BuildRequires:	%{_lib}xxf86vm-devel
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xtst-devel
-%else
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:		liblame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:		libmp3lame-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:		lame-devel
-%endif
-
-%endif
-%endif
-
-Requires: trinity-artsbuilder = %{version}-%{release}
-Requires: trinity-juk = %{version}-%{release}
-Requires: trinity-kaboodle = %{version}-%{release}
-Requires: trinity-kaudiocreator = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-kappfinder-data = %{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-tdemid = %{version}-%{release}
-Requires: trinity-kmix = %{version}-%{release}
-Requires: trinity-krec = %{version}-%{release}
-Requires: trinity-kscd = %{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
-Requires: trinity-libkcddb = %{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
-Requires: trinity-noatun = %{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The tdemultimedia package contains multimedia applications for
-TDE, including:
-  artsbuilder, Synthesizer designer for aRts
-  juk, a media player
-  tdemid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-  kaboodle, a media player
-  noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary:	Synthesizer designer for aRts
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-%post -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-artsbuilder
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-juk
-Summary:	Music organizer and player for Trinity
-Group:		Productivity/Multimedia/Sound/Players
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
-  Multitagging or editing a selection of multiple files at once is also
-  supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
-  load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
-  with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-%post -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-juk
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaboodle
-Summary:	Light, embedded media player for Trinity
-Group:		System/GUI/Other
-
-%if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{version}-%{release}
-%endif
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-%post -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaboodle
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Productivity/Multimedia/CD/Grabbers
-
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	vorbis-tools
-Requires:	flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/kconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-%post -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaudiocreator
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package kfile-plugins
-Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Productivity/Multimedia/Sound/Utilities
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_au.la
-%{tde_tdelibdir}/kfile_au.so
-%{tde_tdelibdir}/kfile_avi.la
-%{tde_tdelibdir}/kfile_avi.so
-%{tde_tdelibdir}/kfile_flac.la
-%{tde_tdelibdir}/kfile_flac.so
-%{tde_tdelibdir}/kfile_m3u.la
-%{tde_tdelibdir}/kfile_m3u.so
-%{tde_tdelibdir}/kfile_mp3.la
-%{tde_tdelibdir}/kfile_mp3.so
-%{tde_tdelibdir}/kfile_mpc.la
-%{tde_tdelibdir}/kfile_mpc.so
-%{tde_tdelibdir}/kfile_mpeg.la
-%{tde_tdelibdir}/kfile_mpeg.so
-%{tde_tdelibdir}/kfile_ogg.la
-%{tde_tdelibdir}/kfile_ogg.so
-%{tde_tdelibdir}/kfile_sid.la
-%{tde_tdelibdir}/kfile_sid.so
-%{tde_tdelibdir}/kfile_theora.la
-%{tde_tdelibdir}/kfile_theora.so
-%{tde_tdelibdir}/kfile_wav.la
-%{tde_tdelibdir}/kfile_wav.so
-%{tde_datadir}/services/kfile_au.desktop
-%{tde_datadir}/services/kfile_avi.desktop
-%{tde_datadir}/services/kfile_flac.desktop
-%{tde_datadir}/services/kfile_m3u.desktop
-%{tde_datadir}/services/kfile_mp3.desktop
-%{tde_datadir}/services/kfile_mpc.desktop
-%{tde_datadir}/services/kfile_mpeg.desktop
-%{tde_datadir}/services/kfile_ogg.desktop
-%{tde_datadir}/services/kfile_sid.desktop
-%{tde_datadir}/services/kfile_theora.desktop
-%{tde_datadir}/services/kfile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary:	Multimedia data for kappfinder
-Group:		Productivity/Multimedia/Sound/Utilities
-
-Requires: 	trinity-kappfinder >= %{tde_version}
-Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/
-%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
-%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
-
-##########
-
-%package tdeio-plugins
-Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Productivity/Multimedia/Sound/Utilities
-Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
-
-Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdemultimedia-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/kio_audiocd.la
-%{tde_tdelibdir}/kio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/kconf_update/audiocd.upd
-%{tde_datadir}/apps/kconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/kioslave/
-%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png
-
-%post tdeio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun tdeio-plugins
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-tdemid
-Summary:	MIDI/karaoke player for Trinity
-Group:		Productivity/Multimedia/Sound/Midi
-
-Obsoletes:	trinity-kmid < %{version}-%{release}
-Provides:	trinity-kmid = %{version}-%{release}
-
-%description -n trinity-tdemid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-tdemid
-%defattr(-,root,root,-)
-%{tde_bindir}/kmid
-%{tde_tdelibdir}/libkmidpart.la
-%{tde_tdelibdir}/libkmidpart.so
-%{tde_libdir}/libkmidlib.so.*
-%{tde_tdeappdir}/kmid.desktop
-%{tde_datadir}/apps/kmid/
-%{tde_datadir}/icons/hicolor/*/apps/kmid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/kmid/
-
-%post -n trinity-tdemid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdemid
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmix
-Summary:	Sound mixer applet for Trinity
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/libkdeinit_kmix.so
-%{tde_libdir}/libkdeinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-%post -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmix
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-krec
-Summary:	Sound recorder utility for Trinity
-Group:		Productivity/Multimedia/CD/Record
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%if 0%{?with_lame}
-%{tde_tdelibdir}/libkrecexport_mp3.la
-%{tde_tdelibdir}/libkrecexport_mp3.so
-%{tde_datadir}/services/krec_exportmp3.desktop
-%endif
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/libkdeinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-%post -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-krec
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kscd
-Summary:	Audio CD player for Trinity
-Group:		Productivity/Multimedia/CD/Players
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-%post -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kscd
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?with_akode}
-%package -n trinity-libarts-akode
-Summary:	Akode plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# Requires MAD support
-%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
-
-%post -n trinity-libarts-akode
-/sbin/ldconfig
-
-%postun -n trinity-libarts-akode
-/sbin/ldconfig
-%endif
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary:	Audiofile plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-%post -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-%postun -n trinity-libarts-audiofile
-/sbin/ldconfig
-
-##########
-
-%if 0%{?with_mpeg}
-%package -n trinity-libarts-mpeglib
-Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%post -n trinity-libarts-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-libarts-mpeglib
-/sbin/ldconfig
-%endif
-
-##########
-
-%if 0%{?with_xine}
-%package -n trinity-libarts-xine
-Summary:	ARTS plugin enabling xine support
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%post -n trinity-libarts-xine
-/sbin/ldconfig
-
-%postun -n trinity-libarts-xine
-/sbin/ldconfig
-%endif
-
-##########
-
-%package -n trinity-libkcddb
-Summary:	CDDB library for Trinity
-Group:		Productivity/Multimedia/Other
-Requires:	trinity-kcontrol >= %{tde_version}
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-
-%post -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-libkcddb
-/sbin/ldconfig
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?with_mpeg}
-
-%package -n trinity-mpeglib
-Summary:	MP3 and MPEG-1 audio and video library
-Group:		Productivity/Multimedia/Other
-%if 0%{?with_mpeg}
-Requires:	trinity-libarts-mpeglib = %{version}-%{release}
-%endif
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%post -n trinity-mpeglib
-/sbin/ldconfig
-
-%postun -n trinity-mpeglib
-/sbin/ldconfig
-
-%endif
-
-##########
-
-%package -n trinity-noatun
-Summary:	Media player for Trinity
-Group:		Productivity/Multimedia/Video/Players
-Requires:	trinity-tdebase-bin >= %{tde_version}
-
-# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	devel(libnoatunarts)
-Provides:	devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/kconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/libkdeinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/kconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-%post -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-noatun
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdemultimedia-devel < %{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%if 0%{?with_akode}
-%{tde_libdir}/libarts_akode.so
-%endif
-%{tde_libdir}/libarts_audiofile.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%endif
-%if 0%{?with_xine}
-%{tde_libdir}/libarts_xine.so
-%endif
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/libkdeinit_kmix.la
-%{tde_libdir}/libkdeinit_kmixctrl.la
-%{tde_libdir}/libkdeinit_krec.la
-%{tde_libdir}/libkdeinit_noatun.la
-%{tde_libdir}/libkmidlib.la
-%{tde_libdir}/libkmidlib.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%endif
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-%endif
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-# FIXME 2014/03/15: FTBFS on PCLINUXOS  ... Need to remove -fstack-protector
-# UPDATE 2014/04/07: FBTFS on Mageia 4 too !
-%if 0%{?pclinuxos} || 0%{?mgaversion} >= 4
-%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-# Update icons for some control center modules
-%__sed -i "kioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Required for some distro
-export KDEDIRS="%{tde_prefix}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure  \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --datadir=%{tde_datadir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  \
-  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
-  \
-  --with-vorbis \
-  --without-ossaudio \
-  --with-alsa \
-  --with-cdparanoia \
-  %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
-  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
-  %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
-  --with-audiofile \
-  %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
-  --with-gstreamer \
-  --with-kscd-cdda \
-  --with-theora \
-  --with-flac \
-  %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-%__make install DESTDIR=%{buildroot}
-
-# Disable MPEG support entirely
-%if 0%{?with_mpeg} == 0
-%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
-%__rm %{?buildroot}%{tde_bindir}/yaf-*
-%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
-%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
-%__rm %{?buildroot}%{tde_libdir}/libmpeg*
-%__rm %{?buildroot}%{tde_libdir}/libyaf*
-%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-%endif
-
-# Copy missing icons from 'crystalsvg' theme (tdelibs)
-%__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
-pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
-for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file krec           AudioVideo Recorder
-%suse_update_desktop_file kmid           AudioVideo Midi
-%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
-%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
-%suse_update_desktop_file kmix           AudioVideo Mixer
-%suse_update_desktop_file kaboodle       AudioVideo Player
-%suse_update_desktop_file kaudiocreator  AudioVideo CD
-%suse_update_desktop_file kscd           AudioVideo Player CD
-%suse_update_desktop_file noatun         AudioVideo Player Video
-%suse_update_desktop_file juk            AudioVideo Player Jukebox
-%suse_update_desktop_file audiocd
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
deleted file mode 100644
index aeebf5048..000000000
--- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
+++ /dev/null
@@ -1,1308 +0,0 @@
-#
-# spec file for package tdenetwork (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdenetwork
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Trinity Desktop Environment - Network Applications
-Group:			Applications/Internet
-Version:		%{tde_version}
-Release:		%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	kppp.pamd
-Source2:	ktalk
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gettext
-BuildRequires:	coreutils 
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# TLS support
-BuildRequires:	gnutls-devel
-
-# SQLITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	sqlite3-devel
-%else
-BuildRequires:	sqlite-devel
-%endif
-
-# GADU support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gadu 1
-BuildRequires:	libgadu-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# XTST support
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
-BuildRequires:	libXtst-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	libxtst-devel
-%endif
-
-# XMU support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXmu-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-
-# Other stuff
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# Fedora review:  http://bugzilla.redhat.com/195486
-
-## Conditional build:
-# RHEL6: xmms is outdated !
-#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
-
-# Wifi support
-%if "%{?_with_wifi:1}" == "1"
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
-%endif
-%endif
-
-# OpenSLP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_openslp 1
-BuildRequires: openslp-devel
-%endif
-
-%ifarch %{ix86}
-# BR: /usr/include/valgrind/valgrind.h
-BuildRequires: valgrind
-%endif
-
-%{?_with_xmms:BuildRequires: xmms-devel}
-
-# V4L support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires:	libv4l-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}v4l-devel
-%endif
-
-# XML support
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
-
-#jabber
-BuildRequires:	libidn-devel
-#jabber/jingle
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-BuildRequires:	glib2-devel
-BuildRequires:	speex-devel
-# jabber/ssl
-#{?fedora:Requires(hint): qca-tls}
-Requires:		jasper
-
-# MEANWHILE support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%define with_meanwhile 1
-BuildRequires:	meanwhile-devel
-%endif
-
-# ORTP support
-#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
-#BuildRequires:	ortp-devel
-#endif
-
-# SPEEX support
-%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_speex 1
-BuildRequires:	speex-devel
-%endif
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-Obsoletes:	trinity-kdenetwork < %{version}-%{release}
-Provides:	trinity-kdenetwork = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-libs < %{version}-%{release}
-Provides:	trinity-kdenetwork-libs = %{version}-%{release}
-Obsoletes:	trinity-kdenetwork-extras < %{version}-%{release}
-Provides:	trinity-kdenetwork-extras = %{version}-%{release}
-Obsoletes:	tdenetwork < %{version}-%{release}
-Provides:	tdenetwork = %{version}-%{release}
-
-Requires: trinity-dcoprss = %{version}-%{release}
-Requires: %{name}-filesharing = %{version}-%{release}
-Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-tdefile-plugins = %{version}-%{release}
-Requires: trinity-kget = %{version}-%{release}
-Requires: trinity-knewsticker = %{version}-%{release}
-Requires: trinity-kopete = %{version}-%{release}
-Requires: trinity-kopete-nowlistening = %{version}-%{release}
-Requires: trinity-kpf = %{version}-%{release}
-Requires: trinity-kppp = %{version}-%{release}
-Requires: trinity-krdc = %{version}-%{release}
-Requires: trinity-krfb = %{version}-%{release}
-Requires: trinity-ksirc = %{version}-%{release}
-Requires: trinity-ktalkd = %{version}-%{release}
-Requires: trinity-kwifimanager = %{version}-%{release}
-Requires: trinity-librss = %{version}-%{release}
-Requires: trinity-lisa = %{version}-%{release}
-
-%description
-This metapackage includes a collection of network and networking related
-applications provided with the official release of Trinity.
-
-Networking applications, including:
-* dcoprss: RSS utilities for Trinity
-* filesharing: Network filesharing configuration module for Trinity
-* kdict: Dictionary client for Trinity
-* tdefile-plugins: Torrent metainfo plugin for Trinity
-* kget: downloader manager
-* knewsticker: RDF newsticker applet
-* kopete: chat client
-* kopete-nowlistening: (xmms) plugin for Kopete.
-* kpf: Public fileserver for Trinity
-* kppp: dialer and front end for pppd
-* krdc: a client for Desktop Sharing and other VNC servers
-* krfb: Desktop Sharing server, allow others to access your desktop via VNC
-* ksirc: IRC client for Trinity
-* ktalkd: Talk daemon for Trinity
-* kwifimanager: Wireless lan manager for Trinity
-* librss: RSS library for Trinity
-* lisa: lan information server
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-
-
-##########
-
-%package -n trinity-dcoprss
-Summary:		RSS utilities for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-dcoprss
-dcoprss is a RSS to DCOP bridge, allowing all
-DCOP aware applications to access RSS news feeds. There is also
-a few sample utilities provided.
-RSS is a standard for publishing news headlines.
-DCOP is the TDE interprocess communication protocol.
-
-%files -n trinity-dcoprss
-%defattr(-,root,root,-)
-%{tde_bindir}/feedbrowser
-%{tde_bindir}/rssclient
-%{tde_bindir}/rssservice
-%{tde_datadir}/services/rssservice.desktop
-
-%post -n trinity-dcoprss
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-dcoprss
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package devel
-Summary:		Development files for the Trinity network module
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-Requires:		trinity-kdict = %{version}-%{release}
-Requires:		trinity-kopete = %{version}-%{release}
-Requires:		trinity-ksirc = %{version}-%{release}
-Requires:		trinity-librss = %{version}-%{release}
-Requires:		trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdenetwork-devel < %{version}-%{release}
-Provides:	trinity-kdenetwork-devel = %{version}-%{release}
-Obsoletes:	tdenetwork-devel < %{version}-%{release}
-Provides:	tdenetwork-devel = %{version}-%{release}
-
-%description devel
-This is the development package which contains the headers for the TDE RSS
-library as well as the Kopete chat client, as well as miscellaneous
-development-related files for the TDE network module.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kopete/
-%{tde_tdeincludedir}/rss/
-%{tde_libdir}/libkopete.la
-%{tde_libdir}/libkopete.so
-%{tde_libdir}/libkopete_msn_shared.la
-%{tde_libdir}/libkopete_msn_shared.so
-%{tde_libdir}/libkopete_oscar.la
-%{tde_libdir}/libkopete_oscar.so
-%{tde_libdir}/libkopete_videodevice.la
-%{tde_libdir}/libkopete_videodevice.so
-%{tde_libdir}/librss.la
-%{tde_libdir}/librss.so
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%package filesharing
-#Recommends:	perl-suid
-Summary:		Network filesharing configuration module for Trinity
-Group:   		Applications/Internet
-
-Obsoletes:		tdenetwork-filesharing < %{version}-%{release}
-Provides:		tdenetwork-filesharing = %{version}-%{release}
-
-%description filesharing
-This package provides a Trinity Control Center module to configure
-NFS and Samba.
-
-%files filesharing
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/fileshare_propsdlgplugin.la
-%{tde_tdelibdir}/fileshare_propsdlgplugin.so
-%{tde_tdelibdir}/kcm_fileshare.la
-%{tde_tdelibdir}/kcm_fileshare.so
-%{tde_tdelibdir}/kcm_kcmsambaconf.la
-%{tde_tdelibdir}/kcm_kcmsambaconf.so
-%{tde_tdeappdir}/fileshare.desktop
-%{tde_tdeappdir}/kcmsambaconf.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
-%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
-
-%post filesharing
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun filesharing
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kdict
-Summary:		Dictionary client for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kdict
-KDict is an advanced TDE graphical client for the DICT Protocol, with full
-Unicode support. It enables you to search through dictionary databases for a
-word or phrase, then displays suitable definitions. KDict tries to ease
-basic as well as advanced queries.
-
-%files -n trinity-kdict
-%defattr(-,root,root,-)
-%{tde_bindir}/kdict
-%{tde_tdelibdir}/kdict.*
-%{tde_tdelibdir}/kdict_panelapplet.*
-%{tde_libdir}/libkdeinit_kdict.*
-%{tde_tdeappdir}/kdict.desktop
-%{tde_datadir}/apps/kdict
-%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kdict.*
-%{tde_tdedocdir}/HTML/en/kdict
-
-%post -n trinity-kdict
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-kdict
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package tdefile-plugins
-Summary:		Torrent metainfo plugin for Trinity
-Group:			Applications/Internet
-
-Obsoletes:		tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		tdenetwork-kfile-plugins = %{version}-%{release}
-Obsoletes:		trinity-tdenetwork-kfile-plugins < %{version}-%{release}
-Provides:		trinity-tdenetwork-kfile-plugins = %{version}-%{release}
-
-%description tdefile-plugins
-This package provides a metainformation plugin for bittorrent files.
-TDE uses tdefile-plugins to provide metainfo tab in the files properties
-dialog in konqueror and other file-handling applications.
-
-%files tdefile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_torrent.la
-%{tde_tdelibdir}/kfile_torrent.so
-%{tde_datadir}/services/kfile_torrent.desktop
-
-%post tdefile-plugins
-update-desktop-database 2> /dev/null || : 
-
-%postun tdefile-plugins
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kget
-Summary:		Download manager for Trinity
-Group:			Applications/Internet
-Requires:		trinity-tdebase-data >= %{tde_version}
-Requires:		trinity-konqueror >= %{tde_version}
-
-%description -n trinity-kget
-KGet is a a download manager similar to GetRight or Go!zilla. It keeps
-all your downloads in one dialog and you can add and remove transfers.
-Transfers can be paused, resumed, queued or scheduled.
-Dialogs display info about status of transfers - progress, size, speed
-and remaining time. Program supports drag & drop from TDE
-applications and Netscape.
-
-%files -n trinity-kget
-%defattr(-,root,root,-)
-%{tde_bindir}/kget
-%{tde_tdelibdir}/khtml_kget.la
-%{tde_tdelibdir}/khtml_kget.so
-%{tde_tdeappdir}/kget.desktop
-%{tde_datadir}/apps/kget
-%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop
-%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc
-%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
-%{tde_datadir}/icons/hicolor/*/apps/kget.png
-%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
-%{tde_datadir}/sounds/KGet_Added.ogg
-%{tde_datadir}/sounds/KGet_Finished.ogg
-%{tde_datadir}/sounds/KGet_Finished_All.ogg
-%{tde_datadir}/sounds/KGet_Started.ogg
-%{tde_tdedocdir}/HTML/en/kget
-
-%post -n trinity-kget
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-kget
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-knewsticker
-Summary:		News ticker applet for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-knewsticker
-This is a news ticker applet for the Trinity panel. It can scroll news from
-your favorite news sites, such as lwn.net, /. and freshmeat.net.
-To achieve this, KNewsTicker requires the news sites to provide a
-RSS feed to newsitems. KNewsTicker already comes with a selection of
-good news sources which provide such files.
-
-%files -n trinity-knewsticker
-%defattr(-,root,root,-)
-%{tde_bindir}/knewstickerstub
-%{tde_tdelibdir}/knewsticker_panelapplet.la
-%{tde_tdelibdir}/knewsticker_panelapplet.so
-%{tde_tdelibdir}/libkntsrcfilepropsdlg.la
-%{tde_tdelibdir}/libkntsrcfilepropsdlg.so
-%{tde_tdeappdir}/knewsticker-standalone.desktop
-%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop
-%{tde_datadir}/apps/kconf_update/knewsticker.upd
-%{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl
-%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
-%{tde_datadir}/apps/knewsticker/
-%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
-%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
-%{tde_tdedocdir}/HTML/en/knewsticker
-
-%post -n trinity-knewsticker
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-knewsticker
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kopete
-Summary:		Instant messenger for Trinity
-Group:			Applications/Internet
-Requires:		trinity-tdebase-bin >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-Requires:		trinity-filesystem >= %{tde_version}
-
-%description -n trinity-kopete
-Kopete is an instant messenger program which can communicate with a variety
-of IM systems, such as Yahoo, ICQ, IRC and Jabber.
-
-Support for more IM protocols can be added through a plugin system.
-
-%files -n trinity-kopete
-%defattr(-,root,root,-)
-# nowlistening support
-%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui*
-%exclude %{tde_datadir}/apps/kopete/*nowlisteningui*
-%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%exclude %{tde_datadir}/services/kconfiguredialog/*nowlistening*
-%exclude %{tde_datadir}/services/*nowlistening*
-%exclude %{tde_tdelibdir}/*nowlistening*
-# Main kopete package
-%{tde_bindir}/kopete
-%{tde_bindir}/kopete_latexconvert.sh
-%{tde_libdir}/kconf_update_bin/kopete-account-kconf_update
-%{tde_libdir}/kconf_update_bin/kopete-nameTracking-kconf_update
-%{tde_libdir}/kconf_update_bin/kopete-pluginloader2-kconf_update
-%{tde_tdelibdir}/kcm_kopete_*.so
-%{tde_tdelibdir}/kcm_kopete_*.la
-%{tde_tdelibdir}/kio_jabberdisco.la
-%{tde_tdelibdir}/kio_jabberdisco.so
-%{tde_tdelibdir}/kopete_*.la
-%{tde_tdelibdir}/kopete_*.so
-%{tde_tdelibdir}/libkrichtexteditpart.la
-%{tde_tdelibdir}/libkrichtexteditpart.so
-%{tde_libdir}/libkopete_msn_shared.so.*
-%{tde_libdir}/libkopete_oscar.so.*
-%{tde_libdir}/libkopete.so.*
-%{tde_libdir}/libkopete_videodevice.so.*
-%{tde_tdeappdir}/kopete.desktop
-%{tde_datadir}/apps/kconf_update/kopete-*
-%{tde_datadir}/apps/kopete/
-%{tde_datadir}/apps/kopete_*/
-%{tde_datadir}/apps/kopeterichtexteditpart/
-%{tde_datadir}/config.kcfg/historyconfig.kcfg
-%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
-%{tde_datadir}/config.kcfg/kopete.kcfg
-%{tde_datadir}/config.kcfg/latexconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png
-%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png
-%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png
-%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png
-%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png
-%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png
-%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kopete.png
-%{tde_datadir}/icons/hicolor/*/actions/emoticon.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png
-%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png
-%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png
-%{tde_datadir}/icons/hicolor/*/actions/newmsg.png
-%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png
-%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
-%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
-%{tde_datadir}/mimelnk/application/x-icq.desktop
-%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{tde_datadir}/services/aim.protocol
-%{tde_datadir}/services/chatwindow.desktop
-%{tde_datadir}/services/emailwindow.desktop
-%{tde_datadir}/services/jabberdisco.protocol
-%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop
-%{tde_datadir}/services/kopete_*.desktop
-%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
-%{tde_datadir}/servicetypes/kopete*.desktop
-%{tde_datadir}/sounds/Kopete_*.ogg
-%{tde_tdedocdir}/HTML/en/kopete
-# jingle support for kopete
-%{tde_bindir}/relayserver
-%{tde_bindir}/stunserver
-# winpopup support for kopete
-%{tde_bindir}/winpopup-install.sh
-%{tde_bindir}/winpopup-send.sh
-# motionaway plugin for kopete
-%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
-# smpp plugin for kopete
-%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-
-
-%post -n trinity-kopete
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-/sbin/ldconfig
-
-%postun -n trinity-kopete
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-kopete-nowlistening
-Summary:		Nowlistening (xmms) plugin for Kopete
-Group:			Applications/Internet
-Requires:		trinity-kopete = %{tde_version}-%{tde_release}
-Requires:		trinity-filesystem >= %{tde_version}
-
-%description -n trinity-kopete-nowlistening
-Kopete includes the "Now Listening" plug-in that can report what music you
-are currently listening to, in a number of different players, including
-noatun, kscd, juk, kaffeine and amarok.
-
-%files -n trinity-kopete-nowlistening
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kopete/*nowlisteningchatui*
-%{tde_datadir}/apps/kopete/*nowlisteningui*
-%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%{tde_datadir}/services/kconfiguredialog/*nowlistening*
-%{tde_datadir}/services/*nowlistening*
-%{tde_tdelibdir}/*nowlistening*
-
-##########
-
-%package -n trinity-kpf
-Summary:		Public fileserver for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kpf
-kpf provides simple file sharing using HTTP. kpf is strictly a public
-fileserver, which means that there are no access restrictions to shared
-files. Whatever you select for sharing is available to anyone. kpf is
-designed to be used for sharing files with friends.
-
-%files -n trinity-kpf
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kpf*
-%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kpf.*
-%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
-%{tde_tdedocdir}/HTML/en/kpf
-
-%post -n trinity-kpf
-for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-kpf
-for f in crystalsvg ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kppp
-Summary:		Modem dialer and ppp frontend for Trinity
-Group:			Applications/Internet
-Requires:		ppp
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-kppp
-KPPP is a dialer and front end for pppd. It allows for interactive
-script generation and network setup. It will automate the dialing in
-process to your ISP while letting you conveniently monitor the entire
-process.
-
-Once connected KPPP will provide a rich set of statistics and keep
-track of the time spent online for you.
-
-%files -n trinity-kppp
-%defattr(-,root,root,-)
-%if 0%{?with_consolehelper} == 0
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/kppp
-%else
-%attr(4711,root,root) %{tde_bindir}/kppp
-%endif
-%endif
-%{tde_bindir}/kppplogview
-%{tde_tdeappdir}/Kppp.desktop
-%{tde_tdeappdir}/kppplogview.desktop
-%{tde_datadir}/apps/kppp/
-%{tde_datadir}/icons/hicolor/*/apps/kppp.png
-%{tde_tdedocdir}/HTML/en/kppp/
-
-%if 0%{?with_consolehelper}
-%config(noreplace) /etc/security/console.apps/kppp3
-%config(noreplace) /etc/pam.d/kppp3
-%{_sbindir}/kppp3
-%{tde_bindir}/kppp3
-%{tde_sbindir}/kppp3
-%endif
-
-%post -n trinity-kppp
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-%if 0%{?suse_version}
-# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/kppp
-%endif
-
-%postun -n trinity-kppp
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-krdc
-Summary:		Remote Desktop Connection for Trinity
-Group:			Applications/Internet
-Requires:		rdesktop
-
-%description -n trinity-krdc
-krdc is an TDE graphical client for the rfb protocol, used by VNC,
-and if rdesktop is installed, krdc can connect to Windows Terminal
-Servers using RDP.
-
-%files -n trinity-krdc
-%defattr(-,root,root,-)
-%{tde_bindir}/krdc
-%{tde_tdeappdir}/krdc.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
-%{tde_datadir}/apps/krdc/
-%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
-%{tde_datadir}/icons/hicolor/*/apps/krdc.png
-%{tde_datadir}/services/rdp.protocol
-%{tde_datadir}/services/vnc.protocol
-%{tde_tdedocdir}/HTML/en/krdc/
-
-%post -n trinity-krdc
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-krdc
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-krfb
-Summary:		Desktop Sharing for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-krfb
-Desktop Sharing (krfb) is a server application that allows you to share
-your current session with a user on another machine, who can use a
-VNC client like krdc to view or even control the desktop. It doesn't
-require you to start a new X session - it can share the current session.
-This makes it very useful when you want someone to help you perform a
-task.
-
-%files -n trinity-krfb
-%defattr(-,root,root,-)
-%{tde_bindir}/krfb
-%{tde_bindir}/krfb_httpd
-%{tde_tdelibdir}/kcm_krfb.la
-%{tde_tdelibdir}/kcm_krfb.so
-%{tde_tdelibdir}/kded_kinetd.la
-%{tde_tdelibdir}/kded_kinetd.so
-%{tde_tdeappdir}/kcmkrfb.desktop
-%{tde_tdeappdir}/krfb.desktop
-%{tde_datadir}/apps/kinetd/
-%{tde_datadir}/apps/krfb
-%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
-%{tde_datadir}/icons/hicolor/*/apps/krfb.png
-%{tde_datadir}/icons/locolor/*/apps/krfb.png
-%{tde_datadir}/services/kded/kinetd.desktop
-%{tde_datadir}/services/kinetd_krfb.desktop
-%{tde_datadir}/services/kinetd_krfb_httpd.desktop
-%{tde_datadir}/servicetypes/kinetdmodule.desktop
-%{tde_tdedocdir}/HTML/en/krfb/
-
-%post -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-ksirc
-Summary:		IRC client for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-ksirc
-KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
-lot of compatibility with mIRC for general use.
-
-If you want to connect to an IRC server via SSL, you will need to install the
-recommended package libio-socket-ssl-perl.
-
-%files -n trinity-ksirc
-%defattr(-,root,root,-)
-%{tde_bindir}/dsirc
-%{tde_bindir}/ksirc
-%{tde_libdir}/libkdeinit_ksirc.*
-%{tde_tdelibdir}/ksirc.*
-%{tde_tdeappdir}/ksirc.desktop
-%{tde_datadir}/apps/ksirc/
-%config(noreplace) %{tde_datadir}/config/ksircrc
-%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
-%{tde_tdedocdir}/HTML/??/ksirc/
-
-%post -n trinity-ksirc
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-/sbin/ldconfig
-
-
-%postun -n trinity-ksirc
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-ktalkd
-Summary:		Talk daemon for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kcontrol >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-
-%description -n trinity-ktalkd
-KTalkd is an enhanced talk daemon - a program to handle incoming talk
-requests, announce them and allow you to respond to it using a talk
-client. Note that KTalkd is designed to run on a single-user workstation,
-and shouldn't be run on a multi-user machine.
-
-%files -n trinity-ktalkd
-%defattr(-,root,root,-)
-%{tde_bindir}/ktalkd*
-%{tde_bindir}/mail.local
-%{tde_tdelibdir}/kcm_ktalkd.*
-%{tde_tdeappdir}/kcmktalkd.desktop
-%config(noreplace) %{tde_datadir}/config/ktalkdrc
-%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
-%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
-%{tde_datadir}/sounds/ktalkd.wav
-%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
-%{tde_tdedocdir}/HTML/en/ktalkd
-
-%post -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%if "%{?_with_wifi:1}" == "1"
-%package -n trinity-kwifimanager
-Summary:		Wireless lan manager for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kwifimanager
-KWiFiManager suite is a set of tools which allows you to manage your
-wireless LAN connection under the K Desktop Environment. It provides
-information about your current connection. KWiFiManager supports every
-wavelan card that uses the wireless extensions interface.
-
-%files -n trinity-kwifimanager
-%defattr(-,root,root,-)
-%{tde_bindir}/kwifimanager
-%{tde_tdelibdir}/kcm_wifi.*
-%{tde_libdir}/libkwireless.la
-%{tde_libdir}/libkwireless.so
-%{tde_tdeappdir}/kcmwifi.desktop
-%{tde_tdeappdir}/kwifimanager.desktop
-%{tde_datadir}/apps/kicker/applets/kwireless.desktop
-%{tde_datadir}/apps/kwifimanager
-%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
-%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%{tde_tdedocdir}/HTML/en/kwifimanager/
-
-%post -n trinity-kwifimanager
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-kwifimanager
-for f in hicolor ; do
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f}  2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || : 
-%endif
-
-##########
-
-%package -n trinity-librss
-Summary:		RSS library for Trinity
-Group:			Environment/Libraries
-
-%description -n trinity-librss
-This is the runtime package for programs that use the TDE RSS library.
-End users should not need to install this, it should get installed
-automatically when needed.
-
-%files -n trinity-librss
-%defattr(-,root,root,-)
-%{tde_libdir}/librss.so.*
-%{tde_datadir}/cmake/librss.cmake
-
-%post -n trinity-librss
-/sbin/ldconfig
-
-%postun -n trinity-librss
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-lisa
-Summary:			LAN information server for Trinity
-Group:				Applications/Internet
-Requires:		trinity-konqueror >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-
-%description -n trinity-lisa
-LISa is intended to provide TDE with a kind of "network neighborhood"
-but relying only on the TCP/IP protocol.
-
-%files -n trinity-lisa
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lanbrowser.la
-%{tde_tdelibdir}/kcm_lanbrowser.so
-%{tde_tdelibdir}/kio_lan.la
-%{tde_tdelibdir}/kio_lan.so
-%{tde_datadir}/applnk/.hidden/kcmkiolan.desktop
-%{tde_datadir}/applnk/.hidden/kcmlisa.desktop
-%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
-%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{tde_datadir}/apps/lisa/
-%{tde_datadir}/apps/remoteview/lan.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
-%{tde_tdedocdir}/HTML/en/lisa/
-%{tde_datadir}/services/lan.protocol
-%{tde_datadir}/services/rlan.protocol
-%{tde_bindir}/lisa
-%{tde_bindir}/reslisa
-
-%post -n trinity-lisa
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-lisa
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%package -n trinity-kdnssd
-Summary: Zeroconf support for TDE
-Group:			Applications/Internet
-
-%description -n trinity-kdnssd
-A tdeioslave and tded module that provide Zeroconf support. Try
-"zeroconf:/" in Konqueror.
-
-%files -n trinity-kdnssd
-%defattr(-,root,root,-)
-%{tde_datadir}/services/zeroconf.protocol
-%{tde_datadir}/services/invitation.protocol
-%{tde_datadir}/services/kded/dnssdwatcher.desktop
-%{tde_datadir}/apps/remoteview/zeroconf.desktop
-%{tde_datadir}/apps/zeroconf/_http._tcp
-%{tde_datadir}/apps/zeroconf/_ftp._tcp
-%{tde_datadir}/apps/zeroconf/_ldap._tcp
-%{tde_datadir}/apps/zeroconf/_webdav._tcp
-%{tde_datadir}/apps/zeroconf/_nfs._tcp
-%{tde_datadir}/apps/zeroconf/_ssh._tcp
-%{tde_datadir}/apps/zeroconf/_rfb._tcp
-%{tde_tdelibdir}/kio_zeroconf.so
-%{tde_tdelibdir}/kio_zeroconf.la
-%{tde_tdelibdir}/kded_dnssdwatcher.so
-%{tde_tdelibdir}/kded_dnssdwatcher.la
-
-%post -n trinity-kdnssd
-update-desktop-database 2> /dev/null || : 
-
-%postun -n trinity-kdnssd
-update-desktop-database 2> /dev/null || : 
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-# Workaround libiw detection failure on opensuse
-%if 0%{?suse_version}
-%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
-%endif
-
-# Update icons for some control center modules
-%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_JINGLE=ON \
-  %{?with_speex:-DWITH_SPEEX=ON} \
-  -DWITH_WEBCAM=ON \
-  -DWITH_GSM=OFF \
-  -DWITH_XMMS=OFF \
-  -DWITH_ARTS=ON \
-  %{?with_openslp:-DWITH_SLP=ON} \
-  -DBUILD_ALL=ON \
-  -DBUILD_KOPETE_PLUGIN_ALL=ON \
-  -DBUILD_KOPETE_PROTOCOL_ALL=ON \
-  %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
-  %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
-  ..
-
-# Tdenetwork is not smp safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
-pushd %{buildroot}%{tde_datadir}/icons
-for i in {16,22,32,48}; do        %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png    hicolor/"$i"x"$i"/apps/kget.png          ;done
-for i in {32,48}; do              %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png    hicolor/"$i"x"$i"/apps/krdc.png          ;done
-for i in {16,32,48}; do           %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png    hicolor/"$i"x"$i"/apps/krfb.png          ;done
-for i in {16,22,32,48,128}; do    %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png  hicolor/"$i"x"$i"/apps/ktalkd.png        ;done
-for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png  hicolor/"$i"x"$i"/apps/kcmfileshare.png  ;done
-popd
-
-%if 0%{?with_consolehelper}
-# Run kppp through consolehelper, and rename it to 'kppp3'
-%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
-%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
-%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3
-%endif
-%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps
-cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF
-USER=root
-PROGRAM=%{tde_sbindir}/kppp3
-SESSION=true
-EOF
-
-# Renames 'kppp' as 'kppp3' in launch icon
-%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
-%endif
-
-# Remove setuid bit on some binaries.
-if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
-  chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
-fi
-
-# ktalk
-%__install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
-
-# Avoids conflict with trinity-kvirc
-%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
-
-# Icons from TDE Control Center should only be displayed in TDE
-for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
-  if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
-    if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
-      echo "OnlyShowIn=KDE;" >>"${i}"
-    fi
-  fi
-done
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    kcmkrfb
-%suse_update_desktop_file    fileshare
-%suse_update_desktop_file    kopete        Network  InstantMessaging
-%suse_update_desktop_file    ksirc         Network  IRCClient
-%suse_update_desktop_file    Kppp          Network  Dialup
-%suse_update_desktop_file -r kppplogview   System   Monitor
-%suse_update_desktop_file    kdict         Office   Dictionary
-%suse_update_desktop_file -r krdc          System   RemoteAccess
-%suse_update_desktop_file -r krfb          System   RemoteAccess
-%suse_update_desktop_file -r kget          System   TrayIcon
-%suse_update_desktop_file -r kwifimanager  System   Network
-%suse_update_desktop_file    kcmwifi
-%suse_update_desktop_file -u knewsticker-standalone Network  News
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%verify_permissions -e %{tde_bindir}/kppp
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec
deleted file mode 100644
index 0f50b7cdb..000000000
--- a/redhat/main/tdepim/tdepim-3.5.13.2.spec
+++ /dev/null
@@ -1,2366 +0,0 @@
-#
-# spec file for package tdepim (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdepim
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_gnokii 1
-BuildRequires:	gnokii-devel
-%endif
-
-# TDEPIM optional features
-#define		with_kitchensync 1
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Personal Information Management apps from the official Trinity release
-Version:	%{tde_version}
-Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Applications/Productivity
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	libcaldav-devel >= %{tde_epoch}:0.6.5
-BuildRequires:	libcarddav-devel >= %{tde_epoch}:0.6.2
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-BuildRequires:	make
-
-BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
-BuildRequires:	flex
-BuildRequires:	libical-devel
-BuildRequires:	boost-devel
-BuildRequires:	pcre-devel
-BuildRequires:	libidn-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# CURL support
-%if 0%{?fedora} >= 15
-BuildRequires:	flex-static
-%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-BuildRequires:	trinity-libcurl-devel
-%else
-BuildRequires:	curl-devel
-%endif
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sasl2-devel
-%else
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
-# XSCREENSAVER support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
-%endif
-%endif
-
-
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	%{name}-wizards = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kalarm = %{version}-%{release}
-Requires:	trinity-kandy = %{version}-%{release}
-Requires:	trinity-karm = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-kmailcvt = %{version}-%{release}
-Requires:	trinity-kmobile = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-kode = %{version}-%{release}
-Requires:	trinity-konsolekalendar = %{version}-%{release}
-Requires:	trinity-kontact = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-korn = %{version}-%{release}
-Requires:	trinity-ktnef = %{version}-%{release}
-Requires:	trinity-libindex = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{version}-%{release}
-Provides:	trinity-kdepim = %{version}-%{release}
-Obsoletes:	tdepim < %{version}-%{release}
-Provides:	tdepim = %{version}-%{release}
-
-%description
-This metapackage includes a collection of Personal Information Management
-(PIM) applications provided with the official release of Trinity.
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries/Other
-
-Obsoletes:	tdepim-cmake < %{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{version}-%{release}
-Provides:	trinity-kdepim-devel = %{version}-%{release}
-Obsoletes:	tdepim-devel < %{version}-%{release}
-Provides:	tdepim-devel = %{version}-%{release}
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-akregator-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{version}-%{release}
-Requires:	trinity-karm-devel = %{version}-%{release}
-Requires:	trinity-kmail-devel = %{version}-%{release}
-Requires:	trinity-knode-devel = %{version}-%{release}
-Requires:	trinity-knotes-devel = %{version}-%{release}
-Requires:	trinity-kode-devel = %{version}-%{release}
-Requires:	trinity-kontact-devel = %{version}-%{release}
-Requires:	trinity-korganizer-devel = %{version}-%{release}
-Requires:	trinity-libindex-devel = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{version}-%{release}
-Requires:	trinity-libkmime-devel = %{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{version}-%{release}
-Requires:	trinity-libksieve-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
-
-%description devel
-This metapackage includes all development files for TDE PIM.
-It also contains the CMAKE macros.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/*
-
-##########
-
-%package -n trinity-akregator
-Summary:	RSS feed aggregator for TDE
-Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-libkcal = %{version}-%{release}
-
-%description -n trinity-akregator
-aKregator is a fast, lightweight, and intuitive feed reader program
-for TDE.  It allows you to quickly browse through hundreds of
-thousands of internet feeds in a quick, efficient, and familiar way.
-
-%files -n trinity-akregator
-%defattr(-,root,root,-)
-%{tde_bindir}/akregator
-%{tde_tdelibdir}/libakregatorpart.la
-%{tde_tdelibdir}/libakregatorpart.so
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
-%{tde_libdir}/libakregatorprivate.so.*
-%{tde_tdeappdir}/akregator.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/config.kcfg/akregator.kcfg
-%{tde_datadir}/config.kcfg/mk4config.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
-%{tde_datadir}/icons/hicolor/*/apps/akregator.png
-%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
-%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
-%{tde_datadir}/services/akregator_part.desktop
-%{tde_datadir}/services/feed.protocol
-%{tde_datadir}/services/kontact/akregatorplugin*.desktop
-%{tde_datadir}/servicetypes/akregator_plugin.desktop
-%{tde_tdedocdir}/HTML/en/akregator/
-
-%post -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-akregator
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-akregator-devel
-Summary:	Development files for trinity-akregator
-Group:		Development/Libraries/Other
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-akregator-devel
-%{summary}
-
-%files -n trinity-akregator-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/akregator/
-%{tde_libdir}/libakregatorprivate.la
-%{tde_libdir}/libakregatorprivate.so
-
-%post -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-akregator-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kaddressbook
-Summary:	TDE addressbook application
-Group:		Applications/Communications
-Requires:	trinity-tdebase-pim-ioslaves
-Requires:	%{name}-tderesources = %{version}-%{release}
-
-%description -n trinity-kaddressbook
-KAddressBook is the main address book application for TDE; it enables you
-to manage your contacts efficiently and comfortably. It can load and save
-your contacts to many different locations, including the local file system,
-LDAP servers, and SQL databases.
-
-%files -n trinity-kaddressbook
-%defattr(-,root,root,-)
-%{tde_bindir}/kabc2mutt
-%{tde_bindir}/kaddressbook
-%{tde_bindir}/kabcdistlistupdater
-%{tde_tdelibdir}/kcm_kabconfig.la
-%{tde_tdelibdir}/kcm_kabconfig.so
-%{tde_tdelibdir}/kcm_kabcustomfields.la
-%{tde_tdelibdir}/kcm_kabcustomfields.so
-%{tde_tdelibdir}/kcm_kabldapconfig.la
-%{tde_tdelibdir}/kcm_kabldapconfig.so
-%{tde_tdelibdir}/ldifvcardthumbnail.la
-%{tde_tdelibdir}/ldifvcardthumbnail.so
-%{tde_tdelibdir}/libkaddrbk_*.la
-%{tde_tdelibdir}/libkaddrbk_*.so
-%{tde_tdelibdir}/libkaddressbookpart.la
-%{tde_tdelibdir}/libkaddressbookpart.so
-%{tde_libdir}/libkabinterfaces.so.*
-%{tde_libdir}/libkaddressbook.so.*
-%{tde_tdeappdir}/kaddressbook.desktop
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
-%{tde_datadir}/services/kabconfig.desktop
-%{tde_datadir}/services/kabcustomfields.desktop
-%{tde_datadir}/services/kabldapconfig.desktop
-%{tde_datadir}/services/kaddressbook
-%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
-%{tde_datadir}/services/kresources/kabc/imap.desktop
-%{tde_datadir}/services/ldifvcardthumbnail.desktop
-%{tde_datadir}/servicetypes/dcopaddressbook.desktop
-%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
-%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
-%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
-%{tde_datadir}/servicetypes/kaddressbook_view.desktop
-%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
-%{tde_tdedocdir}/HTML/en/kaddressbook/
-%{tde_datadir}/autostart/kabcdistlistupdater.desktop
-%{tde_tdeincludedir}/kaddressbook/
-%{tde_tdeincludedir}/kabc/
-
-%post -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kaddressbook
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kaddressbook-devel
-Summary:	Development files for trinity-kaddressbook
-Group:		Development/Libraries/Other
-Requires:	trinity-kaddressbook = %{version}-%{release}
-
-%description -n trinity-kaddressbook-devel
-%{summary}
-
-%files -n trinity-kaddressbook-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkabinterfaces.la
-%{tde_libdir}/libkabinterfaces.so
-%{tde_libdir}/libkaddressbook.la
-%{tde_libdir}/libkaddressbook.so
-
-%post -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kaddressbook-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kalarm
-Summary:	Trinity alarm message, command and email scheduler
-Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-kalarm
-KAlarm provides a graphical interface to schedule personal timed events -
-pop-up alarm messages, command execution and sending emails. There is a
-range of options for configuring recurring events.
-
-A pop-up alarm can show either a simple text message, or the contents of a
-text or image file, It can optionally be spoken, or play a sound file. You
-can choose its appearance, and set reminders. Among KAlarm's other
-facilities, you can set up templates to allow KAlarm to be used as a 'tea
-timer'.
-
-As an alternative to using the graphical interface, alarms can be scheduled
-from the command line or via DCOP calls from other programs. KAlarm is
-TDE-based, but will also run on other desktops.
-
-%files -n trinity-kalarm
-%defattr(-,root,root,-)
-%{tde_bindir}/kalarm
-%{tde_bindir}/kalarmd
-%{tde_tdeappdir}/kalarm.desktop
-%{tde_datadir}/applnk/.hidden/kalarmd.desktop
-%{tde_datadir}/applnk/Applications/kalarm.desktop
-%{tde_datadir}/apps/kalarm
-%{tde_datadir}/autostart/kalarm.tray.desktop
-%{tde_datadir}/autostart/kalarmd.autostart.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
-%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
-%{tde_tdedocdir}/HTML/en/kalarm/
-
-%post -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kalarm
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kandy
-Summary:	Trinity mobile phone utility
-Group:		Applications/Communications
-
-%description -n trinity-kandy
-At the moment Kandy is more or less a terminal program with some special
-features to store commands and their parameters, but is also has a simple GUI
-to access the phone book of a mobile phone and it is able to save this phone
-book to the TDE address book.
-
-Kandy is aimed at mobile phones with integrated (GSM) modems.
-
-%files -n trinity-kandy
-%defattr(-,root,root,-)
-%{tde_bindir}/kandy
-%{tde_bindir}/kandy_client
-%{tde_tdeappdir}/kandy.desktop
-%{tde_datadir}/applnk/Utilities/kandy.desktop
-%{tde_datadir}/apps/kandy/
-%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
-%{tde_datadir}/icons/hicolor/*/apps/kandy.png
-%{tde_datadir}/config.kcfg/kandy.kcfg
-%{tde_tdedocdir}/HTML/en/kandy/
-
-%post -n trinity-kandy
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kandy
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm
-Summary:	Trinity time tracker tool
-Group:		Applications/Productivity
-
-%description -n trinity-karm
-KArm is a time tracker for busy people who need to keep track of the amount of
-time they spend on various tasks.
-
-%files -n trinity-karm
-%defattr(-,root,root,-)
-%{tde_bindir}/karm
-%{tde_libdir}/libkarm.so.*
-%{tde_tdelibdir}/libkarmpart.la
-%{tde_tdelibdir}/libkarmpart.so
-%{tde_tdeappdir}/karm.desktop
-%{tde_datadir}/applnk/Utilities/karm.desktop
-%{tde_datadir}/apps/karm/
-%{tde_datadir}/apps/karmpart/
-%{tde_datadir}/icons/hicolor/*/apps/karm.png
-%{tde_datadir}/services/karm_part.desktop
-%{tde_datadir}/services/kontact/karmplugin.desktop
-%{tde_tdedocdir}/HTML/en/karm/
-
-%post -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-karm
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-karm-devel
-Summary:	Development files for karm
-Group:		Development/Libraries/Other
-
-%description -n trinity-karm-devel
-%{summary}
-
-%files -n trinity-karm-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkarm.so
-%{tde_libdir}/libkarm.la
-
-%post -n trinity-karm-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-karm-devel
-/sbin/ldconfig || :
-
-##########
-
-%package kfile-plugins
-Summary:	TDE File dialog plugins for palm and vcf files
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kfile-plugins < %{version}-%{release}
-
-%description kfile-plugins
-File dialog plugins for palm and vcf files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_ics.la
-%{tde_tdelibdir}/kfile_ics.so
-%{tde_tdelibdir}/kfile_vcf.la
-%{tde_tdelibdir}/kfile_vcf.so
-%{tde_datadir}/services/kfile_ics.desktop
-%{tde_datadir}/services/kfile_vcf.desktop
-
-##########
-
-%package tdeio-plugins
-Summary:	Trinity PIM I/O Slaves
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kio-plugins < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdepim-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package includes the pim kioslaves. This includes imap4, sieve,
-and mbox.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kio_groupwise.la
-%{tde_tdelibdir}/kio_groupwise.so
-%{tde_tdelibdir}/kio_imap4.la
-%{tde_tdelibdir}/kio_imap4.so
-%{tde_tdelibdir}/kio_mbox.la
-%{tde_tdelibdir}/kio_mbox.so
-%{tde_tdelibdir}/kio_scalix.la
-%{tde_tdelibdir}/kio_scalix.so
-%{tde_tdelibdir}/kio_sieve.la
-%{tde_tdelibdir}/kio_sieve.so
-%{tde_datadir}/services/groupwise.protocol
-%{tde_datadir}/services/groupwises.protocol
-%{tde_datadir}/services/imap4.protocol
-%{tde_datadir}/services/imaps.protocol
-%{tde_datadir}/services/mbox.protocol
-%{tde_datadir}/services/scalix.protocol
-%{tde_datadir}/services/scalixs.protocol
-%{tde_datadir}/services/sieve.protocol
-
-##########
-
-%package tderesources
-Summary:	Trinity pim resource plugins
-Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{version}-%{release}
-#Requires:	trinity-korganizer = %{version}-%{release}
-#Requires:	trinity-knotes = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources < %{version}-%{release}
-Provides:	trinity-tdepim-kresources = %{version}-%{release}
-
-%description tderesources
-This package includes several plugins needed to interface with groupware
-servers. It also includes plugins for features such as blogging and
-tracking feature plans.
-
-%files tderesources
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcal_caldav.la
-%{tde_tdelibdir}/kcal_caldav.so
-%{tde_tdelibdir}/kcal_groupdav.la
-%{tde_tdelibdir}/kcal_groupdav.so
-%{tde_tdelibdir}/kcal_groupwise.la
-%{tde_tdelibdir}/kcal_groupwise.so
-%{tde_tdelibdir}/kcal_kolab.la
-%{tde_tdelibdir}/kcal_kolab.so
-%{tde_tdelibdir}/kcal_scalix.la
-%{tde_tdelibdir}/kcal_scalix.so
-%{tde_tdelibdir}/kcal_newexchange.la
-%{tde_tdelibdir}/kcal_newexchange.so
-%{tde_tdelibdir}/kcal_resourcefeatureplan.la
-%{tde_tdelibdir}/kcal_resourcefeatureplan.so
-%{tde_tdelibdir}/kcal_slox.la
-%{tde_tdelibdir}/kcal_slox.so
-%{tde_tdelibdir}/kcal_xmlrpc.la
-%{tde_tdelibdir}/kcal_xmlrpc.so
-%{tde_tdelibdir}/knotes_kolab.la
-%{tde_tdelibdir}/knotes_kolab.so
-%{tde_tdelibdir}/knotes_scalix.la
-%{tde_tdelibdir}/knotes_scalix.so
-%{tde_tdelibdir}/knotes_xmlrpc.la
-%{tde_tdelibdir}/knotes_xmlrpc.so
-%{tde_libdir}/libkabckolab.so.*
-%{tde_libdir}/libkabcscalix.so.*
-%{tde_libdir}/libkabc_groupdav.so.*
-%{tde_libdir}/libkabc_groupwise.so.*
-%{tde_libdir}/libkabc_newexchange.so.*
-%{tde_libdir}/libkabc_slox.so.*
-%{tde_libdir}/libkabc_xmlrpc.so.*
-%{tde_libdir}/libkcalkolab.so.*
-%{tde_libdir}/libkcalscalix.so.*
-%{tde_libdir}/libkcal_caldav.so.*
-%{tde_libdir}/libkabc_carddav.so.*
-%{tde_libdir}/libkcal_groupdav.so.*
-%{tde_libdir}/libkcal_groupwise.so.*
-%{tde_libdir}/libkcal_newexchange.so.*
-%{tde_libdir}/libkcal_resourcefeatureplan.so.*
-%{tde_libdir}/libkcal_slox.so.*
-%{tde_libdir}/libkcal_xmlrpc.so.*
-%{tde_libdir}/libkgroupwarebase.so.*
-%{tde_libdir}/libkgroupwaredav.so.*
-%{tde_libdir}/libknoteskolab.so.*
-%{tde_libdir}/libknotesscalix.so.*
-%{tde_libdir}/libknotes_xmlrpc.so.*
-%{tde_libdir}/libkslox.so.*
-%{tde_libdir}/libgwsoap.so.*
-%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kabc/kolab.desktop
-%{tde_datadir}/services/kresources/kabc/scalix.desktop
-%{tde_datadir}/services/kresources/kcal/exchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop
-%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop
-%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop
-%{tde_datadir}/services/kresources/kcal/kolab.desktop
-%{tde_datadir}/services/kresources/kcal/scalix.desktop
-%dir %{tde_datadir}/services/kresources/knotes
-%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
-%{tde_datadir}/services/kresources/knotes/kolabresource.desktop
-%{tde_datadir}/services/kresources/knotes/scalix.desktop
-
-%{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl
-%{tde_datadir}/apps/kconf_update/kolab-resource.upd
-
-%{tde_tdelibdir}/kabc_carddav.la
-%{tde_tdelibdir}/kabc_carddav.so
-%{tde_tdelibdir}/kabc_groupdav.la
-%{tde_tdelibdir}/kabc_groupdav.so
-%{tde_tdelibdir}/kabc_groupwise.la
-%{tde_tdelibdir}/kabc_groupwise.so
-%{tde_tdelibdir}/kabc_kolab.la
-%{tde_tdelibdir}/kabc_kolab.so
-%{tde_tdelibdir}/kabc_newexchange.la
-%{tde_tdelibdir}/kabc_newexchange.so
-%{tde_tdelibdir}/kabc_scalix.la
-%{tde_tdelibdir}/kabc_scalix.so
-%{tde_tdelibdir}/kabc_slox.la
-%{tde_tdelibdir}/kabc_slox.so
-%{tde_tdelibdir}/kabc_xmlrpc.la
-%{tde_tdelibdir}/kabc_xmlrpc.so
-
-%post tderesources
-/sbin/ldconfig || :
-
-%postun tderesources
-/sbin/ldconfig || :
-
-##########
-
-%package tderesources-devel
-Summary:	Development files for tderesources
-Group:		Development/Libraries/Other
-Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-tderesources-devel < %{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources-devel < %{version}-%{release}
-Provides:	trinity-tdepim-kresources-devel = %{version}-%{release}
-
-%description tderesources-devel
-%{summary}
-
-%files tderesources-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkslox.la
-%{tde_libdir}/libkslox.so
-%{tde_libdir}/libkabc_groupdav.la
-%{tde_libdir}/libkabc_groupdav.so
-%{tde_libdir}/libkabc_groupwise.la
-%{tde_libdir}/libkabc_groupwise.so
-%{tde_libdir}/libgwsoap.la
-%{tde_libdir}/libgwsoap.so
-%{tde_libdir}/libkabc_carddav.la
-%{tde_libdir}/libkabc_carddav.so
-%{tde_libdir}/libkabc_newexchange.la
-%{tde_libdir}/libkabc_newexchange.so
-%{tde_libdir}/libkabc_slox.la
-%{tde_libdir}/libkabc_slox.so
-%{tde_libdir}/libkabc_xmlrpc.la
-%{tde_libdir}/libkabc_xmlrpc.so
-%{tde_libdir}/libkabckolab.la
-%{tde_libdir}/libkabckolab.so
-%{tde_libdir}/libkabcscalix.la
-%{tde_libdir}/libkabcscalix.so
-%{tde_libdir}/libkcal_caldav.la
-%{tde_libdir}/libkcal_caldav.so
-%{tde_libdir}/libkcal_groupdav.la
-%{tde_libdir}/libkcal_groupdav.so
-%{tde_libdir}/libkcal_groupwise.la
-%{tde_libdir}/libkcal_groupwise.so
-%{tde_libdir}/libkcal_newexchange.la
-%{tde_libdir}/libkcal_newexchange.so
-%{tde_libdir}/libkcal_resourcefeatureplan.la
-%{tde_libdir}/libkcal_resourcefeatureplan.so
-%{tde_libdir}/libkcal_slox.la
-%{tde_libdir}/libkcal_slox.so
-%{tde_libdir}/libkcal_xmlrpc.la
-%{tde_libdir}/libkcal_xmlrpc.so
-%{tde_libdir}/libkcalkolab.la
-%{tde_libdir}/libkcalkolab.so
-%{tde_libdir}/libkcalscalix.la
-%{tde_libdir}/libkcalscalix.so
-%{tde_libdir}/libkgroupwarebase.la
-%{tde_libdir}/libkgroupwarebase.so
-%{tde_libdir}/libkgroupwaredav.la
-%{tde_libdir}/libkgroupwaredav.so
-%{tde_libdir}/libknotes_xmlrpc.la
-%{tde_libdir}/libknotes_xmlrpc.so
-%{tde_libdir}/libknoteskolab.la
-%{tde_libdir}/libknoteskolab.so
-%{tde_libdir}/libknotesscalix.la
-%{tde_libdir}/libknotesscalix.so
-%{tde_tdeincludedir}/kpimprefs.h
-
-%post tderesources-devel
-/sbin/ldconfig || :
-
-%postun tderesources-devel
-/sbin/ldconfig || :
-
-##########
-
-%package wizards
-Summary:	Trinity server configuration wizards
-Group:		Applications/Communications
-
-Obsoletes:	tdepim-wizards < %{version}-%{release}
-
-%description wizards
-This package contains TDE-based wizards for configuring eGroupware,
-Kolab, and SUSE Linux Openexchange servers.
-
-%files wizards
-%defattr(-,root,root,-)
-%{tde_bindir}/egroupwarewizard
-%{tde_bindir}/exchangewizard
-%{tde_bindir}/groupwarewizard
-%{tde_bindir}/groupwisewizard
-%{tde_bindir}/kolabwizard
-%{tde_bindir}/scalixadmin
-%{tde_bindir}/scalixwizard
-%{tde_bindir}/sloxwizard
-%{tde_tdelibdir}/libegroupwarewizard.la
-%{tde_tdelibdir}/libegroupwarewizard.so
-%{tde_tdelibdir}/libexchangewizard.la
-%{tde_tdelibdir}/libexchangewizard.so
-%{tde_tdelibdir}/libgroupwisewizard.la
-%{tde_tdelibdir}/libgroupwisewizard.so
-%{tde_tdelibdir}/libkolabwizard.la
-%{tde_tdelibdir}/libkolabwizard.so
-%{tde_tdelibdir}/libscalixwizard.la
-%{tde_tdelibdir}/libscalixwizard.so
-%{tde_tdelibdir}/libsloxwizard.la
-%{tde_tdelibdir}/libsloxwizard.so
-%{tde_tdeappdir}/groupwarewizard.desktop
-%{tde_datadir}/config.kcfg/egroupware.kcfg
-%{tde_datadir}/config.kcfg/groupwise.kcfg
-%{tde_datadir}/config.kcfg/kolab.kcfg
-%{tde_datadir}/config.kcfg/scalix.kcfg
-%{tde_datadir}/config.kcfg/slox.kcfg
-
-%post wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun wizards
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?with_kitchensync}
-%package -n trinity-kitchensync
-Summary:	Synchronization framework
-Group:		Applications/Communications
-BuildRequires:	opensync-devel
-#Suggests: konqueror-trinity
-#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-
-%description -n trinity-kitchensync
-This package contains a synchronization framework, still under heavy
-development (?).  Kitchensync uses opensync.
-
-%files -n trinity-kitchensync
-%defattr(-,root,root,-)
-%{tde_bindir}/kitchensync
-%{tde_tdelibdir}/libkitchensyncpart.la
-%{tde_tdelibdir}/libkitchensyncpart.so
-%{tde_datadir}/apps/kitchensync
-%{tde_libdir}/libkitchensync.so.*
-%{tde_libdir}/libqopensync.so.*
-%{tde_tdeappdir}/kitchensync.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
-
-%post -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kitchensync
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%endif
-
-##########
-
-%package -n trinity-kleopatra
-Summary:	Trinity Certificate Manager
-Group:		Applications/Communications
-
-# GPG support
-%if 0%{?suse_version}
-Requires:	gpg2
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	gnupg2
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-Requires:	pinentry
-Requires:	dirmngr
-%endif
-
-%description -n trinity-kleopatra
-Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
-keybox and for retrieving certificates from LDAP servers.
-
-%files -n trinity-kleopatra
-%defattr(-,root,root,-)
-%{tde_bindir}/kleopatra
-%{tde_bindir}/kwatchgnupg
-%{tde_tdelibdir}/kcm_kleopatra.la
-%{tde_tdelibdir}/kcm_kleopatra.so
-%{tde_tdeappdir}/kleopatra_import.desktop
-%{tde_datadir}/apps/kleopatra
-%{tde_datadir}/apps/kwatchgnupg
-%{tde_datadir}/services/kleopatra_config_*.desktop
-%{tde_tdedocdir}/HTML/en/kleopatra/
-%{tde_tdedocdir}/HTML/en/kwatchgnupg/
-%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
-
-%post -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kleopatra
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-kmail
-Summary:	Trinity Email client
-Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{version}
-
-# GPG support
-%if 0%{?suse_version}
-Requires:	gpg2
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	gnupg2
-%endif
-
-# Pinentry
-%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	pinentry
-%endif
-
-Requires:	procmail
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{version}-%{release}
-
-Provides: imap-client, mail-reader
-
-%description -n trinity-kmail
-KMail is a fully-featured email client that fits nicely into the TDE
-desktop. It has features such as support for IMAP, POP3, multiple accounts,
-mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
-
-You need to install %{name}-tdeio-plugins if you want to use IMAP or
-mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
-
-%files -n trinity-kmail
-%defattr(-,root,root,-)
-%{tde_datadir}/config/kmail.antispamrc
-%{tde_datadir}/config/kmail.antivirusrc
-%{tde_bindir}/kmail
-%{tde_bindir}/kmail_*.sh
-%{tde_tdelibdir}/kcm_kmail.la
-%{tde_tdelibdir}/kcm_kmail.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
-%{tde_tdelibdir}/libkmailpart.la
-%{tde_tdelibdir}/libkmailpart.so
-%{tde_tdeappdir}/KMail.desktop
-%{tde_tdeappdir}/kmail_view.desktop
-%{tde_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.2-misc.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-%{tde_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4-misc.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
-%{tde_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl
-%{tde_datadir}/apps/kconf_update/kmail-pgpidentity.pl
-%{tde_datadir}/apps/kconf_update/kmail-upd-identities.pl
-%{tde_datadir}/apps/kconf_update/kmail.upd
-%{tde_datadir}/apps/kconf_update/upgrade-signature.pl
-%{tde_datadir}/apps/kconf_update/upgrade-transport.pl
-%{tde_datadir}/apps/kmail
-%{tde_datadir}/apps/konqueror/servicemenus/email.desktop
-%{tde_datadir}/config.kcfg/custommimeheader.kcfg
-%{tde_datadir}/config.kcfg/kmail.kcfg
-%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
-%{tde_datadir}/config.kcfg/replyphrases.kcfg
-%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
-%{tde_datadir}/icons/hicolor/*/apps/kmail.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
-%{tde_datadir}/services/kmail_config_*.desktop
-%{tde_datadir}/services/kontact/kmailplugin.desktop
-%{tde_datadir}/servicetypes/dcopimap.desktop
-%{tde_datadir}/servicetypes/dcopmail.desktop
-# 'libkmailprivate.so' is required at runtime, not devel !
-%{tde_libdir}/libkmailprivate.so
-%{tde_libdir}/libkmailprivate.la
-%{tde_tdedocdir}/HTML/en/kmail/
-
-%post -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmail
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kmail-devel
-Summary:	Development files for kmail
-Group:		Development/Libraries/Other
-
-%description -n trinity-kmail-devel
-%{summary}
-
-%files -n trinity-kmail-devel
-%defattr(-,root,root,-)
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmail/
-%{tde_tdeincludedir}/kmail*.h
-
-%post -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kmail-devel
-/sbin/ldconfig || :
-
-##########
- 
-%package -n trinity-kmailcvt
-Summary:	Trinity KMail mail folder converter
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-
-%description -n trinity-kmailcvt
-Converts mail folders to KMail format.  Formats supported for import
-include Outlook Express, Evolution, and plain mbox.
-
-%files -n trinity-kmailcvt
-%defattr(-,root,root,-)
-%{tde_bindir}/kmailcvt
-%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
-%{tde_datadir}/apps/kmailcvt
-%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
-
-%post -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-kmailcvt
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-knode
-Summary:	Trinity news reader
-Group:		Applications/Internet
-
-%description -n trinity-knode
-KNode is an easy-to-use, convenient newsreader. It is intended to be usable
-by inexperienced users, but also includes support for such features as
-MIME attachments, article scoring, and creating and verifying GnuPG
-signatures.
-
-%files -n trinity-knode
-%defattr(-,root,root,-)
-%{tde_bindir}/knode
-%{tde_tdelibdir}/kcm_knode.la
-%{tde_tdelibdir}/kcm_knode.so
-%{tde_tdelibdir}/libknodepart.la
-%{tde_tdelibdir}/libknodepart.so
-%{tde_libdir}/libknodecommon.so.*
-%{tde_tdeappdir}/KNode.desktop
-%{tde_datadir}/apps/knode/
-%{tde_datadir}/icons/hicolor/*/apps/knode.png
-%{tde_datadir}/icons/hicolor/*/apps/knode2.png
-%{tde_datadir}/services/knewsservice.protocol
-%{tde_datadir}/services/knode_config_*.desktop
-%{tde_datadir}/services/kontact/knodeplugin.desktop
-%{tde_tdedocdir}/HTML/en/knode/
-
-%post -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knode
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knode-devel
-Summary:	Development files for trinity-knode
-Group:		Development/Libraries/Other
-Requires:	trinity-knode = %{version}-%{release}
-
-%description -n trinity-knode-devel
-%{summary}
-
-%files -n trinity-knode-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libknodecommon.la
-%{tde_libdir}/libknodecommon.so
-
-%post -n trinity-knode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-knotes
-Summary:	Trinity sticky notes
-Group:		Applications/Utilities
-Requires:	trinity-tdepim-tderesources = %{version}-%{release}
-
-%description -n trinity-knotes
-KNotes is a program that lets you write sticky notes. The notes are saved
-automatically when you exit the program, and they display when you open the
-program.  The program supports printing and mailing your notes.
-
-%files -n trinity-knotes
-%defattr(-,root,root,-)
-%{tde_bindir}/knotes
-%{tde_tdelibdir}/knotes_local.la
-%{tde_tdelibdir}/knotes_local.so
-%{tde_libdir}/libknotes.so.*
-%{tde_tdeappdir}/knotes.desktop
-%{tde_datadir}/apps/knotes/
-%{tde_datadir}/config.kcfg/knoteconfig.kcfg
-%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/knotes.png
-%dir %{tde_datadir}/services/kresources/knotes
-%{tde_datadir}/services/kresources/knotes/imap.desktop
-%{tde_datadir}/services/kresources/knotes/local.desktop
-%{tde_datadir}/services/kresources/knotes_manager.desktop
-%{tde_datadir}/services/kontact/knotesplugin.desktop
-%{tde_tdedocdir}/HTML/en/knotes/
-
-%post -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-knotes
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-knotes-devel
-Summary:	Development files for knots
-Group:		Development/Libraries/Other
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{version}-%{release}
-
-%description -n trinity-knotes-devel
-%{summary}
-
-%files -n trinity-knotes-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libknotes.so
-%{tde_libdir}/libknotes.la
-%{tde_tdeincludedir}/KNotesAppIface.h
-%{tde_tdeincludedir}/KNotesIface.h
-
-%post -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-knotes-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode
-Summary:	Helper library for programmatic generation of C++ code
-Group:		Development/Libraries
-
-%description -n trinity-kode
-This package includes a program kode for generation of C++ template files
-and kxml_compiler for generation of C++ classes representing XML data
-described by RelaxNG schemes.
-
-%files -n trinity-kode
-%defattr(-,root,root,-)
-%{tde_bindir}/kode
-%{tde_bindir}/kxml_compiler
-%{tde_libdir}/libkode.so.*
-
-%post -n trinity-kode
-/sbin/ldconfig || :
-
-%postun -n trinity-kode
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kode-devel
-Summary:	Development files for trinity-kode
-Group:		Development/Libraries/Other
-Requires:	trinity-kode = %{version}-%{release}
-
-%description -n trinity-kode-devel
-%{summary}
-
-%files -n trinity-kode-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkode.la
-%{tde_libdir}/libkode.so
-
-%post -n trinity-kode-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kode-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-konsolekalendar
-Summary:	Trinity konsole personal organizer
-Group:		Applications/Productivity
-
-%description -n trinity-konsolekalendar
-KonsoleKalendar is a command-line interface to TDE calendars.
-Konsolekalendar complements the TDE KOrganizer by providing a console
-frontend to manage your calendars.
-
-%files -n trinity-konsolekalendar
-%defattr(-,root,root,-)
-%{tde_bindir}/konsolekalendar
-%{tde_tdeappdir}/konsolekalendar.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
-%{tde_tdedocdir}/HTML/en/konsolekalendar/
-
-%post -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-konsolekalendar
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact
-Summary:	Trinity pim application
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{version}-%{release}
-Requires:	trinity-korganizer = %{version}-%{release}
-Requires:	trinity-kaddressbook = %{version}-%{release}
-Requires:	trinity-knode = %{version}-%{release}
-Requires:	trinity-knotes = %{version}-%{release}
-Requires:	trinity-akregator = %{version}-%{release}
-
-%description -n trinity-kontact
-Kontact is the integrated solution to your personal information management
-needs. It combines TDE applications like KMail, KOrganizer, and
-KAddressBook into a single interface to provide easy access to mail,
-scheduling, address book and other PIM functionality.
-
-%files -n trinity-kontact
-%defattr(-,root,root,-)
-%{tde_bindir}/kontact
-%{tde_tdelibdir}/kcm_kmailsummary.la
-%{tde_tdelibdir}/kcm_kmailsummary.so
-%{tde_tdelibdir}/kcm_kontact.la
-%{tde_tdelibdir}/kcm_kontact.so
-%{tde_tdelibdir}/kcm_kontactknt.la
-%{tde_tdelibdir}/kcm_kontactknt.so
-%{tde_tdelibdir}/kcm_kontactsummary.la
-%{tde_tdelibdir}/kcm_kontactsummary.so
-%{tde_tdelibdir}/kcm_korgsummary.la
-%{tde_tdelibdir}/kcm_korgsummary.so
-%{tde_tdelibdir}/kcm_sdsummary.la
-%{tde_tdelibdir}/kcm_sdsummary.so
-%{tde_tdelibdir}/libkontact_*.la
-%{tde_tdelibdir}/libkontact_*.so
-%{tde_libdir}/libkontact.so.*
-%{tde_libdir}/libkpinterfaces.so.*
-%{tde_tdeappdir}/Kontact.desktop
-%{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact/
-%{tde_datadir}/apps/kontactsummary/
-%{tde_datadir}/config.kcfg/kontact.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kontact.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
-%{tde_datadir}/services/kcmkmailsummary.desktop
-%{tde_datadir}/services/kcmkontactknt.desktop
-%{tde_datadir}/services/kcmkontactsummary.desktop
-%{tde_datadir}/services/kcmkorgsummary.desktop
-%{tde_datadir}/services/kcmsdsummary.desktop
-%dir %{tde_datadir}/services/kontact
-%{tde_datadir}/services/kontact/newstickerplugin.desktop
-%{tde_datadir}/services/kontact/specialdatesplugin.desktop
-%{tde_datadir}/services/kontact/summaryplugin.desktop
-%{tde_datadir}/services/kontact/weatherplugin.desktop
-%{tde_datadir}/services/kontactconfig.desktop
-%{tde_datadir}/servicetypes/kontactplugin.desktop
-%{tde_tdedocdir}/HTML/en/kontact/
-%{tde_tdedocdir}/HTML/en/kpilot/
-
-%post -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kontact
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kontact-devel
-Summary:	Development files for kontact
-Group:		Development/Libraries/Other
-Requires:	trinity-kontact = %{version}-%{release}
-
-%description -n trinity-kontact-devel
-%{summary}
-
-%files -n trinity-kontact-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkontact.la
-%{tde_libdir}/libkontact.so
-%{tde_libdir}/libkpinterfaces.la
-%{tde_libdir}/libkpinterfaces.so
-%{tde_tdeincludedir}/kontact/
-
-%post -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kontact-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korganizer
-Summary:	Trinity personal organizer
-Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	perl
-
-%description -n trinity-korganizer
-This package contains KOrganizer, a calendar and scheduling program.
-
-KOrganizer aims to be a complete program for organizing appointments,
-contacts, projects, etc. KOrganizer natively supports information interchange
-with other calendar applications, through the industry standard vCalendar
-personal data interchange file format. This eases the move from other
-modern PIMs to KOrganizer.
-
-KOrganizer offers full synchronization with Palm Pilots, if kpilot is
-installed.
-
-%files -n trinity-korganizer
-%defattr(-,root,root,-)
-%{tde_bindir}/ical2vcal
-%{tde_bindir}/korgac
-%{tde_bindir}/korganizer
-%{tde_tdelibdir}/kcm_korganizer.la
-%{tde_tdelibdir}/kcm_korganizer.so
-%{tde_tdelibdir}/libkorg_*.la
-%{tde_tdelibdir}/libkorg_*.so
-%{tde_tdelibdir}/libkorganizerpart.la
-%{tde_tdelibdir}/libkorganizerpart.so
-%{tde_libdir}/libkocorehelper.so.*
-%{tde_libdir}/libkorg_stdprinting.so.*
-%{tde_libdir}/libkorganizer.so.*
-%{tde_libdir}/libkorganizer_calendar.so.*
-%{tde_libdir}/libkorganizer_eventviewer.so.*
-%{tde_tdeappdir}/korganizer.desktop
-%{tde_datadir}/apps/kconf_update/korganizer.upd
-%{tde_datadir}/apps/korgac/
-%{tde_datadir}/apps/korganizer/
-%{tde_datadir}/autostart/korgac.desktop
-%{tde_datadir}/config.kcfg/korganizer.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
-%dir %{tde_datadir}/services/kontact
-%{tde_datadir}/services/kontact/korganizerplugin.desktop
-%{tde_datadir}/services/kontact/journalplugin.desktop
-%{tde_datadir}/services/kontact/todoplugin.desktop
-%{tde_datadir}/services/korganizer_*.desktop
-%{tde_datadir}/services/korganizer
-%{tde_datadir}/services/webcal.protocol
-%{tde_datadir}/servicetypes/calendardecoration.desktop
-%{tde_datadir}/servicetypes/calendarplugin.desktop
-%{tde_datadir}/servicetypes/dcopcalendar.desktop
-%{tde_datadir}/servicetypes/korganizerpart.desktop
-%{tde_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_tdedocdir}/HTML/en/korganizer/
-
-%post -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korganizer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-korganizer-devel
-Summary:	Development files for korganizer
-Group:		Development/Libraries/Other
-Requires:	trinity-korganizer = %{version}-%{release}
-
-%description -n trinity-korganizer-devel
-%{summary}
-
-%files -n trinity-korganizer-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/korganizer/
-%{tde_tdeincludedir}/calendar/
-%{tde_libdir}/libkocorehelper.la
-%{tde_libdir}/libkocorehelper.so
-%{tde_libdir}/libkorg_stdprinting.la
-%{tde_libdir}/libkorg_stdprinting.so
-%{tde_libdir}/libkorganizer.la
-%{tde_libdir}/libkorganizer.so
-%{tde_libdir}/libkorganizer_calendar.la
-%{tde_libdir}/libkorganizer_calendar.so
-%{tde_libdir}/libkorganizer_eventviewer.la
-%{tde_libdir}/libkorganizer_eventviewer.so
-
-%post -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-korganizer-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-korn
-Summary:	Trinity mail checker
-Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-
-%description -n trinity-korn
-Korn is a TDE mail checker that can display a small summary in the Kicker
-tray.  It supports checking mbox, pop3, imap4, and nntp sources.
-
-Once mail is received you can have Korn run a third party program or change
-the color/icon of the Kicker display.  In addition to this you can have
-Korn run a program once you click on the docked icon in Kicker.
-
-%files -n trinity-korn
-%defattr(-,root,root,-)
-%{tde_bindir}/korn
-%{tde_libdir}/kconf_update_bin/korn-3-4-config_change
-%{tde_tdeappdir}/KOrn.desktop
-%{tde_datadir}/apps/kconf_update/korn-3-4-config_change.upd
-%{tde_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl
-%{tde_datadir}/apps/kconf_update/korn-3-5-update.upd
-%{tde_datadir}/icons/hicolor/*/apps/korn.png
-%{tde_tdedocdir}/HTML/en/korn/
-
-%post -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-korn
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktnef
-Summary:	Trinity TNEF viewer
-Group:		Applications/Communications
-
-%description -n trinity-ktnef
-The TNEF File Viewer allows you to handle mail attachments using the TNEF
-format. These attachments are usually found in mails coming from Microsoft
-mail servers and embed the mail properties as well as the actual attachments.
-
-%files -n trinity-ktnef
-%defattr(-,root,root,-)
-%{tde_bindir}/ktnef
-%{tde_tdeappdir}/ktnef.desktop
-%{tde_datadir}/apps/ktnef
-%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
-%{tde_datadir}/icons/locolor/*/apps/ktnef.png
-%{tde_datadir}/mimelnk/application/ms-tnef.desktop
-%{tde_tdedocdir}/HTML/en/ktnef/
-
-%post -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktnef
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-libindex
-Summary:	Trinity indexing library
-Group:		Environment/Libraries
-
-%description -n trinity-libindex
-This library provides text indexing and is currently used by KMail
-to implement fast searches in mail bodies.
-
-This is the runtime package for programs that use the libindex library.
-
-%files -n trinity-libindex
-%defattr(-,root,root,-)
-%{tde_libdir}/libindex.so.*
-
-%post -n trinity-libindex
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libindex-devel
-Summary:	Trinity indexing library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libindex = %{version}-%{release}
-
-%description -n trinity-libindex-devel
-This library provides text indexing and is currently used by KMail
-to implement searching through mail text.
-
-This is the development package which contains the headers for the libindex-trinity
-library.
-
-%files -n trinity-libindex-devel
-%defattr(-,root,root,-)
-%{tde_bindir}/indexlib-config
-%{tde_tdeincludedir}/index
-%{tde_libdir}/libindex.la
-%{tde_libdir}/libindex.so
-
-%post -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libindex-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal
-Summary:	Trinity calendaring library
-Group:		Environment/Libraries
-#Requires:	%{name}-tderesources = %{version}-%{release}
-Requires:	trinity-libkmime = %{version}-%{release}
-
-%description -n trinity-libkcal
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the runtime package for programs that use the libkcal-trinity library.
-
-%files -n trinity-libkcal
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcal_kabc.la
-%{tde_tdelibdir}/kcal_kabc.so
-%{tde_tdelibdir}/kcal_localdir.la
-%{tde_tdelibdir}/kcal_localdir.so
-%{tde_tdelibdir}/kcal_local.la
-%{tde_tdelibdir}/kcal_local.so
-%{tde_tdelibdir}/kcal_remote.la
-%{tde_tdelibdir}/kcal_remote.so
-%{tde_libdir}/libkcal.so.*
-%{tde_libdir}/libkcal_resourceremote.so.*
-%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays/
-%dir %{tde_datadir}/services/kresources/kcal
-%{tde_datadir}/services/kresources/kcal/imap.desktop
-%{tde_datadir}/services/kresources/kcal/kabc.desktop
-%{tde_datadir}/services/kresources/kcal/local.desktop
-%{tde_datadir}/services/kresources/kcal/localdir.desktop
-%{tde_datadir}/services/kresources/kcal/remote.desktop
-%{tde_datadir}/services/kresources/kcal_manager.desktop
-
-%post -n trinity-libkcal
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkcal-devel
-Summary:	Trinity calendaring library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-Requires:	trinity-libktnef-devel = %{version}-%{release}
-
-%description -n trinity-libkcal-devel
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the development package which contains the headers for the libkcal-trinity
-library.
-
-%files -n trinity-libkcal-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libemailfunctions/
-%{tde_tdeincludedir}/libkcal
-%{tde_libdir}/libkcal.la
-%{tde_libdir}/libkcal.so
-%{tde_libdir}/libkcal_resourceremote.la
-%{tde_libdir}/libkcal_resourceremote.so
-%{tde_libdir}/libkholidays.la
-%{tde_libdir}/libkholidays.so
-
-%post -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkcal-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim
-Summary:	Trinity PIM library
-Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{version}-%{release}
-Requires:	trinity-libktnef = %{version}-%{release}
-
-Obsoletes:	libtdepim < %{version}-%{release}
-Provides:	libtdepim = %{version}-%{release}
-
-%description -n trinity-libtdepim
-This is the runtime package for programs that use the trinity-libtdepim library.
-
-%files -n trinity-libtdepim
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/designer/kdepimwidgets.la
-%{tde_tdelibdir}/plugins/designer/kdepimwidgets.so
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la
-%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so
-%{tde_libdir}/libkdepim.so.*
-%{tde_datadir}/apps/kdepimwidgets
-%{tde_datadir}/apps/libkdepim
-%{tde_datadir}/apps/kdepim
-%{tde_datadir}/config.kcfg/pimemoticons.kcfg
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
-
-%post -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libtdepim-devel
-Summary:	Trinity PIM library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libtdepim = %{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-
-Obsoletes:	libtdepim-devel < %{version}-%{release}
-Provides:	libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libtdepim-devel
-This is the development package which contains the headers for the libtdepim-trinity
-library.
-
-%files -n trinity-libtdepim-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kdepimmacros.h
-%{tde_libdir}/libkdepim.la
-%{tde_libdir}/libkdepim.so
-
-%post -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libtdepim-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt
-Summary:	Trinity gantt charting library
-Group:		Environment/Libraries
-
-%description -n trinity-libkgantt
-This is the runtime package for programs that use the libkgantt-trinity library.
-
-%files -n trinity-libkgantt
-%defattr(-,root,root,-)
-%{tde_libdir}/libkgantt.so.*
-%{tde_datadir}/apps/kgantt
-
-%post -n trinity-libkgantt
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkgantt-devel
-Summary:	Trinity gantt charting library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkgantt = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkgantt-devel
-This is the development package which contains the headers for the libkgantt-trinity
-library.
-
-%files -n trinity-libkgantt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kgantt
-%{tde_libdir}/libkgantt.la
-%{tde_libdir}/libkgantt.so
-
-%post -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkgantt-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra
-Summary:	TDE GnuPG interface libraries
-Group:		Environment/Libraries
-Requires:	gnupg
-
-%description -n trinity-libkleopatra
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the runtime package for programs that use the libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra
-%defattr(-,root,root,-)
-%{tde_datadir}/config/libkleopatrarc
-%{tde_libdir}/libgpgme++.so.*
-%{tde_libdir}/libkleopatra.so.*
-%{tde_libdir}/libkpgp.so.*
-%{tde_libdir}/libqgpgme.so.*
-%{tde_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-%{tde_datadir}/apps/kconf_update/kpgp.upd
-%{tde_datadir}/apps/libkleopatra/
-%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
-
-%post -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkleopatra-devel
-Summary:	Trinity GnuPG interface libraries [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkleopatra = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkleopatra-devel
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the development package which contains the headers for the
-libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/gpgme++/
-%{tde_tdeincludedir}/kleo/
-%{tde_tdeincludedir}/qgpgme/
-%{tde_libdir}/libgpgme++.la
-%{tde_libdir}/libgpgme++.so
-%{tde_libdir}/libkleopatra.la
-%{tde_libdir}/libkleopatra.so
-%{tde_libdir}/libkpgp.la
-%{tde_libdir}/libkpgp.so
-%{tde_libdir}/libqgpgme.la
-%{tde_libdir}/libqgpgme.so
-
-%post -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkleopatra-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime
-Summary:	Trinity MIME interface library
-Group:		Environment/Libraries
-#Conflicts:	trinity-libmimelib
-
-%description -n trinity-libkmime
-This library provides a C++ interface to MIME messages, parsing them into
-an object tree.
-
-%files -n trinity-libkmime
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmime.so.*
-
-%post -n trinity-libkmime
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkmime-devel
-Summary:	Development files for libkmime
-Group:		Development/Libraries/Other
-Requires:	trinity-libkmime = %{version}-%{release}
-
-%description -n trinity-libkmime-devel
-%{summary}
-
-%files -n trinity-libkmime-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmime.la
-%{tde_libdir}/libkmime.so
-
-%post -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkmime-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange
-Summary:	Trinity PIM Exchange library
-Group:		Development/Libraries/Other
-
-%description -n trinity-libkpimexchange
-This is the runtime package for programs that use the libkpimexchange-trinity
-library. 
-
-%files -n trinity-libkpimexchange
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/resourcecalendarexchange.la
-%{tde_tdelibdir}/resourcecalendarexchange.so
-%{tde_libdir}/libkpimexchange.so.*
-
-%post -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimexchange-devel
-Summary:	Trinity PIM Exchange library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkpimexchange = %{version}-%{release}
-Requires:	trinity-libkcal-devel = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libkpimexchange-devel
-This is the development package which contains the headers for the
-libkpimexchange-trinity library.
-
-%files -n trinity-libkpimexchange-devel
-%defattr(-,root,root,-)
-%dir %{tde_tdeincludedir}/kdepim
-%{tde_tdeincludedir}/kdepim/exchangeaccount.h
-%{tde_tdeincludedir}/kdepim/exchangeclient.h
-%{tde_libdir}/libkpimexchange.la
-%{tde_libdir}/libkpimexchange.so
-
-%post -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimexchange-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities
-Summary:	Trinity PIM user identity information library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimidentities
-This library provides information to TDE programs about user identity,
-such as email address, organization, etc.
-
-This is the runtime package for programs that use the libkpimidentities-trinity
-library.
-
-%files -n trinity-libkpimidentities
-%defattr(-,root,root,-)
-%{tde_libdir}/libkpimidentities.so.*
-
-%post -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libkpimidentities-devel
-Summary:	Development files for libkpimidentities
-Group:		Development/Libraries/Other
-Requires:	trinity-libkpimidentities = %{version}-%{release}
-
-%description -n trinity-libkpimidentities-devel
-%{summary}
-
-%files -n trinity-libkpimidentities-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkpimidentities.la
-%{tde_libdir}/libkpimidentities.so
-
-%post -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libkpimidentities-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve
-Summary:	Trinity mail/news message filtering library
-Group:		Environment/Libraries
-
-%description -n trinity-libksieve
-This is the runtime package for programs that use the libksieve-trinity library.
-
-%files -n trinity-libksieve
-%defattr(-,root,root,-)
-%{tde_libdir}/libksieve.so.*
-
-%post -n trinity-libksieve
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libksieve-devel
-Summary:	Trinity mail/news message filtering library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libksieve = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libksieve-devel
-This is the development package which contains the headers for the libksieve-trinity
-library.
-
-%files -n trinity-libksieve-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksieve
-%{tde_libdir}/libksieve.la
-%{tde_libdir}/libksieve.so
-
-%post -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libksieve-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef
-Summary:	Library for handling KTNEF email attachments
-Group:		Environment/Libraries
-
-%description -n trinity-libktnef
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-.
-This is the runtime library for packages using the ktnef-trinity library.
-
-%files -n trinity-libktnef
-%defattr(-,root,root,-)
-%{tde_libdir}/libktnef.so.*
-
-%post -n trinity-libktnef
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libktnef-devel
-Summary:	KTNEF handler library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libktnef = %{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{version}-%{release}
-
-%description -n trinity-libktnef-devel
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-
-This is the development package which contains the headers for the
-ktnef-trinity library.
-
-%files -n trinity-libktnef-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ktnef
-%{tde_libdir}/libktnef.la
-%{tde_libdir}/libktnef.so
-
-%post -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libktnef-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib
-Summary:	Trinity mime library
-Group:		Environment/Libraries
-
-%description -n trinity-libmimelib
-This library is used by several Trinity applications to handle mime types.
-
-This is the runtime package for programs that use the libmimelib-trinity library.
-
-%files -n trinity-libmimelib
-%defattr(-,root,root,-)
-%{tde_libdir}/libmimelib.so.*
-
-%post -n trinity-libmimelib
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libmimelib-devel
-Summary:	Trinity mime library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libmimelib = %{version}-%{release}
-
-%description -n trinity-libmimelib-devel
-This library is used by several TDE applications to handle mime types.
-
-This is the development package which contains the headers for the
-libmimelib library.
-
-%files -n trinity-libmimelib-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/mimelib/
-%{tde_libdir}/libmimelib.la
-%{tde_libdir}/libmimelib.so
-
-%post -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libmimelib-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kmobile
-Summary:	Synchronize and manage mobile phone with your PC.
-Group:		Applications/Communications
-
-%description -n trinity-kmobile
-KMobileTools is a nice TDE-based application that allows to synchronize 
-and manage mobile phones with your PC. It handles full SMS control, 
-dialing calls, phonebook, and phone status monitoring.
-
-%files -n trinity-kmobile
-%defattr(-,root,root,-)
-%{tde_bindir}/kmobile
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_camera.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_phone.png
-%{tde_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
-%{tde_datadir}/services/libkmobile_digicam.desktop
-%{tde_datadir}/services/libkmobile_gammu.desktop
-%{tde_datadir}/services/libkmobile_skeleton.desktop
-%{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/
-%{tde_tdeappdir}/kmobile.desktop
-%{tde_tdelibdir}/libkmobile_skeleton.la
-%{tde_tdelibdir}/libkmobile_skeleton.so
-%{tde_libdir}/libkmobileclient.la
-%{tde_libdir}/libkmobileclient.so
-%{tde_libdir}/libkmobiledevice.la
-%{tde_libdir}/libkmobiledevice.so
-
-%post -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kmobile
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
-if [ -x /usr/bin/perl ]; then
-  %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|"
-fi
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ARTS=ON \
-  -DWITH_SASL=ON \
-  -DWITH_NEWDISTRLISTS=ON  \
-  %{?with_gnokii:-DWITH_GNOKII=ON} \
-  -DWITH_EXCHANGE=ON \
-  -DWITH_EGROUPWARE=ON \
-  -DWITH_KOLAB=ON \
-  -DWITH_SLOX=ON \
-  -DWITH_GROUPWISE=ON \
-  -DWITH_FEATUREPLAN=ON \
-  -DWITH_GROUPDAV=ON \
-  -DWITH_BIRTHDAYS=ON \
-  -DWITH_NEWEXCHANGE=ON \
-  -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=ON \
-  -DWITH_CARDDAV=ON \
-  -DWITH_INDEXLIB=ON \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  %{?with_kitchensync:-DBUILD_KITCHENSYNC=ON} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/akregator.desktop       Network  RSS-News
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility  DesktopSettings X-TDE-Utilities-PIM
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kalarm.desktop          Utility  TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kandy.desktop           Utility  Telephony X-TDE-Utilities-Peripherals
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/karm.desktop            Utility  TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KNode.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/knotes.desktop          Utility  DesktopUtility X-TDE-Utilities-Desktop
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KMail.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/Kontact.desktop         Office   Core-Office
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/korganizer.desktop      Office   Calendar
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/KOrn.desktop            Utility  Applet X-TDE-More
-%suse_update_desktop_file -u    %{?buildroot}%{tde_tdeappdir}/ktnef.desktop           Network  Email
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kmobile.desktop         Utility  Telephony X-TDE-Utilities-Peripherals
-%if 0%{?with_kitchensync}
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop     Utility  X-SuSE-SyncUtility
-%endif
-%endif
-
-# Adds missing icons in 'hicolor' theme
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48};           do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png                                hicolor/"$i"x"$i"/apps/kandy.png      ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png  hicolor/"$i"x"$i"/apps/kleopatra.png  ;done
-popd
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
deleted file mode 100644
index 33bcb9f87..000000000
--- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec
+++ /dev/null
@@ -1,1250 +0,0 @@
-#
-# spec file for package tdesdk (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdesdk
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		The Trinity Software Development Kit (SDK)
-Group:			Development/Tools/Other
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-perl-dcop >= %{tde_version}
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	libtool
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# for kbugbuster/libkcal
-BuildRequires:	desktop-file-utils
-
-# DB4 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires:	%{_lib}db4.8-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	db4-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libdb-4_8-devel
-%endif
-
-# kbabel,  F-7+: flex >= 2.5.33-9
-BuildRequires:	flex
-# umbrello
-BuildRequires:	libxslt-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	subversion-devel
-BuildRequires:	neon-devel
-
-# PERL support
-BuildRequires:	perl
-%if 0%{?fedora} >= 19
-BuildRequires:	perl-podlators
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-BuildRequires:	%{_lib}binutils-devel
-%endif
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	binutils-devel
-%endif
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# KIOSLAVE
-# Does not build on RHEL4
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define build_kioslave 1
-%endif
-
-Obsoletes:		trinity-kdesdk < %{version}-%{release}
-Provides:		trinity-kdesdk = %{version}-%{release}
-Obsoletes:		trinity-kdesdk-libs < %{version}-%{release}
-Provides:		trinity-kdesdk-libs = %{version}-%{release}
-
-Requires: trinity-cervisia = %{version}-%{release}
-Requires: trinity-kapptemplate = %{version}-%{release}
-Requires: trinity-kbabel = %{version}-%{release}
-Requires: trinity-kbugbuster = %{version}-%{release}
-Requires: trinity-tdecachegrind = %{version}-%{release}
-Requires: trinity-tdecachegrind-converters = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
-Requires: %{name}-misc = %{version}-%{release}
-Requires: %{name}-scripts = %{version}-%{release}
-Requires: trinity-kmtrace = %{version}-%{release}
-Requires: trinity-kompare = %{version}-%{release}
-Requires: trinity-kspy = %{version}-%{release}
-Requires: trinity-kuiviewer = %{version}-%{release}
-Requires: trinity-libcvsservice0 = %{version}-%{release}
-Requires: trinity-poxml = %{version}-%{release}
-Requires: trinity-umbrello = %{version}-%{release}
-%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}}
-Requires: trinity-tdeunittest = %{version}-%{release}
-
-
-%description
-A collection of applications and tools used by developers, including:
-* cervisia: a CVS frontend
-* kbabel: PO file management
-* kbugbuster: a tool to manage the TDE bug report system
-* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
-* kompare: diff tool
-* kuiviewer: displays designer's UI files
-* umbrello: UML modeller and UML diagram tool
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-cervisia
-Summary:	A graphical CVS front end for Trinity
-Group:		Development/Tools/Version Control
-
-%description -n trinity-cervisia
-Cervisia is a TDE-based graphical front end for the CVS client.
-
-As well as providing both common and advanced CVS operations, it offers
-a variety of methods for graphically viewing information about the CVS
-repository, your own sandbox and the relationships between different
-versions of files.  A Changelog editor is also included and is coupled
-with the commit dialog.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-cervisia
-%defattr(-,root,root,-)
-%{tde_bindir}/cervisia
-%{tde_libdir}/libkdeinit_cervisia.la
-%{tde_libdir}/libkdeinit_cervisia.so
-%{tde_tdelibdir}/cervisia.la
-%{tde_tdelibdir}/cervisia.so
-%{tde_tdelibdir}/libcervisiapart.la
-%{tde_tdelibdir}/libcervisiapart.so
-%{tde_tdeappdir}/cervisia.desktop
-%{tde_datadir}/apps/cervisia/
-%{tde_datadir}/apps/cervisiapart/
-%{tde_datadir}/apps/kconf_update/cervisia.upd
-%{tde_datadir}/apps/kconf_update/cervisia-change_repos_list.pl
-%{tde_datadir}/apps/kconf_update/cervisia-normalize_cvsroot.pl
-%{tde_datadir}/apps/kconf_update/move_repositories.pl
-%{tde_datadir}/apps/kconf_update/change_colors.pl
-%{tde_datadir}/config.kcfg/cervisiapart.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/cervisia.png
-%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz
-%{tde_mandir}/man1/cervisia.1*
-%{tde_tdedocdir}/HTML/en/cervisia/
-
-%post -n trinity-cervisia
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-cervisia
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kapptemplate
-Summary:	Creates a framework to develop a Trinity application
-Group:		Development/Languages/Other
-
-%description -n trinity-kapptemplate
-KAppTemplate is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kapptemplate
-%defattr(-,root,root,-)
-%{tde_bindir}/kapptemplate
-%{tde_datadir}/apps/kapptemplate/
-
-%pre -n trinity-kapptemplate
-if [ -d "%{tde_bindir}/kapptemplate" ]; then
-  rm -rf "%{tde_bindir}/kapptemplate"
-fi
-
-##########
-
-%package -n trinity-kbabel
-Summary:	PO-file editing suite for Trinity
-Group:		Development/Languages/Other
-
-%description -n trinity-kbabel
-This is a suite of programs for editing gettext message files (PO-files).
-It is designed to help you translate fast and consistently.
-
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbabel
-%defattr(-,root,root,-)
-%{tde_bindir}/catalogmanager
-%{tde_bindir}/kbabel
-%{tde_bindir}/kbabeldict
-%{tde_libdir}/libkbabelcommon.so.*
-%{tde_libdir}/libkbabeldictplugin.so.*
-%{tde_tdelibdir}/kfile_po.la
-%{tde_tdelibdir}/kfile_po.so
-%{tde_tdelibdir}/pothumbnail.la
-%{tde_tdelibdir}/pothumbnail.so
-%{tde_tdelibdir}/kbabel_accelstool.la
-%{tde_tdelibdir}/kbabel_accelstool.so
-%{tde_tdelibdir}/kbabel_argstool.la
-%{tde_tdelibdir}/kbabel_argstool.so
-%{tde_tdelibdir}/kbabel_contexttool.la
-%{tde_tdelibdir}/kbabel_contexttool.so
-%{tde_tdelibdir}/kbabel_equationstool.la
-%{tde_tdelibdir}/kbabel_equationstool.so
-%{tde_tdelibdir}/kbabel_gettextexport.la
-%{tde_tdelibdir}/kbabel_gettextexport.so
-%{tde_tdelibdir}/kbabel_gettextimport.la
-%{tde_tdelibdir}/kbabel_gettextimport.so
-%{tde_tdelibdir}/kbabel_lengthtool.la
-%{tde_tdelibdir}/kbabel_lengthtool.so
-%{tde_tdelibdir}/kbabel_linguistexport.la
-%{tde_tdelibdir}/kbabel_linguistexport.so
-%{tde_tdelibdir}/kbabel_linguistimport.la
-%{tde_tdelibdir}/kbabel_linguistimport.so
-%{tde_tdelibdir}/kbabel_nottranslatedtool.la
-%{tde_tdelibdir}/kbabel_nottranslatedtool.so
-%{tde_tdelibdir}/kbabel_pluraltool.la
-%{tde_tdelibdir}/kbabel_pluraltool.so
-%{tde_tdelibdir}/kbabel_punctuationtool.la
-%{tde_tdelibdir}/kbabel_punctuationtool.so
-%{tde_tdelibdir}/kbabel_regexptool.la
-%{tde_tdelibdir}/kbabel_regexptool.so
-%{tde_tdelibdir}/kbabel_setfuzzytool.la
-%{tde_tdelibdir}/kbabel_setfuzzytool.so
-%{tde_tdelibdir}/kbabel_whitespacetool.la
-%{tde_tdelibdir}/kbabel_whitespacetool.so
-%{tde_tdelibdir}/kbabel_xliffexport.la
-%{tde_tdelibdir}/kbabel_xliffexport.so
-%{tde_tdelibdir}/kbabel_xliffimport.la
-%{tde_tdelibdir}/kbabel_xliffimport.so
-%{tde_tdelibdir}/kbabel_xmltool.la
-%{tde_tdelibdir}/kbabel_xmltool.so
-%{tde_tdelibdir}/kbabeldict_dbsearchengine.la
-%{tde_tdelibdir}/kbabeldict_dbsearchengine.so
-%{tde_tdelibdir}/kbabeldict_poauxiliary.la
-%{tde_tdelibdir}/kbabeldict_poauxiliary.so
-%{tde_tdelibdir}/kbabeldict_pocompendium.la
-%{tde_tdelibdir}/kbabeldict_pocompendium.so
-%{tde_tdelibdir}/kbabeldict_tmxcompendium.la
-%{tde_tdelibdir}/kbabeldict_tmxcompendium.so
-%{tde_tdeappdir}/catalogmanager.desktop
-%{tde_tdeappdir}/kbabel.desktop
-%{tde_tdeappdir}/kbabeldict.desktop
-%{tde_datadir}/apps/catalogmanager/
-%{tde_datadir}/apps/kbabel/
-%{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd
-%{tde_datadir}/apps/kconf_update/kbabel-project.upd
-%{tde_datadir}/apps/kconf_update/kbabel-projectrename.upd
-%{tde_datadir}/config.kcfg/kbabel.kcfg
-%{tde_datadir}/config.kcfg/kbprojectsettings.kcfg
-%{tde_tdedocdir}/HTML/en/kbabel/
-%{tde_datadir}/icons/hicolor/*/apps/catalogmanager.png
-%{tde_datadir}/icons/hicolor/*/apps/kbabel.png
-%{tde_datadir}/icons/hicolor/*/apps/kbabeldict.png
-%{tde_datadir}/icons/locolor/*/apps/catalogmanager.png
-%{tde_datadir}/icons/locolor/*/apps/kbabel.png
-%{tde_datadir}/icons/locolor/*/apps/kbabeldict.png
-%{tde_datadir}/services/dbsearchengine.desktop
-%{tde_datadir}/services/kfile_po.desktop
-%{tde_datadir}/services/pothumbnail.desktop
-%{tde_datadir}/services/kbabel_accelstool.desktop
-%{tde_datadir}/services/kbabel_argstool.desktop
-%{tde_datadir}/services/kbabel_contexttool.desktop
-%{tde_datadir}/services/kbabel_equationstool.desktop
-%{tde_datadir}/services/kbabel_gettext_export.desktop
-%{tde_datadir}/services/kbabel_gettext_import.desktop
-%{tde_datadir}/services/kbabel_lengthtool.desktop
-%{tde_datadir}/services/kbabel_linguist_export.desktop
-%{tde_datadir}/services/kbabel_linguist_import.desktop
-%{tde_datadir}/services/kbabel_nottranslatedtool.desktop
-%{tde_datadir}/services/kbabel_pluralformstool.desktop
-%{tde_datadir}/services/kbabel_punctuationtool.desktop
-%{tde_datadir}/services/kbabel_regexptool.desktop
-%{tde_datadir}/services/kbabel_setfuzzytool.desktop
-%{tde_datadir}/services/kbabel_whitespacetool.desktop
-%{tde_datadir}/services/kbabel_xliff_export.desktop
-%{tde_datadir}/services/kbabel_xliff_import.desktop
-%{tde_datadir}/services/kbabel_xmltool.desktop
-%{tde_datadir}/services/pocompendium.desktop
-%{tde_datadir}/services/poauxiliary.desktop
-%{tde_datadir}/services/tmxcompendium.desktop
-%{tde_datadir}/servicetypes/kbabel_tool.desktop
-%{tde_datadir}/servicetypes/kbabel_validator.desktop
-%{tde_datadir}/servicetypes/kbabeldict_module.desktop
-%{tde_datadir}/servicetypes/kbabelfilter.desktop
-
-%post -n trinity-kbabel
-/sbin/ldconfig || :
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbabel
-/sbin/ldconfig || :
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kbabel-devel
-Summary:	PO-file editing suite for Trinity (development files)
-Group:		Development/Libraries/Other
-Requires:	trinity-kbabel = %{version}-%{release}
-
-%description -n trinity-kbabel-devel
-This is a suite of programs for editing gettext message files (PO-files).
-It is designed to help you translate fast and consistently.
-
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-
-This package contains the KBabel development files.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbabel-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kbabel/
-%{tde_libdir}/libkbabelcommon.la
-%{tde_libdir}/libkbabelcommon.so
-%{tde_libdir}/libkbabeldictplugin.la
-%{tde_libdir}/libkbabeldictplugin.so
-
-%post -n trinity-kbabel-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kbabel-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kbugbuster
-Summary:	A front end for the Trinity bug tracking system
-Group:		Development/Languages/Other
-Requires:	trinity-libkcal >= %{tde_version}
-
-%description -n trinity-kbugbuster
-KBugBuster is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbugbuster
-%defattr(-,root,root,-)
-%{tde_bindir}/kbugbuster
-%{tde_tdelibdir}/kcal_bugzilla.la
-%{tde_tdelibdir}/kcal_bugzilla.so
-%{tde_tdeappdir}/kbugbuster.desktop
-%{tde_datadir}/apps/kbugbuster/
-%{tde_datadir}/icons/hicolor/*/apps/kbugbuster.png
-%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
-%{tde_datadir}/services/kresources/kcal/bugzilla.desktop
-%{tde_tdedocdir}/HTML/en/kbugbuster/
-
-%post -n trinity-kbugbuster
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kbugbuster
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-tdecachegrind
-Summary:	Visualisation tool for valgrind profiling output
-Group:		Development/Languages/Other
-
-%description -n trinity-tdecachegrind
-tdecachegrind is a visualisation tool for the profiling data generated
-by calltree, a profiling skin for valgrind.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-
-For visualising the output from other profiling tools, several converters
-can be found in the tdecachegrind-converters package.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdecachegrind
-%defattr(-,root,root,-)
-%{tde_bindir}/kcachegrind
-%{tde_tdeappdir}/kcachegrind.desktop
-%{tde_datadir}/apps/kcachegrind/
-%{tde_datadir}/icons/locolor/*/apps/kcachegrind.png
-%{tde_datadir}/icons/hicolor/*/apps/kcachegrind.png
-%{tde_datadir}/mimelnk/application/x-kcachegrind.desktop
-%{tde_tdedocdir}/HTML/en/kcachegrind/
-
-%post -n trinity-tdecachegrind
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdecachegrind
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-tdecachegrind-converters
-Summary:	Format converters for tdecachegrind profiling visualisation tool
-Group:		Development/Languages/Other
-Requires:	python
-%if 0%{?suse_version} || 0%{?rhel} == 4
-Requires:	php
-%else
-Requires:	php-cli
-%endif
-
-%description -n trinity-tdecachegrind-converters
-This is a collection of scripts for converting the output from
-different profiling tools into a format that tdecachegrind can use.
-
-tdecachegrind is a visualisation tool for the profiling data generated
-by calltree, a profiling skin for valgrind.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdecachegrind-converters
-%defattr(-,root,root,-)
-%{tde_bindir}/dprof2calltree
-%{tde_bindir}/hotshot2calltree
-%{tde_bindir}/memprof2calltree
-%{tde_bindir}/op2calltree
-%{tde_bindir}/pprof2calltree
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file dialog plugins for software development files
-Group:		Development/Languages/Other
-
-%description kfile-plugins
-This is a collection of plugins for the TDE file dialog.  These plugins
-extend the file dialog to offer advanced meta-information for source files,
-patch files and Qt Linguist data.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kfile_cpp.so
-%{tde_tdelibdir}/kfile_cpp.la
-%{tde_tdelibdir}/kfile_diff.so
-%{tde_tdelibdir}/kfile_diff.la
-%{tde_tdelibdir}/kfile_ts.so
-%{tde_tdelibdir}/kfile_ts.la
-%{tde_datadir}/services/kfile_cpp.desktop
-%{tde_datadir}/services/kfile_diff.desktop
-%{tde_datadir}/services/kfile_h.desktop
-%{tde_datadir}/services/kfile_ts.desktop
-
-##########
-
-%package misc
-Summary:	Various goodies from the Trinity Software Development Kit
-Group:		Development/Languages/Other
-
-%description misc
-This package contains miscellaneous goodies provided with the official
-TDE release to assist with TDE software development.
-
-Included are:
-- headers to assist with profiling TDE code;
-- a widget style for checking conformity with the TDE/Qt style guide;
-- palettes that match the KDE standard colour palette;
-- a TDE address book plugin that reads the list of TDE CVS accounts.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files misc
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kabcformat_kdeaccounts.la
-%{tde_tdelibdir}/kabcformat_kdeaccounts.so
-%{tde_tdelibdir}/plugins/styles/scheck.so
-%{tde_tdelibdir}/plugins/styles/scheck.la
-%{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop
-%{tde_datadir}/apps/kstyle/themes/scheck.themerc
-%{tde_datadir}/kdepalettes/
-
-%{tde_libdir}/libkstartperf.so.*
-%{tde_libdir}/libkstartperf.la
-%{tde_bindir}/kstartperf
-
-%post misc
-/sbin/ldconfig || :
-
-%postun misc
-/sbin/ldconfig || :
-
-##########
-
-%package scripts
-Summary:	a set of useful development scripts for Trinity
-Group:		Development/Languages/Other
-Requires:	python
-
-%description scripts
-This package contains a number of scripts which can be used to help in
-developing TDE-based applications.  Many of these scripts however are
-not specific to TDE, and in particular there are several general-use
-scripts to help users in working with SVN and CVS repositories.
-
-In addition to these scripts, this package provides:
-- gdb macros for Qt/TDE programming;
-- vim and emacs helper files for Qt/TDE programming;
-- bash and zsh completion controls for TDE apps;
-- valgrind error suppressions for TDE apps.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_bindir}/adddebug
-%{tde_bindir}/build-progress.sh
-%{tde_bindir}/cheatmake
-%{tde_bindir}/create_cvsignore
-%{tde_bindir}/create_makefile
-%{tde_bindir}/create_makefiles
-%{tde_bindir}/cvs-clean
-%{tde_bindir}/cvs2dist
-%{tde_bindir}/cvsbackport
-%{tde_bindir}/cvsblame
-%{tde_bindir}/cvscheck
-%{tde_bindir}/cvsforwardport
-%{tde_bindir}/cvslastchange
-%{tde_bindir}/cvslastlog
-%{tde_bindir}/cvsrevertlast
-%{tde_bindir}/cvsversion
-%{tde_bindir}/cxxmetric
-%{tde_bindir}/extend_dmalloc
-%{tde_bindir}/extractattr
-%{tde_bindir}/extractrc
-%{tde_bindir}/findmissingcrystal
-%{tde_bindir}/fixkdeincludes
-%{tde_bindir}/fixuifiles
-%{tde_bindir}/includemocs
-%{tde_bindir}/kde-build
-%{tde_bindir}/kdedoc
-%{tde_bindir}/kdekillall
-%{tde_bindir}/kdelnk2desktop.py*
-%{tde_bindir}/kdemangen.pl
-%{tde_bindir}/makeobj
-%{tde_bindir}/noncvslist
-%{tde_bindir}/package_crystalsvg
-%{tde_bindir}/png2mng.pl
-%{tde_bindir}/pruneemptydirs
-%{tde_bindir}/qtdoc
-%{tde_bindir}/zonetab2pot.py*
-%{tde_bindir}/svn2dist
-%{tde_bindir}/svnrevertlast
-%{tde_bindir}/svnforwardport
-%{tde_bindir}/nonsvnlist
-%{tde_bindir}/kdesvn-build
-%{tde_bindir}/svnlastlog
-%{tde_bindir}/svnversions
-%{tde_bindir}/create_svnignore
-%{tde_bindir}/svnlastchange
-%{tde_bindir}/colorsvn
-%{tde_bindir}/svnaddcurrentdir
-%{tde_bindir}/svnbackport
-%{tde_bindir}/svngettags
-%{tde_bindir}/svnchangesince
-%{tde_bindir}/svn-clean
-%{tde_datadir}/apps/katepart/syntax/kdesvn-buildrc.xml
-%{tde_mandir}/man1/cvsblame.1
-%{tde_mandir}/man1/cvscheck.1
-%{tde_mandir}/man1/cvsversion.1
-%{tde_mandir}/man1/kde-build.1
-%{tde_mandir}/man1/includemocs.1
-%{tde_mandir}/man1/noncvslist.1
-%{tde_mandir}/man1/kdesvn-build.1
-%{tde_tdedocdir}/HTML/en/kdesvn-build/
-#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
-#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
-#scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
-#scripts/kde.supp /opt/trinity/lib/valgrind
-#scripts/completions /opt/trinity/share/tdesdk-scripts
-
-#debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
-#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
-#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/
-
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/licensecheck
-%else
-%exclude %{tde_bindir}/licensecheck
-%endif
-
-##########
-
-%package -n trinity-kmtrace
-Summary:	A Trinity memory leak tracer
-Group:		Development/Languages/Other
-Requires:	less
-
-%description -n trinity-kmtrace
-KMtrace is a TDE tool to assist with malloc debugging using glibc's
-"mtrace" functionality.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kmtrace
-%defattr(-,root,root,-)
-%{tde_bindir}/demangle
-%{tde_bindir}/kminspector
-%{tde_bindir}/kmmatch
-%{tde_bindir}/kmtrace
-%dir %{tde_libdir}/kmtrace
-%{tde_libdir}/kmtrace/libktrace.la
-%{tde_libdir}/kmtrace/libktrace.so
-%{tde_datadir}/apps/kmtrace/
-
-##########
-
-%package -n trinity-kompare
-Summary:	A Trinity GUI for viewing differences between files
-Group:		Development/Languages/Other
-
-%description -n trinity-kompare
-Kompare is a graphical user interface for viewing the differences between
-files.  It can compare two documents, create a diff file, display a diff
-file and/or blend a diff file back into the original documents.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kompare
-%defattr(-,root,root,-)
-%{tde_bindir}/kompare
-%{tde_libdir}/libkompareinterface.la
-%{tde_libdir}/libkompareinterface.so.*
-%{tde_tdelibdir}/libkomparenavtreepart.la
-%{tde_tdelibdir}/libkomparenavtreepart.so
-%{tde_tdelibdir}/libkomparepart.la
-%{tde_tdelibdir}/libkomparepart.so
-%{tde_tdeappdir}/kompare.desktop
-%{tde_datadir}/apps/kompare/
-%{tde_datadir}/services/komparenavtreepart.desktop
-%{tde_datadir}/services/komparepart.desktop
-%{tde_datadir}/servicetypes/komparenavigationpart.desktop
-%{tde_datadir}/servicetypes/kompareviewpart.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kompare.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
-%{tde_tdedocdir}/HTML/en/kompare/
-
-%post -n trinity-kompare
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kompare
-/sbin/ldconfig || :
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kspy
-Summary:	Examines the internal state of a Qt/TDE app
-Group:		Development/Languages/Other
-Requires:	trinity-tdelibs-devel
-
-%description -n trinity-kspy
-KSpy is a tiny library which can be used to graphically display
-the QObjects in use by a Qt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kspy
-%defattr(-,root,root,-)
-%{tde_libdir}/libkspy.la
-%{tde_libdir}/libkspy.so.*
-
-%post -n trinity-kspy
-/sbin/ldconfig || :
-
-%postun -n trinity-kspy
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-kuiviewer
-Summary:	Viewer for Qt Designer user interface files
-Group:		Development/Languages/Other
-
-%description -n trinity-kuiviewer
-KUIViewer is a utility to display and test the user interface (.ui) files
-generated by Qt Designer.  The interfaces can be displayed in a variety of
-different widget styles.
-
-The Qt Designer itself is in the package qt3-designer.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kuiviewer
-%defattr(-,root,root,-)
-%{tde_bindir}/kuiviewer
-%{tde_tdelibdir}/libkuiviewerpart.so
-%{tde_tdelibdir}/libkuiviewerpart.la
-%{tde_tdelibdir}/quithumbnail.so
-%{tde_tdelibdir}/quithumbnail.la
-%{tde_tdeappdir}/kuiviewer.desktop
-%{tde_datadir}/apps/kuiviewer/
-%{tde_datadir}/apps/kuiviewerpart/
-%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
-%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
-%{tde_datadir}/services/designerthumbnail.desktop
-%{tde_datadir}/services/kuiviewer_part.desktop
-
-%post -n trinity-kuiviewer
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-kuiviewer
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-libcvsservice0
-Summary:	DCOP service for accessing CVS repositories
-Group:		Development/Languages/Other
-Requires:	cvs
-
-%description -n trinity-libcvsservice0
-This library provides a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard "dcop" command-line tool.
-
-DCOP is the Desktop Communication Protocol used throughout TDE.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-libcvsservice0
-%defattr(-,root,root,-)
-%{tde_bindir}/cvsaskpass
-%{tde_bindir}/cvsservice
-%{tde_libdir}/libcvsservice.so.*
-%{tde_libdir}/libkdeinit_cvsaskpass.so
-%{tde_libdir}/libkdeinit_cvsservice.so
-%{tde_tdelibdir}/cvsaskpass.la
-%{tde_tdelibdir}/cvsaskpass.so
-%{tde_tdelibdir}/cvsservice.la
-%{tde_tdelibdir}/cvsservice.so
-%{tde_datadir}/services/cvsservice.desktop
-
-%post -n trinity-libcvsservice0
-/sbin/ldconfig || :
-
-%postun -n trinity-libcvsservice0
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-libcvsservice-devel
-Summary:	Development files for CVS DCOP service
-Group:		Development/Libraries/Other
-Requires:	trinity-libcvsservice0 = %{version}-%{release}
-
-%description -n trinity-libcvsservice-devel
-The library libcvsservice provides a DCOP service for accessing and
-working with remote CVS repositories.  Applications may link with this
-library to access the DCOP service directly from C++.  Alternatively,
-scripts may access the service using the standard "dcop" command-line
-tool.
-
-Development files for libcvsservice are included in this package.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-libcvsservice-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/cvsjob_stub.h
-%{tde_tdeincludedir}/cvsservice_stub.h
-%{tde_tdeincludedir}/repository_stub.h
-%{tde_libdir}/libcvsservice.la
-%{tde_libdir}/libcvsservice.so
-%{tde_libdir}/libkdeinit_cvsaskpass.la
-%{tde_libdir}/libkdeinit_cvsservice.la
-%{tde_datadir}/cmake/cervisia.cmake
-
-%post -n trinity-libcvsservice-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-libcvsservice-devel
-/sbin/ldconfig || :
-
-##########
-
-%package -n trinity-poxml
-Summary:	Tools for using PO-files to translate DocBook XML files
-Group:		Development/Languages/Other
-
-%description -n trinity-poxml
-This is a collection of tools that facilitate translating DocBook XML
-files using gettext message files (PO-files).
-
-Also included are some miscellaneous command-line utilities for
-manipulating DocBook XML files, PO-files and PO-template files.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-poxml
-%defattr(-,root,root,-)
-%{tde_bindir}/po2xml
-%{tde_bindir}/split2po
-%{tde_bindir}/swappo
-%{tde_bindir}/transxx
-%{tde_bindir}/xml2pot
-
-##########
-
-%package -n trinity-umbrello
-Summary:	UML modelling tool and code generator
-Group:		Development/Languages/Other
-
-%description -n trinity-umbrello
-Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-umbrello
-%defattr(-,root,root,-)
-%{tde_bindir}/umbodoc
-%{tde_bindir}/umbrello
-%{tde_tdeappdir}/umbrello.desktop
-%{tde_datadir}/apps/umbrello/
-%{tde_datadir}/icons/crystalsvg/*/actions/umbrello_*.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/umbrellofile.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-%{tde_datadir}/icons/hicolor/*/apps/umbrello.png
-%{tde_datadir}/icons/hicolor/scalable/apps/umbrello.svgz
-%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
-%{tde_datadir}/mimelnk/application/x-umbrello.desktop
-%{tde_tdedocdir}/HTML/en/umbrello/
-
-%post -n trinity-umbrello
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-umbrello
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?build_kioslave}
-
-%package tdeio-plugins
-Summary:	Subversion ioslave for Trinity
-Group:		Development/Languages/Other
-Requires:	subversion
-
-Obsoletes:	trinity-tdesdk-kio-plugins < %{version}-%{release}
-Provides:	trinity-tdesdk-kio-plugins = %{version}-%{release}
-
-%description tdeio-plugins
-This package provides easy access to remote SVN repositories from within
-Konqueror, and TDE generally, by browsing them as if they were a
-filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/kio_svn_helper
-%{tde_tdelibdir}/kded_ksvnd.la
-%{tde_tdelibdir}/kded_ksvnd.so
-%{tde_tdelibdir}/kio_svn.la
-%{tde_tdelibdir}/kio_svn.so
-%{tde_datadir}/apps/konqueror/servicemenus/subversion_toplevel.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/subversion.desktop
-%{tde_datadir}/services/kded/ksvnd.desktop
-%{tde_datadir}/services/svn+file.protocol_tdesdk
-%{tde_datadir}/services/svn+http.protocol_tdesdk
-%{tde_datadir}/services/svn+https.protocol_tdesdk
-%{tde_datadir}/services/svn+ssh.protocol_tdesdk
-%{tde_datadir}/services/svn.protocol_tdesdk
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_remove.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_add.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_status.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_add.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_status.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_remove.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_switch.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_branch.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz
-
-%post tdeio-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesdk \
-    10
-done
-
-%postun tdeio-plugins
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesdk || :
-  done
-fi
-
-%endif
-
-##########
-
-%package -n trinity-tdeunittest
-Summary:	Unit testing library for Trinity
-Group:		Development/Languages/Other
-
-Obsoletes:	trinity-kunittest < %{version}-%{release}
-Provides:	trinity-kunittest = %{version}-%{release}
-
-%description -n trinity-tdeunittest
-tdeunittest is a small library that facilitates the writing of tests for
-TDE developers. There are two ways to use the tdeunittest library. One is
-to create dynamically loadable modules and use the tdeunittestmodrunner or
-tdeunittestguimodrunner programs to run the tests. The other is to use the
-libraries to create your own testing application.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdeunittest
-%defattr(-,root,root,-)
-%{tde_bindir}/kunittest
-%{tde_bindir}/kunittest_debughelper
-%{tde_bindir}/kunittestmod
-%{tde_bindir}/kunittestguimodrunner
-%{tde_libdir}/libkunittestgui.la
-%{tde_libdir}/libkunittestgui.so.*
-
-%post -n trinity-tdeunittest
-/sbin/ldconfig || :
-
-%postun -n trinity-tdeunittest
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries/Other
-
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-kbabel-devel = %{version}-%{release}
-Requires:	%{name}-misc = %{version}-%{release}
-Requires:	trinity-kspy = %{version}-%{release}
-Requires:	trinity-kmtrace = %{version}-%{release}
-Requires:	trinity-tdeunittest = %{version}-%{release}
-Requires:	trinity-libcvsservice-devel = %{version}-%{release}
-Requires:	trinity-kompare = %{version}-%{release}
-
-Obsoletes:	trinity-kdesdk-devel < %{version}-%{release}
-Provides:	trinity-kdesdk-devel = %{version}-%{release}
-
-%description devel
-This package contains the development files for tdesdk.
-
-%files devel
-%defattr(-,root,root,-)
-# misc
-%{tde_tdeincludedir}/kprofilemethod.h
-%{tde_libdir}/libkstartperf.so
-# kspy
-%{tde_tdeincludedir}/kspy.h
-%{tde_libdir}/libkspy.so
-# kmtrace
-%{tde_libdir}/kmtrace/libktrace_s.a
-%{tde_tdeincludedir}/ktrace.h
-# tdeunittest
-%{tde_libdir}/libkunittestgui.so
-%{tde_tdeincludedir}/kunittest/runnergui.h
-# kompare
-%{tde_libdir}/libkompareinterface.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%{?tde_patch:%patch1 -p1}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_DBSEARCHENGINE=ON \
-  -DWITH_KCAL=ON \
-  -DBUILD_ALL=ON \
-  %{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot} 
-
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-# Installs kdepalettes
-%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc
-%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp
-%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README
-
-# Installs SVN protocols as alternatives
-%if 0%{?build_kioslave}
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
-%endif
-
-# Removes useless stuff
-%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
-
-# Fix permissions
-chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global
-
-# Make kapptemplate archive
-pushd  %{?buildroot}%{tde_datadir}/apps/kapptemplate
-mkdir kapptemplate
-mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/
-tar cfz kapptemplate.tar.gz kapptemplate
-rm -rf kapptemplate
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    kuiviewer      Development GUIDesigner
-%suse_update_desktop_file    umbrello       Development Design
-%suse_update_desktop_file    kbugbuster     Development Debugger
-%suse_update_desktop_file -u catalogmanager Development Translation
-%suse_update_desktop_file    kbabel         Development Translation
-%suse_update_desktop_file -u kbabeldict     Development Translation
-%suse_update_desktop_file    cervisia       Development RevisionControl
-%suse_update_desktop_file    kompare        Development RevisionControl
-%suse_update_desktop_file    kcachegrind    Development Profiling
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
deleted file mode 100644
index 28542f0b2..000000000
--- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec
+++ /dev/null
@@ -1,430 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Summary:	Trinity Desktop Environment - Toys and Amusements
-Name:		trinity-tdetoys
-Group:		Amusements/Graphics
-Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:	GPLv2+
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: cmake >= 2.8
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: gettext
-
-Obsoletes:		trinity-kdetoys < %{version}-%{release}
-Provides:		trinity-kdetoys = %{version}-%{release}
-
-# Metapackage
-Requires: trinity-amor = %{version}-%{release}
-Requires: trinity-eyesapplet = %{version}-%{release}
-Requires: trinity-fifteenapplet = %{version}-%{release}
-Requires: trinity-kmoon = %{version}-%{release}
-Requires: trinity-kodo = %{version}-%{release}
-Requires: trinity-kteatime = %{version}-%{release}
-Requires: trinity-ktux = %{version}-%{release}
-Requires: trinity-kweather = %{version}-%{release}
-Requires: trinity-kworldclock = %{version}-%{release}
-
-
-%description
-Includes: 
-* amor: Amusing Misuse Of Resources put's comic figures above your windows
-* eyesapplet: a kicker applet similar to XEyes
-* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
-* kmoon: system tray applet showing the moon phase
-* kodo: mouse movement meter
-* kteatime: system tray applet that makes sure your tea doesn't get too strong
-* ktux: Tux-in-a-Spaceship screen saver
-* kweather: kicker applet that will display the current weather outside
-* kworldwatch: application and kicker applet showing daylight area on the world
-               globe
-
-NOTE: kicker applets and screen savers require tdebase to be installed, 
-and user to be logged-in to TDE.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-
-##########
-
-%package -n trinity-amor
-Summary:	a Trinity creature for your desktop
-Group:		Amusements/Graphics
-
-%description -n trinity-amor
-AMOR stands for Amusing Misuse Of Resources. It provides several different
-characters who prance around your X screen doing tricks and giving you tips.
-
-Note that AMOR will only work with some window managers. Both TWin (the
-TDE window manager) and Metacity (a GTK2 window manager) are supported.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-amor
-%defattr(-,root,root,-)
-%{tde_bindir}/amor
-%{tde_datadir}/apps/amor/
-%{tde_tdeappdir}/amor.desktop
-%{tde_datadir}/icons/hicolor/*/apps/amor.png
-%{tde_tdedocdir}/HTML/en/amor/
-%doc AUTHORS COPYING README
-
-%post -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-amor
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-eyesapplet
-Summary:	eyes applet for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-eyesapplet
-An applet for the TDE panel containing a pair of eyes that follow your mouse
-around the screen.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-eyesapplet
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/eyes_panelapplet.la
-%{tde_tdelibdir}/eyes_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
-%doc AUTHORS COPYING README
-
-##########
-
-%package -n trinity-fifteenapplet
-Summary:	fifteen pieces puzzle for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-fifteenapplet
-An applet for the TDE panel that lets you play the Fifteen Pieces
-sliding block puzzle. You have to order 15 pieces in a 4x4 square by
-moving them around.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-fifteenapplet
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/fifteen_panelapplet.la
-%{tde_tdelibdir}/fifteen_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
-%doc AUTHORS COPYING README
-
-##########
-
-%package -n trinity-kmoon
-Summary:	moon phase indicator for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-kmoon
-An applet for the TDE panel that displays the current phase of the moon.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kmoon
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kmoon_panelapplet.la
-%{tde_tdelibdir}/kmoon_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
-%{tde_datadir}/apps/kmoon/
-%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
-%{tde_tdedocdir}/HTML/en/kmoon/
-%doc AUTHORS COPYING README
-
-%post -n trinity-kmoon
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-##########
-
-%package -n trinity-kodo
-Summary:	mouse odometer for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-kodo
-KOdometer measures your desktop mileage. It tracks the movement of your mouse
-pointer across your desktop and renders it in inches/feet/miles! It can
-do cm/metres/km too. Its most exciting feature is the tripometer.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kodo
-%defattr(-,root,root,-)
-%{tde_bindir}/kodo
-%{tde_tdeappdir}/kodo.desktop
-%{tde_datadir}/apps/kodo/numbers.png
-%{tde_datadir}/icons/hicolor/*/apps/kodo.png
-%{tde_tdedocdir}/HTML/en/kodo/
-%doc AUTHORS COPYING README
-
-%post -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kodo
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kteatime
-Summary:	Trinity utility for making a fine cup of tea
-Group:		Amusements/Graphics
-
-%description -n trinity-kteatime
-KTeaTime is a handy timer for steeping tea. No longer will you have to
-guess at how long it takes for your tea to be ready. Simply select the
-type of tea you have, and it will alert you when the tea is ready to
-drink.
-
-KTeaTime sits in the Trinity system tray.
-
-Please note that KTeaTime is written explicitly for Trinity. If you are
-using a non-TDE window manager or desktop environment then it is quite
-possible that KTeaTime will not work on your system.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kteatime
-%defattr(-,root,root,-)
-%{tde_bindir}/kteatime
-%{tde_tdeappdir}/kteatime.desktop
-%{tde_datadir}/apps/kteatime/
-%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
-%{tde_tdedocdir}/HTML/en/kteatime/
-%doc AUTHORS COPYING README
-
-%post -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kteatime
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ktux
-Summary:	Tux screensaver for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-ktux
-A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-ktux
-%defattr(-,root,root,-)
-%{tde_bindir}/ktux
-%{tde_datadir}/apps/ktux/
-%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktux.png
-%doc AUTHORS COPYING README
-
-%post -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun -n trinity-ktux
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-
-##########
-
-%package -n trinity-kweather
-Summary:	weather display applet for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-kweather
-An applet for the TDE panel that displays your area's current weather.
-Information shown includes the temperature, wind speed, air pressure
-and more. By pressing a button a full weather report can be obtained.
-
-KWeather also provides a weather service that can track multiple weather
-stations and provide this information to other applications, including
-Konqueror's sidebar and Kontact's summary page.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kweather
-%defattr(-,root,root,-)
-%{tde_bindir}/kweatherservice
-%{tde_bindir}/kweatherreport
-%{tde_libdir}/libkdeinit_kweatherreport.so
-%{tde_libdir}/libkdeinit_kweatherreport.la
-%{tde_tdelibdir}/kcm_weather.so
-%{tde_tdelibdir}/kcm_weather.la
-%{tde_tdelibdir}/kcm_weatherservice.so
-%{tde_tdelibdir}/kcm_weatherservice.la
-%{tde_tdelibdir}/kweatherreport.so
-%{tde_tdelibdir}/kweatherreport.la
-%{tde_tdelibdir}/weather_panelapplet.la
-%{tde_tdelibdir}/weather_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kweather.desktop
-%{tde_datadir}/apps/kweather/
-%{tde_datadir}/apps/kweatherservice/stations.dat
-%{tde_datadir}/apps/kweatherservice/weather_stations.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kweather.png
-%{tde_datadir}/services/kweatherservice.desktop
-%{tde_datadir}/services/kcmweather.desktop
-%{tde_datadir}/services/kcmweatherservice.desktop
-%{tde_tdedocdir}/HTML/en/kweather/
-%doc AUTHORS COPYING README
-
-%post -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kweather
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kworldclock
-Summary:	earth watcher for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-kworldclock
-Displays where in the world it is light and dark depending on time, as
-well as offering the time in all of the major cities of the world.
-This can be run standalone, as an applet in the KDE panel or as a
-desktop background.
-
-Additional kworldclock themes are available in the tdeartwork-misc package.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kworldclock
-%defattr(-,root,root,-)
-%{tde_bindir}/kworldclock
-%{tde_tdelibdir}/ww_panelapplet.la
-%{tde_tdelibdir}/ww_panelapplet.so
-%{tde_tdeappdir}/kworldclock.desktop
-%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
-%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
-%{tde_datadir}/apps/kworldclock/
-%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
-%{tde_tdedocdir}/HTML/en/kworldclock/
-%doc AUTHORS COPYING README
-
-%post -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kworldclock
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export KDEDIR=%{tde_prefix}
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install DESTDIR=%{buildroot} -C build
-
-# Useless include file from Amor
-%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
deleted file mode 100644
index 13f1e9c46..000000000
--- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec
+++ /dev/null
@@ -1,1063 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_sbindir %{tde_prefix}/sbin
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdeutils
-Version:	%{tde_version}
-Release:	%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
-License:	GPL
-Summary:	TDE Utilities
-Group:		Applications/System
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	klaptop_acpi_helper.pam
-Source2:	klaptop_acpi_helper.console
-Source3:	kcmlaptoprc
-
-Patch1:		kdeutils-3.5.13.2-rhel4.patch
-
-Obsoletes:	trinity-kdeutils < %{version}-%{release}
-Provides:	trinity-kdeutils = %{version}-%{release}
-Obsoletes:	trinity-kdeutils-extras < %{version}-%{release}
-Provides:	trinity-kdeutils-extras = %{version}-%{release}
-Obsoletes:	tdeutils < %{version}-%{release}
-Provides:	tdeutils = %{version}-%{release}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gettext
-BuildRequires:	net-snmp-devel
-BuildRequires:	python-devel
-BuildRequires:	gmp-devel
-
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXtst-devel
-%endif
-
-#%if 0%{?fedora}
-#BuildRequires:	xmms-devel
-#%endif
-
-# KLAPTOPDAEMON
-#  Not for RHEL 4!
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define build_klaptopdaemon 1
-%endif
-
-# XSCREENSAVER support
-#  Not for RHEL 4!
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_xscreensaver 1
-%endif
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-
-Requires: trinity-ark = %{version}-%{release}
-Requires: trinity-kcalc = %{version}-%{release}
-Requires: trinity-kcharselect = %{version}-%{release}
-Requires: trinity-kdelirc = %{version}-%{release}
-Requires: trinity-kdessh = %{version}-%{release}
-Requires: trinity-kdf = %{version}-%{release}
-Requires: trinity-kedit = %{version}-%{release}
-Requires: trinity-kfloppy = %{version}-%{release}
-Requires: trinity-kgpg = %{version}-%{release}
-Requires: trinity-khexedit = %{version}-%{release}
-Requires: trinity-kjots = %{version}-%{release}
-%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{version}-%{release}}
-Requires: trinity-kmilo = %{version}-%{release}
-Requires: trinity-kmilo-legacy = %{version}-%{release}
-Requires: trinity-kregexpeditor = %{version}-%{release}
-Requires: trinity-ksim = %{version}-%{release}
-Requires: trinity-ktimer = %{version}-%{release}
-Requires: trinity-kwalletmanager = %{version}-%{release}
-Requires: trinity-superkaramba = %{version}-%{release}
-
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * kdepasswd (change password)
-  * kdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
-%if 0%{?build_klaptopdaemon}
-  * klaptopdaemon (battery monitoring and management for laptops);
-%endif
-  * kmilo
-  * kregexpeditor (regular expression editor)
-  * ksim (system information monitor);
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
-
-%files
-
-##########
-
-%package -n trinity-ark
-Summary:	graphical archiving tool for Trinity
-Group:		Applications/Utilities
-#Requires:	ncompress
-Requires:	unzip
-Requires:	zip
-#Requires:	zoo
-Requires:	bzip2
-#Requires:	p7zip
-#Requires:	xz
-#Requires:	lzma
-#Requires:	rar, unrar
-
-%description -n trinity-ark
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
- 
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if appropriate command-line programs are installed).
-
-Ark can work closely with Konqueror in the KDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-
-%files -n trinity-ark
-%defattr(-,root,root,-)
-%{tde_bindir}/ark
-%{tde_tdelibdir}/ark.la
-%{tde_tdelibdir}/ark.so
-%{tde_tdelibdir}/libarkpart.la
-%{tde_tdelibdir}/libarkpart.so
-%{tde_libdir}/libkdeinit_ark.so
-%{tde_tdeappdir}/ark.desktop
-%{tde_datadir}/apps/ark/
-%{tde_datadir}/config.kcfg/ark.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ark.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
-%{tde_datadir}/services/ark_part.desktop
-%{tde_tdedocdir}/HTML/en/ark/
-
-%post -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ark
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcalc
-Summary:	calculator for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcalc
-KCalc is TDE's scientific calculator.
-
-It provides:
-* trigonometric functions, logic operations, and statistical calculations
-* easy cut and paste of numbers from/into its display
-* a results-stack which lets you conveniently recall previous results
-* configurable precision, and number of digits after the period
-
-%files -n trinity-kcalc
-%defattr(-,root,root,-)
-%{tde_bindir}/kcalc
-%{tde_tdelibdir}/kcalc.la
-%{tde_tdelibdir}/kcalc.so
-%{tde_libdir}/libkdeinit_kcalc.so
-%{tde_tdeappdir}/kcalc.desktop
-%{tde_datadir}/apps/kcalc/
-%{tde_datadir}/apps/kconf_update/kcalcrc.upd
-%{tde_datadir}/config.kcfg/kcalc.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%{tde_tdedocdir}/HTML/en/kcalc/
-
-%post -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcalc
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kcharselect
-Summary:	character selector for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcharselect
-A character set selector for TDE.
-
-%files -n trinity-kcharselect
-%defattr(-,root,root,-)
-%{tde_bindir}/kcharselect
-%{tde_tdelibdir}/kcharselect_panelapplet.la
-%{tde_tdelibdir}/kcharselect_panelapplet.so
-%{tde_tdeappdir}/KCharSelect.desktop
-%{tde_datadir}/apps/kcharselect/
-%{tde_datadir}/apps/kconf_update/kcharselect.upd
-%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
-%{tde_tdedocdir}/HTML/en/kcharselect/
-
-%post -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kcharselect
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdelirc
-Summary:	infrared control for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdelirc
-This is a frontend for the LIRC suite to use infrared devices with TDE.
-
-%files -n trinity-kdelirc
-%defattr(-,root,root,-)
-%{tde_bindir}/irkick
-%{tde_tdelibdir}/irkick.la
-%{tde_tdelibdir}/irkick.so
-%{tde_tdelibdir}/kcm_kcmlirc.la
-%{tde_tdelibdir}/kcm_kcmlirc.so
-%{tde_libdir}/libkdeinit_irkick.so
-%{tde_tdeappdir}/irkick.desktop
-%{tde_tdeappdir}/kcmlirc.desktop
-%{tde_datadir}/apps/irkick/
-%{tde_datadir}/apps/profiles/klauncher.profile.xml
-%{tde_datadir}/apps/profiles/konqueror.profile.xml
-%{tde_datadir}/apps/profiles/noatun.profile.xml
-%{tde_datadir}/apps/profiles/profile.dtd
-%{tde_datadir}/apps/remotes/RM-0010.remote.xml
-%{tde_datadir}/apps/remotes/cimr100.remote.xml
-%{tde_datadir}/apps/remotes/hauppauge.remote.xml
-%{tde_datadir}/apps/remotes/remote.dtd
-%{tde_datadir}/apps/remotes/sherwood.remote.xml
-%{tde_datadir}/apps/remotes/sonytv.remote.xml
-%{tde_datadir}/autostart/irkick.desktop
-%{tde_datadir}/icons/hicolor/*/apps/irkick.png
-%{tde_datadir}/icons/locolor/*/apps/irkick.png
-%{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcmlirc/
-
-%post -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdelirc
-/sbin/ldconfig
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kdessh
-Summary:	ssh frontend for Trinity
-Group:		Applications/Utilities
-%if 0%{?suse_version}
-Requires:	openssh
-%else
-Requires:	openssh-clients
-%endif
-
-%description -n trinity-kdessh
-This package contains TDE's frontend for ssh.
-
-%files -n trinity-kdessh
-%defattr(-,root,root,-)
-%{tde_bindir}/kdessh
-
-##########
-
-%package -n trinity-kdf
-Summary:	disk space utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kdf
-KDiskFree displays the available file devices (hard drive partitions, floppy
-and CD drives, etc.) along with information on their capacity, free space, type
-and mount point. It also allows you to mount and unmount drives and view them
-in a file manager.
-
-%files -n trinity-kdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kdf
-%{tde_bindir}/kwikdisk
-%{tde_tdelibdir}/kcm_kdf.la
-%{tde_tdelibdir}/kcm_kdf.so
-%{tde_tdeappdir}/kcmdf.desktop
-%{tde_tdeappdir}/kdf.desktop
-%{tde_tdeappdir}/kwikdisk.desktop
-%{tde_datadir}/apps/kdf/
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
-%{tde_tdedocdir}/HTML/en/kdf/
-%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/
-
-%post -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kdf
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kedit
-Summary:	basic text editor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kedit
-A simple text editor for TDE.
-
-It can be used with Konqueror for text and configuration file browsing.
-KEdit also serves well for creating small plain text documents. KEdit's
-functionality will intentionally remain rather limited to ensure a
-reasonably fast start.
-
-%files -n trinity-kedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kedit
-%{tde_tdelibdir}/kedit.la
-%{tde_tdelibdir}/kedit.so
-%{tde_libdir}/libkdeinit_kedit.so
-%{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
-%{tde_datadir}/config.kcfg/kedit.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kedit.png
-%{tde_tdedocdir}/HTML/en/kedit/
-
-%post -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kfloppy
-Summary:	floppy formatter for Trinity
-Group:		Applications/Utilities
-Requires:	dosfstools
-
-%description -n trinity-kfloppy
-Kfloppy is a utility that provides a straightforward graphical means
-to format 3.5" and 5.25" floppy disks.
-
-%files -n trinity-kfloppy
-%defattr(-,root,root,-)
-%{tde_bindir}/kfloppy
-%{tde_tdeappdir}/KFloppy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
-%{tde_tdedocdir}/HTML/en/kfloppy/
-
-%post -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfloppy
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kgpg
-Summary:	GnuPG frontend for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-konsole
-Requires:	gnupg
-
-%description -n trinity-kgpg
-Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
-encryption, file decryption and key management.
-
-Features:
-* an editor mode for easily and quickly encrypting or decrypting a file
-  or message which is typed, copied, pasted or dragged into the editor,
-  or which is double-clicked in the file manager
-* Konqueror integration for encrypting or decrypting files
-* a panel applet for encrypting / decrypting files or the clipboard
-  contents, etc.
-* key management functions (generation, import, export, deletion and
-  signing)
-* decrypting clipboard contents, including integration with Klipper
-
-%files -n trinity-kgpg
-%defattr(-,root,root,-)
-%{tde_bindir}/kgpg
-%{tde_tdeappdir}/kgpg.desktop
-%{tde_datadir}/apps/kgpg/
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
-%{tde_datadir}/autostart/kgpg.desktop
-%{tde_datadir}/config.kcfg/kgpg.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
-%{tde_tdedocdir}/HTML/en/kgpg/
-
-%post -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kgpg
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-khexedit
-Summary:	Trinity hex editor
-Group:		Applications/Utilities
-
-%description -n trinity-khexedit
-KHexEdit is an editor for the raw data of binary files.  It includes
-find/replace functions, bookmarks, many configuration options, drag and drop
-support and other powerful features.
-
-%files -n trinity-khexedit
-%defattr(-,root,root,-)
-%{tde_bindir}/khexedit
-%{tde_tdelibdir}/libkbyteseditwidget.la
-%{tde_tdelibdir}/libkbyteseditwidget.so
-%{tde_tdelibdir}/libkhexedit2part.la
-%{tde_tdelibdir}/libkhexedit2part.so
-%{tde_libdir}/libkhexeditcommon.so.*
-%{tde_tdeappdir}/khexedit.desktop
-%{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
-%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
-%{tde_datadir}/services/kbyteseditwidget.desktop
-%{tde_datadir}/services/khexedit2part.desktop
-%{tde_tdedocdir}/HTML/en/khexedit/
-
-%post -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-khexedit
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kjots
-Summary:	note taking utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kjots
-Kjots is a small note taker program. Name and idea are taken from the jots
-program included in the tkgoodstuff package.
-
-%files -n trinity-kjots
-%defattr(-,root,root,-)
-%{tde_bindir}/kjots
-%{tde_tdeappdir}/Kjots.desktop
-%{tde_datadir}/apps/kjots/
-%{tde_datadir}/config.kcfg/kjots.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kjots.png
-%{tde_tdedocdir}/HTML/en/kjots/
-
-%post -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kjots
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%if 0%{?build_klaptopdaemon}
-
-%package -n trinity-klaptopdaemon
-Summary:	battery monitoring and management for laptops using Trinity
-Group:		Applications/Utilities
-Requires:	pm-utils
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-klaptopdaemon
-This package contains utilities to monitor batteries and configure
-power management, for laptops, from within TDE.
-
-%files -n trinity-klaptopdaemon
-%defattr(-,root,root,-)
-%{tde_bindir}/klaptop_acpi_helper
-%{tde_bindir}/klaptop_check
-%{tde_tdelibdir}/kcm_laptop.la
-%{tde_tdelibdir}/kcm_laptop.so
-%{tde_tdelibdir}/kded_klaptopdaemon.la
-%{tde_tdelibdir}/kded_klaptopdaemon.so
-%{tde_libdir}/libkcmlaptop.so.*
-%{tde_tdeappdir}/laptop.desktop
-%{tde_tdeappdir}/pcmcia.desktop
-%{tde_datadir}/apps/klaptopdaemon/
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%{tde_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-# ConsoleHelper support
-%if 0%{?with_consolehelper}
-%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{tde_sbindir}/klaptop_acpi_helper
-%{_sbindir}/klaptop_acpi_helper
-%endif
-
-%config %{tde_datadir}/config/kcmlaptoprc
-
-%post -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klaptopdaemon
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%endif
-
-##########
-
-%package -n trinity-kmilo
-Summary:	laptop special keys support for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kmilo
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
-with special keys.
-
-%files -n trinity-kmilo
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_kmilod.la
-%{tde_tdelibdir}/kded_kmilod.so
-%{tde_tdelibdir}/kmilo_generic.la
-%{tde_tdelibdir}/kmilo_generic.so
-%{tde_libdir}/libkmilo.so.*
-%{tde_datadir}/services/kded/kmilod.desktop
-%{tde_datadir}/services/kmilo/kmilo_generic.desktop
-%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-
-%post -n trinity-kmilo
-/sbin/ldconfig
-
-%postun -n trinity-kmilo
-/sbin/ldconfig
-
-##########
-
-%package -n trinity-kmilo-legacy
-Summary:	non-standard plugins for KMilo
-Group:		Applications/Utilities
-Requires:	trinity-kmilo = %{version}-%{release}
-
-%description -n trinity-kmilo-legacy
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads and Vaios.
-
-The intention is that all laptops work with the generic kmilo
-plugin, if you need this package please file a bug.
-
-%files -n trinity-kmilo-legacy
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kvaio.la
-%{tde_tdelibdir}/kcm_kvaio.so
-%{tde_tdelibdir}/kcm_thinkpad.la
-%{tde_tdelibdir}/kcm_thinkpad.so
-%{tde_tdelibdir}/kmilo_asus.la
-%{tde_tdelibdir}/kmilo_asus.so
-%{tde_tdelibdir}/kmilo_delli8k.la
-%{tde_tdelibdir}/kmilo_delli8k.so
-%{tde_tdelibdir}/kmilo_kvaio.la
-%{tde_tdelibdir}/kmilo_kvaio.so
-%{tde_tdelibdir}/kmilo_thinkpad.la
-%{tde_tdelibdir}/kmilo_thinkpad.so
-%{tde_tdeappdir}/kvaio.desktop
-%{tde_tdeappdir}/thinkpad.desktop
-%{tde_datadir}/services/kmilo/kmilo_asus.desktop
-%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
-%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
-%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
-
-##########
-
-%package -n trinity-kregexpeditor
-Summary:	graphical regular expression editor plugin for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kregexpeditor
-This package contains a graphical regular expression editor plugin for use
-with TDE. It let you draw your regular expression in an unambiguous way.
-
-%files -n trinity-kregexpeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kregexpeditor
-%{tde_tdelibdir}/libkregexpeditorgui.la
-%{tde_tdelibdir}/libkregexpeditorgui.so
-%{tde_libdir}/libkregexpeditorcommon.so.*
-%{tde_tdeappdir}/kregexpeditor.desktop
-%{tde_datadir}/apps/kregexpeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
-%{tde_datadir}/services/kregexpeditorgui.desktop
-%{tde_tdedocdir}/HTML/en/KRegExpEditor/
-
-%post -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kregexpeditor
-/sbin/ldconfig
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-ksim
-Summary:	system information monitor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ksim
-KSim is a system monitor app which has its own plugin system with support
-for GKrellm skins. It allows users to follow uptime, memory usage, network
-connections, power, etc.
-
-%files -n trinity-ksim
-%defattr(-,root,root,-)
-%config %{tde_datadir}/config/ksim_panelextensionrc
-%{tde_tdelibdir}/ksim_*.la
-%{tde_tdelibdir}/ksim_*.so
-%{tde_libdir}/libksimcore.so.*
-%{tde_datadir}/apps/kicker/extensions/ksim.desktop
-%{tde_datadir}/apps/ksim/
-%{tde_tdedocdir}/HTML/en/ksim/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
-%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
-
-%post -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-ksim
-/sbin/ldconfig
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null  ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-%package -n trinity-ktimer
-Summary:	timer utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ktimer
-This is a timer application for TDE. It allows you to execute commands after
-a certain amount of time. It supports looping commands as well as delayed
-command execution.
-
-%files -n trinity-ktimer
-%defattr(-,root,root,-)
-%{tde_bindir}/ktimer
-%{tde_tdeappdir}/ktimer.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
-%{tde_tdedocdir}/HTML/en/ktimer/
-
-%post -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-ktimer
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kwalletmanager
-Summary:	wallet manager for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kwalletmanager
-This program keeps various wallets for any kind of data that the user can
-store encrypted with passwords and can also serve as a password manager that
-keeps a master password to all wallets.
-
-%files -n trinity-kwalletmanager
-%defattr(-,root,root,-)
-%{tde_bindir}/kwalletmanager
-%{tde_tdelibdir}/kcm_kwallet.la
-%{tde_tdelibdir}/kcm_kwallet.so
-%{tde_tdeappdir}/kwalletconfig.desktop
-%{tde_tdeappdir}/kwalletmanager.desktop
-%{tde_tdeappdir}/kwalletmanager-kwalletd.desktop
-%{tde_datadir}/apps/kwalletmanager/
-%{tde_datadir}/icons/hicolor/*/apps/kwalletmanager.png
-%{tde_datadir}/services/kwallet_config.desktop
-%{tde_datadir}/services/kwalletmanager_show.desktop
-%{tde_tdedocdir}/HTML/en/kwallet/
-
-%post -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kwalletmanager
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-superkaramba
-Summary:	a program based on karamba improving the eyecandy of TDE
-Group:		Applications/Utilities
-
-%description -n trinity-superkaramba
-SuperKaramba is a tool based on karamba that allows anyone to easily create
-and run little interactive widgets on a TDE desktop. Widgets are defined in a
-simple text file and can be augmented with Python code to make them
-interactive.
-
-Here are just some examples of the things that can be done:
-* Display system information such as CPU Usage, MP3 playing, etc.
-* Create cool custom toolbars that work any way imaginable.
-* Create little games or virtual pets that live on your desktop.
-* Display information from the internet, such as weather and headlines.
-
-%files -n trinity-superkaramba
-%defattr(-,root,root,-)
-%{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
-%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
-%{tde_tdedocdir}/HTML/en/superkaramba/
-
-%post -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-%postun -n trinity-superkaramba
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-
-##########
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Obsoletes:	trinity-kdeutils-devel < %{version}-%{release}
-Provides:	trinity-kdeutils-devel = %{version}-%{release}
-Obsoletes:	tdeutils-devel < %{version}-%{release}
-Provides:	tdeutils-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*
-%if 0%{?build_klaptopdaemon}
-%{tde_libdir}/libkcmlaptop.la
-%{tde_libdir}/libkcmlaptop.so
-%endif
-%{tde_libdir}/libkdeinit_ark.la
-%{tde_libdir}/libkdeinit_irkick.la
-%{tde_libdir}/libkdeinit_kcalc.la
-%{tde_libdir}/libkdeinit_kedit.la
-%{tde_libdir}/libkmilo.la
-%{tde_libdir}/libkmilo.so
-%{tde_libdir}/libkregexpeditorcommon.la
-%{tde_libdir}/libkregexpeditorcommon.so
-%{tde_libdir}/libksimcore.la
-%{tde_libdir}/libksimcore.so
-%{tde_libdir}/libkhexeditcommon.la
-%{tde_libdir}/libkhexeditcommon.so
-%{tde_datadir}/cmake/libksimcore.cmake
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .rhel4
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Do not build against any "/usr" installed KDE
-export KDEDIR="%{tde_prefix}"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_DPMS=ON \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  -DWITH_ASUS=ON \
-  -DWITH_POWERBOOK=OFF \
-  -DWITH_POWERBOOK2=OFF \
-  -DWITH_VAIO=ON \
-  -DWITH_THINKPAD=ON \
-  -DWITH_I8K=ON \
-  -DWITH_SNMP=ON \
-  -DWITH_SENSORS=ON \
-  -DWITH_XMMS=ON \
-  -DWITH_KNEWSTUFF=ON \
-  -DBUILD_ALL=ON \
-  %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
-  ..
-   
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%if 0%{?build_klaptopdaemon}
-### Use consolehelper for 'klaptop_acpi_helper'
-%if 0%{?with_consolehelper}
-# Install configuration files
-%__install -p -D -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper"
-%__install -p -D -m 644 "%{SOURCE2}" "%{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper"
-# Moves the actual binary from 'bin' to 'sbin'
-%__mkdir_p "%{buildroot}%{tde_sbindir}" "%{buildroot}%{_sbindir}"
-%__mv "%{buildroot}%{tde_bindir}/klaptop_acpi_helper" "%{buildroot}%{tde_sbindir}"
-# Links to consolehelper
-%__ln_s "%{_bindir}/consolehelper" "%{buildroot}%{tde_bindir}/klaptop_acpi_helper"
-# Put another symlink under '/usr', otherwise consolehelper does not work
-%if "%{tde_prefix}" != "/usr"
-%__ln_s "%{tde_sbindir}/klaptop_acpi_helper" "%{?buildroot}%{_sbindir}/klaptop_acpi_helper"
-%endif
-%endif
-
-# klaptop settings file
-%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc"
-
-%else
-
-# Klaptop's documentation is installed even if we did not build the program ...
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-%endif
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-
-%changelog
diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
deleted file mode 100644
index 0186370c8..000000000
--- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec
+++ /dev/null
@@ -1,659 +0,0 @@
-#
-# spec file for package tdevelop (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tdevelop
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Integrated Development Environment for C++/C
-Version:	%{tde_version}
-Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Development/Tools
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Requires:	%{name}-libs = %{version}-%{release}
-
-BuildRequires:	tqt3-apps-devel >= 3.5.0
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdevelop < %{version}-%{release}
-Provides:	trinity-kdevelop = %{version}-%{release}
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-BuildRequires:	make
-
-Requires:	make
-Requires:	perl
-Requires:	qt3-devel >= 3.3.8.d
-Requires:	gettext
-Requires:	ctags
-
-
-# LIBIDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# DB4 support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	db4-devel
-%endif
-
-# FLEX support
-BuildRequires:	flex
-Requires: flex >= 2.5.4
-
-# SVN support
-BuildRequires:	subversion-devel
-
-# NEON support
-BuildRequires:	neon-devel
-
-# LDAP support
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
-%endif
-
-# LIBACL support
-%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libacl-devel
-%endif
-
-%description
-The TDevelop Integrated Development Environment provides many features
-that developers need as well as providing a unified interface to programs
-like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
-
-All development tools needed for C++ programming like Compiler,
-Linker, automake and autoconf; KAppWizard, which generates complete,
-ready-to-go sample applications; Classgenerator, for creating new
-classes and integrating them into the current project; File management
-for sources, headers, documentation etc. to be included in the
-project; The creation of User-Handbooks written with SGML and the
-automatic generation of HTML-output with the KDE look and feel;
-Automatic HTML-based API-documentation for your project's classes with
-cross-references to the used libraries; Internationalization support
-for your application, allowing translators to easily add their target
-language to a project;
-
-tdevelop also includes WYSIWYG (What you see is what you get)-creation
-of user interfaces with a built-in dialog editor; Debugging your
-application by integrating KDbg; Editing of project-specific pixmaps
-with KIconEdit; The inclusion of any other program you need for
-development by adding it to the "Tools"-menu according to your
-individual needs.
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kdevassistant
-%{tde_bindir}/kdevdesigner
-%{tde_bindir}/kdevelop
-%{tde_bindir}/kdevelop-htdig
-%{tde_bindir}/kdevprj2kdevelop
-%{tde_bindir}/kdevprofileeditor
-%{tde_libdir}/kconf_update_bin/kdev-gen-settings-kconf_update
-%{tde_tdeappdir}/kdevassistant.desktop
-%{tde_tdeappdir}/kdevdesigner.desktop
-%{tde_tdeappdir}/kdevelop.desktop
-%{tde_tdeappdir}/kdevelop_c_cpp.desktop
-%{tde_tdeappdir}/kdevelop_kde_cpp.desktop
-%{tde_tdeappdir}/kdevelop_ruby.desktop
-%{tde_tdeappdir}/kdevelop_scripting.desktop
-%{tde_tdelibdir}/kio_chm.la
-%{tde_tdelibdir}/kio_chm.so
-%{tde_tdelibdir}/kio_csharpdoc.la
-%{tde_tdelibdir}/kio_csharpdoc.so
-%{tde_tdelibdir}/kio_perldoc.la
-%{tde_tdelibdir}/kio_perldoc.so
-%{tde_tdelibdir}/kio_pydoc.la
-%{tde_tdelibdir}/kio_pydoc.so
-%{tde_tdelibdir}/libdocchmplugin.la
-%{tde_tdelibdir}/libdocchmplugin.so
-%{tde_tdelibdir}/libdoccustomplugin.la
-%{tde_tdelibdir}/libdoccustomplugin.so
-%{tde_tdelibdir}/libdocdevhelpplugin.la
-%{tde_tdelibdir}/libdocdevhelpplugin.so
-%{tde_tdelibdir}/libdocdoxygenplugin.la
-%{tde_tdelibdir}/libdocdoxygenplugin.so
-%{tde_tdelibdir}/libdockdevtocplugin.la
-%{tde_tdelibdir}/libdockdevtocplugin.so
-%{tde_tdelibdir}/libdocqtplugin.la
-%{tde_tdelibdir}/libdocqtplugin.so
-%{tde_tdelibdir}/libkchmpart.la
-%{tde_tdelibdir}/libkchmpart.so
-%{tde_tdelibdir}/libkdevabbrev.la
-%{tde_tdelibdir}/libkdevabbrev.so
-%{tde_tdelibdir}/libkdevadaproject.la
-%{tde_tdelibdir}/libkdevadaproject.so
-%{tde_tdelibdir}/libkdevadasupport.la
-%{tde_tdelibdir}/libkdevadasupport.so
-%{tde_tdelibdir}/libkdevantproject.la
-%{tde_tdelibdir}/libkdevantproject.so
-%{tde_tdelibdir}/libkdevappview.la
-%{tde_tdelibdir}/libkdevappview.so
-%{tde_tdelibdir}/libkdevappwizard.la
-%{tde_tdelibdir}/libkdevappwizard.so
-%{tde_tdelibdir}/libkdevastyle.la
-%{tde_tdelibdir}/libkdevastyle.so
-%{tde_tdelibdir}/libkdevautoproject.la
-%{tde_tdelibdir}/libkdevautoproject.so
-%{tde_tdelibdir}/libkdevbashsupport.la
-%{tde_tdelibdir}/libkdevbashsupport.so
-%{tde_tdelibdir}/libkdevbookmarks.la
-%{tde_tdelibdir}/libkdevbookmarks.so
-%{tde_tdelibdir}/libkdevclassview.la
-%{tde_tdelibdir}/libkdevclassview.so
-%{tde_tdelibdir}/libkdevcppsupport.la
-%{tde_tdelibdir}/libkdevcppsupport.so
-%{tde_tdelibdir}/libkdevcsharpsupport.la
-%{tde_tdelibdir}/libkdevcsharpsupport.so
-%{tde_tdelibdir}/libkdevctags2.la
-%{tde_tdelibdir}/libkdevctags2.so
-%{tde_tdelibdir}/libkdevcustompcsimporter.la
-%{tde_tdelibdir}/libkdevcustompcsimporter.so
-%{tde_tdelibdir}/libkdevcustomproject.la
-%{tde_tdelibdir}/libkdevcustomproject.so
-%{tde_tdelibdir}/libkdevdccoptions.la
-%{tde_tdelibdir}/libkdevdccoptions.so
-%{tde_tdelibdir}/libkdevdebugger.la
-%{tde_tdelibdir}/libkdevdebugger.so
-%{tde_tdelibdir}/libkdevdesignerpart.la
-%{tde_tdelibdir}/libkdevdesignerpart.so
-%{tde_tdelibdir}/libkdevdiff.la
-%{tde_tdelibdir}/libkdevdiff.so
-%{tde_tdelibdir}/libkdevdistpart.la
-%{tde_tdelibdir}/libkdevdistpart.so
-%{tde_tdelibdir}/libkdevdocumentation.la
-%{tde_tdelibdir}/libkdevdocumentation.so
-%{tde_tdelibdir}/libkdevdoxygen.la
-%{tde_tdelibdir}/libkdevdoxygen.so
-%{tde_tdelibdir}/libkdeveditorchooser.la
-%{tde_tdelibdir}/libkdeveditorchooser.so
-%{tde_tdelibdir}/libkdevfilecreate.la
-%{tde_tdelibdir}/libkdevfilecreate.so
-%{tde_tdelibdir}/libkdevfilegroups.la
-%{tde_tdelibdir}/libkdevfilegroups.so
-%{tde_tdelibdir}/libkdevfilelist.la
-%{tde_tdelibdir}/libkdevfilelist.so
-%{tde_tdelibdir}/libkdevfileselector.la
-%{tde_tdelibdir}/libkdevfileselector.so
-%{tde_tdelibdir}/libkdevfileview.la
-%{tde_tdelibdir}/libkdevfileview.so
-%{tde_tdelibdir}/libkdevfilter.la
-%{tde_tdelibdir}/libkdevfilter.so
-%{tde_tdelibdir}/libkdevfortransupport.la
-%{tde_tdelibdir}/libkdevfortransupport.so
-%{tde_tdelibdir}/libkdevfpcoptions.la
-%{tde_tdelibdir}/libkdevfpcoptions.so
-%{tde_tdelibdir}/libkdevfullscreen.la
-%{tde_tdelibdir}/libkdevfullscreen.so
-%{tde_tdelibdir}/libkdevgccoptions.la
-%{tde_tdelibdir}/libkdevgccoptions.so
-%{tde_tdelibdir}/libkdevgrepview.la
-%{tde_tdelibdir}/libkdevgrepview.so
-%{tde_tdelibdir}/libkdevjavasupport.la
-%{tde_tdelibdir}/libkdevjavasupport.so
-%{tde_tdelibdir}/libkdevkdelibsimporter.la
-%{tde_tdelibdir}/libkdevkdelibsimporter.so
-%{tde_tdelibdir}/libkdevkonsoleview.la
-%{tde_tdelibdir}/libkdevkonsoleview.so
-%{tde_tdelibdir}/libkdevmakeview.la
-%{tde_tdelibdir}/libkdevmakeview.so
-%{tde_tdelibdir}/libkdevopenwith.la
-%{tde_tdelibdir}/libkdevopenwith.so
-%{tde_tdelibdir}/libkdevpartexplorer.la
-%{tde_tdelibdir}/libkdevpartexplorer.so
-%{tde_tdelibdir}/libkdevpascalproject.la
-%{tde_tdelibdir}/libkdevpascalproject.so
-%{tde_tdelibdir}/libkdevpascalsupport.la
-%{tde_tdelibdir}/libkdevpascalsupport.so
-%{tde_tdelibdir}/libkdevperlsupport.la
-%{tde_tdelibdir}/libkdevperlsupport.so
-%{tde_tdelibdir}/libkdevpgioptions.la
-%{tde_tdelibdir}/libkdevpgioptions.so
-%{tde_tdelibdir}/libkdevphpsupport.la
-%{tde_tdelibdir}/libkdevphpsupport.so
-%{tde_tdelibdir}/libkdevpythonsupport.la
-%{tde_tdelibdir}/libkdevpythonsupport.so
-%{tde_tdelibdir}/libkdevqt4importer.la
-%{tde_tdelibdir}/libkdevqt4importer.so
-%{tde_tdelibdir}/libkdevqtimporter.la
-%{tde_tdelibdir}/libkdevqtimporter.so
-%{tde_tdelibdir}/libkdevquickopen.la
-%{tde_tdelibdir}/libkdevquickopen.so
-%{tde_tdelibdir}/libkdevrbdebugger.la
-%{tde_tdelibdir}/libkdevrbdebugger.so
-%{tde_tdelibdir}/libkdevregexptest.la
-%{tde_tdelibdir}/libkdevregexptest.so
-%{tde_tdelibdir}/libkdevreplace.la
-%{tde_tdelibdir}/libkdevreplace.so
-%{tde_tdelibdir}/libkdevrubysupport.la
-%{tde_tdelibdir}/libkdevrubysupport.so
-%{tde_tdelibdir}/libkdevscripting.la
-%{tde_tdelibdir}/libkdevscripting.so
-%{tde_tdelibdir}/libkdevscriptproject.la
-%{tde_tdelibdir}/libkdevscriptproject.so
-%{tde_tdelibdir}/libkdevsnippet.la
-%{tde_tdelibdir}/libkdevsnippet.so
-%{tde_tdelibdir}/libkdevsqlsupport.la
-%{tde_tdelibdir}/libkdevsqlsupport.so
-%{tde_tdelibdir}/libkdevtexttools.la
-%{tde_tdelibdir}/libkdevtexttools.so
-%{tde_tdelibdir}/libkdevtipofday.la
-%{tde_tdelibdir}/libkdevtipofday.so
-%{tde_tdelibdir}/libkdevtools.la
-%{tde_tdelibdir}/libkdevtools.so
-%{tde_tdelibdir}/libkdevtrollproject.la
-%{tde_tdelibdir}/libkdevtrollproject.so
-%{tde_tdelibdir}/libkdevuichooser.la
-%{tde_tdelibdir}/libkdevuichooser.so
-%{tde_tdelibdir}/libkdevvalgrind.la
-%{tde_tdelibdir}/libkdevvalgrind.so
-%{tde_tdelibdir}/libkdevvcsmanager.la
-%{tde_tdelibdir}/libkdevvcsmanager.so
-%{tde_datadir}/apps/kconf_update/
-%{tde_datadir}/apps/kdevabbrev/
-%{tde_datadir}/apps/kdevadaproject/
-%{tde_datadir}/apps/kdevadasupport/
-%{tde_datadir}/apps/kdevantproject/
-%{tde_datadir}/apps/kdevappoutputview/
-%{tde_datadir}/apps/kdevappwizard/
-%{tde_datadir}/apps/kdevassistant/
-%{tde_datadir}/apps/kdevastyle/
-%{tde_datadir}/apps/kdevautoproject/
-%{tde_datadir}/apps/kdevbashsupport/
-%{tde_datadir}/apps/kdevclassview/
-%{tde_datadir}/apps/kdevcppsupport/
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png
-%{tde_datadir}/icons/hicolor/*/actions/ktip.png
-%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png
-%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png
-%{tde_datadir}/icons/hicolor/*/apps/kdevelop.png
-%{tde_datadir}/icons/locolor/*/actions/kdevelop_tip.png
-%{tde_datadir}/mimelnk/application/x-kdevelop.desktop
-%{tde_datadir}/services/chm.protocol
-%{tde_datadir}/services/csharpdoc.protocol
-%{tde_datadir}/services/docchmplugin.desktop
-%{tde_datadir}/services/doccustomplugin.desktop
-%{tde_datadir}/services/docdevhelpplugin.desktop
-%{tde_datadir}/services/docdoxygenplugin.desktop
-%{tde_datadir}/services/dockdevtocplugin.desktop
-%{tde_datadir}/services/docqtplugin.desktop
-%{tde_datadir}/services/kchmpart.desktop
-%{tde_datadir}/services/kdevabbrev.desktop
-%{tde_datadir}/services/kdevadaproject.desktop
-%{tde_datadir}/services/kdevadasupport.desktop
-%{tde_datadir}/services/kdevantproject.desktop
-%{tde_datadir}/services/kdevappoutputview.desktop
-%{tde_datadir}/services/kdevappwizard.desktop
-%{tde_datadir}/services/kdevastyle.desktop
-%{tde_datadir}/services/kdevautoproject.desktop
-%{tde_datadir}/services/kdevbashsupport.desktop
-%{tde_datadir}/services/kdevbookmarks.desktop
-%{tde_datadir}/services/kdevclassview.desktop
-%{tde_datadir}/services/kdevcppsupport.desktop
-%{tde_datadir}/services/kdevcsharpsupport.desktop
-%{tde_datadir}/services/kdevcsupport.desktop
-%{tde_datadir}/services/kdevctags2.desktop
-%{tde_datadir}/services/kdevcustomproject.desktop
-%{tde_datadir}/services/kdevdccoptions.desktop
-%{tde_datadir}/services/kdevdebugger.desktop
-%{tde_datadir}/services/kdevdesigner_part.desktop
-%{tde_datadir}/services/kdevdiff.desktop
-%{tde_datadir}/services/kdevdistpart.desktop
-%{tde_datadir}/services/kdevdocumentation.desktop
-%{tde_datadir}/services/kdevdoxygen.desktop
-%{tde_datadir}/services/kdeveditorchooser.desktop
-%{tde_datadir}/services/kdevfilecreate.desktop
-%{tde_datadir}/services/kdevfilegroups.desktop
-%{tde_datadir}/services/kdevfilelist.desktop
-%{tde_datadir}/services/kdevfileselector.desktop
-%{tde_datadir}/services/kdevfileview.desktop
-%{tde_datadir}/services/kdevfilter.desktop
-%{tde_datadir}/services/kdevfortransupport.desktop
-%{tde_datadir}/services/kdevfpcoptions.desktop
-%{tde_datadir}/services/kdevfullscreen.desktop
-%{tde_datadir}/services/kdevg77options.desktop
-%{tde_datadir}/services/kdevgccoptions.desktop
-%{tde_datadir}/services/kdevgppoptions.desktop
-%{tde_datadir}/services/kdevgrepview.desktop
-%{tde_datadir}/services/kdevjavasupport.desktop
-%{tde_datadir}/services/kdevkdeautoproject.desktop
-%{tde_datadir}/services/kdevkdelibsimporter.desktop
-%{tde_datadir}/services/kdevkonsoleview.desktop
-%{tde_datadir}/services/kdevmakeview.desktop
-%{tde_datadir}/services/kdevopenwith.desktop
-%{tde_datadir}/services/kdevpartexplorer.desktop
-%{tde_datadir}/services/kdevpascalproject.desktop
-%{tde_datadir}/services/kdevpascalsupport.desktop
-%{tde_datadir}/services/kdevpcscustomimporter.desktop
-%{tde_datadir}/services/kdevperlsupport.desktop
-%{tde_datadir}/services/kdevpgf77options.desktop
-%{tde_datadir}/services/kdevpghpfoptions.desktop
-%{tde_datadir}/services/kdevphpsupport.desktop
-%{tde_datadir}/services/kdevpythonsupport.desktop
-%{tde_datadir}/services/kdevqt4importer.desktop
-%{tde_datadir}/services/kdevqtimporter.desktop
-%{tde_datadir}/services/kdevquickopen.desktop
-%{tde_datadir}/services/kdevrbdebugger.desktop
-%{tde_datadir}/services/kdevregexptest.desktop
-%{tde_datadir}/services/kdevreplace.desktop
-%{tde_datadir}/services/kdevrubysupport.desktop
-%{tde_datadir}/services/kdevscripting.desktop
-%{tde_datadir}/services/kdevscriptproject.desktop
-%{tde_datadir}/services/kdevsnippet.desktop
-%{tde_datadir}/services/kdevsqlsupport.desktop
-%{tde_datadir}/services/kdevtexttools.desktop
-%{tde_datadir}/services/kdevtipofday.desktop
-%{tde_datadir}/services/kdevtmakeproject.desktop
-%{tde_datadir}/services/kdevtools.desktop
-%{tde_datadir}/services/kdevtrollproject.desktop
-%{tde_datadir}/services/kdevuichooser.desktop
-%{tde_datadir}/services/kdevvalgrind.desktop
-%{tde_datadir}/services/kdevvcsmanager.desktop
-%{tde_datadir}/services/perldoc.protocol
-%{tde_datadir}/services/pydoc.protocol
-%{tde_datadir}/servicetypes/kdevelopappfrontend.desktop
-%{tde_datadir}/servicetypes/kdevelopcodebrowserfrontend.desktop
-%{tde_datadir}/servicetypes/kdevelopcompileroptions.desktop
-%{tde_datadir}/servicetypes/kdevelopcreatefile.desktop
-%{tde_datadir}/servicetypes/kdevelopdifffrontend.desktop
-%{tde_datadir}/servicetypes/kdevelopdocumentationplugins.desktop
-%{tde_datadir}/servicetypes/kdeveloplanguagesupport.desktop
-%{tde_datadir}/servicetypes/kdevelopmakefrontend.desktop
-%{tde_datadir}/servicetypes/kdeveloppcsimporter.desktop
-%{tde_datadir}/servicetypes/kdevelopplugin.desktop
-%{tde_datadir}/servicetypes/kdevelopproject.desktop
-%{tde_datadir}/servicetypes/kdevelopquickopen.desktop
-%{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop
-%{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop
-%{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop
-%{tde_datadir}/apps/kdevcsharpsupport/
-%{tde_datadir}/apps/kdevctags2/
-%{tde_datadir}/apps/kdevcustomproject/
-%{tde_datadir}/apps/kdevdebugger/
-%{tde_datadir}/apps/kdevdesigner/
-%{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdiff/
-%{tde_datadir}/apps/kdevdistpart/
-%{tde_datadir}/apps/kdevdocumentation/
-%{tde_datadir}/apps/kdevdoxygen/
-%{tde_datadir}/apps/kdevelop/
-%{tde_datadir}/apps/kdevfilecreate/
-%{tde_datadir}/apps/kdevfilelist/
-%{tde_datadir}/apps/kdevfilter/
-%{tde_datadir}/apps/kdevfortransupport/
-%{tde_datadir}/apps/kdevfullscreen/
-%{tde_datadir}/apps/kdevgrepview/
-%{tde_datadir}/apps/kdevjavasupport/
-%{tde_datadir}/apps/kdevmakeview/
-%{tde_datadir}/apps/kdevpartexplorer/
-%{tde_datadir}/apps/kdevpascalproject/
-%{tde_datadir}/apps/kdevpascalsupport/
-%{tde_datadir}/apps/kdevperlsupport/
-%{tde_datadir}/apps/kdevphpsupport/
-%{tde_datadir}/apps/kdevpythonsupport/
-%{tde_datadir}/apps/kdevquickopen/
-%{tde_datadir}/apps/kdevrbdebugger/
-%{tde_datadir}/apps/kdevregexptest/
-%{tde_datadir}/apps/kdevreplace/
-%{tde_datadir}/apps/kdevrubysupport/
-%{tde_datadir}/apps/kdevscripting/
-%{tde_datadir}/apps/kdevscriptproject/
-%{tde_datadir}/apps/kdevsnippet/
-%{tde_datadir}/apps/kdevsqlsupport
-%{tde_datadir}/apps/kdevtipofday/
-%{tde_datadir}/apps/kdevtools/
-%{tde_datadir}/apps/kdevtrollproject/
-%{tde_datadir}/apps/kdevvalgrind/
-%{tde_datadir}/apps/kio_pydoc/
-%{tde_datadir}/config/kdevassistantrc
-%{tde_datadir}/config/kdeveloprc
-%{tde_datadir}/desktop-directories/tde-development-kdevelop.directory
-%{tde_tdedocdir}/HTML/en/kdevelop/
-%{tde_libdir}/libd.so.0
-%{tde_libdir}/libd.so.0.0.0
-%{tde_libdir}/libkinterfacedesigner.so.0
-%{tde_libdir}/libkinterfacedesigner.so.0.0.0
-%{tde_tdelibdir}/libkdevvisualboyadvance.la
-%{tde_tdelibdir}/libkdevvisualboyadvance.so
-%{tde_datadir}/apps/kdevdesignerpart/pics/
-%{tde_datadir}/apps/kdevvisualboyadvance/
-%{tde_tdedocdir}/HTML/en/kde_app_devel/
-%{tde_datadir}/mimelnk/text/x-fortran.desktop
-%{tde_datadir}/services/kdevvisualboyadvance.desktop
-
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group:		Development/Libraries/Other
-Requires: %{name}-libs = %{version}-%{release}
-
-Obsoletes:	trinity-kdevelop-devel < %{version}-%{release}
-Provides:	trinity-kdevelop-devel = %{version}-%{release}
-
-%description devel
-This package contains the development files for tdevelop.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so
-%{tde_libdir}/lib*.la
-%{tde_includedir}/*
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-tdelibs >= %{tde_version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{version}-%{release}
-
-Obsoletes:	trinity-kdevelop-libs < %{version}-%{release}
-Provides:	trinity-kdevelop-libs = %{version}-%{release}
-
-%description libs
-This package contains the libraries needed for the tdevelop programs.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libdesignerintegration.so.0
-%{tde_libdir}/libdesignerintegration.so.0.0.0
-%{tde_libdir}/libdocumentation_interfaces.so.0
-%{tde_libdir}/libdocumentation_interfaces.so.0.0.0
-%{tde_libdir}/libgdbmi_parser.so.0
-%{tde_libdir}/libgdbmi_parser.so.0.0.0
-%{tde_libdir}/libkdevbuildbase.so.0
-%{tde_libdir}/libkdevbuildbase.so.0.0.0
-%{tde_libdir}/libkdevbuildtoolswidgets.so.0
-%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0
-%{tde_libdir}/libkdevcatalog.so.0
-%{tde_libdir}/libkdevcatalog.so.0.0.0
-%{tde_libdir}/libkdevcppparser.so.0
-%{tde_libdir}/libkdevcppparser.so.0.0.0
-%{tde_libdir}/libkdevelop.so.1
-%{tde_libdir}/libkdevelop.so.1.0.0
-%{tde_libdir}/libkdevextras.so.0
-%{tde_libdir}/libkdevextras.so.0.0.0
-%{tde_libdir}/libkdevpropertyeditor.so.0
-%{tde_libdir}/libkdevpropertyeditor.so.0.0.0
-%{tde_libdir}/libkdevqmakeparser.so.0
-%{tde_libdir}/libkdevqmakeparser.so.0.0.0
-%{tde_libdir}/libkdevshell.so.0
-%{tde_libdir}/libkdevshell.so.0.0.0
-%{tde_libdir}/libkdevwidgets.so.0
-%{tde_libdir}/libkdevwidgets.so.0.0.0
-%{tde_libdir}/liblang_debugger.so.0
-%{tde_libdir}/liblang_debugger.so.0.0.0
-%{tde_libdir}/liblang_interfaces.so.0
-%{tde_libdir}/liblang_interfaces.so.0.0.0
-%{tde_libdir}/libprofileengine.so.0
-%{tde_libdir}/libprofileengine.so.0.0.0
-
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_BUILDTOOL_ALL=ON \
-  -DWITH_LANGUAGE_ALL=ON \
-  -DWITH_VCS_ALL=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec
deleted file mode 100644
index c26bb4008..000000000
--- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec
+++ /dev/null
@@ -1,552 +0,0 @@
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:		trinity-tdewebdev
-Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-License:	GPL
-Summary:	Web development applications 
-Group:		Applications/Editors
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	http://download.sourceforge.net/quanta/css.tar.bz2
-Source2:	http://download.sourceforge.net/quanta/html.tar.bz2
-Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
-Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
-
-Patch1:		kdewebdev-3.5.4-kxsldbg-icons.patch
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
-BuildRequires:	libxslt-devel
-BuildRequires:	libxml2-devel
-%if 0%{?rhel} == 4
-# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
-BuildRequires:	libgcrypt-devel
-%endif
-BuildRequires:	perl
-
-# KXSLDBG requires libxml2
-#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version}
-%define build_kxsldbg 1
-#endif
-
-
-Obsoletes:	trinity-kdewebdev-libs < %{version}-%{release}
-Provides:	trinity-kdewebdev-libs = %{version}-%{release}
-Obsoletes:	trinity-kdewebdev < %{version}-%{release}
-Provides:	trinity-kdewebdev = %{version}-%{release}
-
-Requires: trinity-quanta = %{version}-%{release}
-Requires: trinity-quanta-data = %{version}-%{release}
-Requires: trinity-kfilereplace = %{version}-%{release}
-Requires: trinity-kimagemapeditor = %{version}-%{release}
-Requires: trinity-klinkstatus = %{version}-%{release}
-Requires: trinity-kommander = %{version}-%{release}
-%{?build_kxsldbg:Requires: trinity-kxsldbg = %{version}-%{release}}
-
-%description
-%{summary}, including:
-* kfilereplace: batch search and replace tool
-* kimagemapeditor: HTML image map editor
-* klinkstatus: link checker
-* kommander: visual dialog building tool
-* quanta+: web development
-%{?build_kxsldbg:* kxsldbg: xslt Debugger}
-
-%files
-
-##########
-
-%package -n trinity-quanta
-Summary:	web development environment for TDE [Trinity]
-Group:		Applications/Development
-Requires:	trinity-kfilereplace = %{version}-%{release}
-Requires:	trinity-klinkstatus = %{version}-%{release}
-Requires:	trinity-kommander = %{version}-%{release}
-Requires:	trinity-quanta-data = %{version}-%{release}
-#Requires:	trinity-kimagemapeditor = %{version}-%{release}
-#Requires:	trinity-kxsldbg = %{version}-%{release}
-Requires:	tidy
-
-%description -n trinity-quanta
-Quanta Plus is a web development environment for working with HTML
-and associated languages. It strives to be neutral and transparent
-to all markup languages, while supporting popular web-based scripting
-languages, CSS and other emerging W3C recommendations.
-
-Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the TDE web
-development module.
-
-Quanta Plus is not in any way affiliated with any commercial versions
-of Quanta. The primary coders from the original team left the GPL'd
-version to produce a commercial product.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-quanta
-%defattr(-,root,root,-)
-%{tde_bindir}/quanta
-%{tde_tdelibdir}/quantadebuggerdbgp.la
-%{tde_tdelibdir}/quantadebuggerdbgp.so
-%{tde_tdelibdir}/quantadebuggergubed.la
-%{tde_tdelibdir}/quantadebuggergubed.so
-%{tde_tdeappdir}/quanta.desktop
-%{tde_datadir}/apps/kafkapart
-%{tde_datadir}/icons/hicolor/*/apps/quanta.png
-%{tde_datadir}/mimelnk/application/x-webprj.desktop
-%{tde_datadir}/services/quantadebuggerdbgp.desktop
-%{tde_datadir}/services/quantadebuggergubed.desktop
-%{tde_datadir}/services/quanta_preview_config.desktop
-%{tde_datadir}/servicetypes/quantadebugger.desktop
-%{tde_tdedocdir}/HTML/en/quanta/
-
-%post -n trinity-quanta
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-quanta
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-
-##########
-
-%package -n trinity-quanta-data
-Summary:	data files for Quanta Plus web development environment [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-quanta-data
-This package contains architecture-independent data files for Quanta
-Plus, a web development environment for working with HTML and associated
-languages.
-
-See the quanta package for further information.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-quanta-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/quanta/
-
-##########
-
-%package -n trinity-kfilereplace
-Summary:	batch search-and-replace component for TDE [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-kfilereplace
-KFileReplace is an embedded component for TDE that acts as a batch
-search-and-replace tool. It allows you to replace one expression with
-another in many files at once.
-
-Note that at the moment KFileReplace does not come as a standalone
-application. An example of an application that uses the KFileReplace
-component is Quanta Plus (found in the package quanta).
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kfilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/kfilereplace
-%{tde_tdelibdir}/libkfilereplacepart.la
-%{tde_tdelibdir}/libkfilereplacepart.so
-%{tde_tdeappdir}/kfilereplace.desktop
-%{tde_datadir}/apps/kfilereplace/kfilereplaceui.rc
-%{tde_datadir}/apps/kfilereplacepart
-%{tde_datadir}/icons/hicolor/*/apps/kfilereplace.png
-%{tde_datadir}/services/kfilereplacepart.desktop
-%{tde_tdedocdir}/HTML/en/kfilereplace/
-
-%post -n trinity-kfilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kfilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kimagemapeditor
-Summary:	HTML image map editor for TDE [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-kimagemapeditor
-KImageMapEditor is a tool that allows you to edit image maps in HTML
-files. As well as providing a standalone application, KImageMapEditor
-makes itself available as a KPart for embedding into larger applications.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kimagemapeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kimagemapeditor
-%{tde_tdelibdir}/libkimagemapeditor.la
-%{tde_tdelibdir}/libkimagemapeditor.so
-%{tde_tdeappdir}/kimagemapeditor.desktop
-%{tde_datadir}/apps/kimagemapeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
-%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
-%{tde_datadir}/services/kimagemapeditorpart.desktop
-
-%post -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-klinkstatus
-Summary:	web link validity checker for TDE [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-klinkstatus
-KLinkStatus is TDE's web link validity checker. It allows you to
-search internal and external links throughout your web site. Simply
-point it to a single page and choose the depth to search.
-
-You can also check local files, or files over ftp:, fish: or any other
-KIO protocols. For performance, links can be checked simultaneously.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-klinkstatus
-%defattr(-,root,root,-)
-%{tde_bindir}/klinkstatus
-%{tde_tdelibdir}/libklinkstatuspart.la
-%{tde_tdelibdir}/libklinkstatuspart.so
-%{tde_tdeappdir}/klinkstatus.desktop
-%{tde_datadir}/apps/klinkstatus/
-%{tde_datadir}/apps/klinkstatuspart/
-%{tde_datadir}/config.kcfg/klinkstatus.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
-%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
-%{tde_datadir}/services/klinkstatus_part.desktop
-%{tde_tdedocdir}/HTML/en/klinkstatus/
-
-%post -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kommander
-Summary:	visual dialog builder and executor tool [Trinity]
-Group:		Applications/Development
-Requires:	gettext
-
-%description -n trinity-kommander
-Kommander is a visual dialog building tool whose primary objective is
-to create as much functionality as possible without using any scripting
-language.
-
-More specifically, Kommander is a set of tools that allow you to create
-dynamic GUI dialogs that generate, based on their state, a piece of
-text. The piece of text can be a command line to a program, any piece
-of code, business documents that contain a lot of repetitious or
-templated text and so on.
-
-The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of. And you aren't required to write a single line of code!
-
-As well as building dialogs, Kommander may be expanded to create full
-mainwindow applications.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kommander
-%defattr(-,root,root,-)
-%{tde_bindir}/kmdr-editor
-%{tde_bindir}/kmdr-executor
-%{tde_bindir}/kmdr-plugins
-%{tde_libdir}/libkommanderplugin.so.*
-%{tde_libdir}/libkommanderwidgets.la
-%{tde_libdir}/libkommanderwidget.so.*
-%{tde_libdir}/libkommanderwidgets.so.*
-%{tde_tdeappdir}/kmdr-editor.desktop
-%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
-%{tde_datadir}/apps/katepart/syntax/kommander.xml
-%{tde_tdedocdir}/HTML/en/kommander/
-%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
-%{tde_datadir}/mimelnk/application/x-kommander.desktop
-#kommander/examples /opt/trinity/share/doc/kommander
-#kommander/working/extractkmdr /opt/trinity/bin
-#kommander/working/kmdr2po /opt/trinity/bin
-%{tde_tdelibdir}/libkommander_part.so
-%{tde_tdelibdir}/libkommander_part.la
-%{tde_datadir}/apps/kommander/
-%{tde_datadir}/apps/kmdr-editor/editor/
-%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
-%{tde_datadir}/apps/kdevappwizard/kommanderplugin.png
-%{tde_datadir}/apps/kdevappwizard/kommanderplugin.tar.gz
-%{tde_datadir}/apps/kdevappwizard/templates/kommanderplugin.kdevtemplate
-%{tde_datadir}/services/kommander_part.desktop
-
-%post -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
-%package -n trinity-kommander-devel
-Summary:	development files for Kommander [Trinity]
-Group:		Development/Libraries
-Requires:	trinity-kommander = %{version}-%{release}
-
-%description -n trinity-kommander-devel
-This package contains the headers and other development files for
-building plugins or otherwise extending Kommander.
-
-Kommander is a visual dialog building tool whose primary objective is
-to create as much functionality as possible without using any scripting
-language.
-
-See the kommander package for further information.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kommander-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkommanderplugin.la
-%{tde_libdir}/libkommanderplugin.so
-%{tde_libdir}/libkommanderwidget.la
-%{tde_libdir}/libkommanderwidget.so
-%{tde_libdir}/libkommanderwidgets.so
-%{tde_tdeincludedir}/kommander*
-%{tde_tdeincludedir}/specials.h
-
-%post -n trinity-kommander-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kommander-devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?build_kxsldbg}
-
-%package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for TDE [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-kxsldbg
-KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
-interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded TDE part.
-
-XSLT is an XML language for defining transformations of XML files from
-XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
-using standard XSLT stylesheets.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kxsldbg
-%defattr(-,root,root,-)
-%{tde_bindir}/kxsldbg
-%{tde_bindir}/xsldbg
-%{tde_tdelibdir}/libkxsldbgpart.la
-%{tde_tdelibdir}/libkxsldbgpart.so
-%{tde_tdeappdir}/kxsldbg.desktop
-%{tde_datadir}/apps/kxsldbg
-%{tde_datadir}/apps/kxsldbgpart
-%{tde_tdedocdir}/HTML/en/kxsldbg/
-%{tde_tdedocdir}/HTML/en/xsldbg/
-%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
-%{tde_datadir}/icons/hicolor/*/actions/configure.png
-%{tde_datadir}/icons/hicolor/*/actions/exit.png
-%{tde_datadir}/icons/hicolor/*/actions/hash.png
-%{tde_datadir}/icons/hicolor/*/actions/mark.png
-%{tde_datadir}/icons/hicolor/*/actions/next.png
-%{tde_datadir}/icons/hicolor/*/actions/run.png
-%{tde_datadir}/icons/hicolor/*/actions/step.png
-%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
-%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
-%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
-%{tde_datadir}/services/kxsldbg_part.desktop
-
-%post -n trinity-kxsldbg
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kxsldbg
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%endif
-
-##########
-
-%package devel
-Group: Development/Libraries
-Summary:	Header files and documentation for %{name} 
-
-Obsoletes:	trinity-kdewebdev-devel < %{version}-%{release}
-Provides:	trinity-kdewebdev-devel = %{version}-%{release}
-
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-kommander-devel = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -a 1 -a 2 -a 3 -a 4
-%patch1 -p1 -b .kxsldbg-icons
-
-%if 0%{?build_kxsldbg} == 0
-%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-# Do not build against any "/usr" installed TDE
-export TDEDIR="%{tde_prefix}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath
-
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir  kommander/plugin/.libs/
-ln -s . kommander/plugin/.libs/.libs
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-## package separately?  Why doesn't upstream include this? -- Rex
-# install docs
-for i in css html javascript ; do
-   pushd $i
-   ./install.sh <<EOF
-%{buildroot}%{tde_datadir}/apps/quanta/doc
-EOF
-   popd
-   rm -rf $i
-done
-cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog